From 61e7b11aeb34a491260d51a5ee6e028dfdad3185 Mon Sep 17 00:00:00 2001 From: Hideki Yamane Date: Fri, 27 Mar 2015 01:51:03 +0900 Subject: [PATCH 1/6] back to 7 since it requires debhelper7, not 9 debian/compat specifies compatibility level for debhelper. It should be lower than debhelper version, so set to 7. If you want to upgrade to 9, then also upgrade Build-Depends: debhelper >=9 --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index ec635144..7f8f011e 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +7 From 166cb003a230c0acb3202439c4cc571cdf71fc62 Mon Sep 17 00:00:00 2001 From: Hideki Yamane Date: Fri, 27 Mar 2015 01:53:28 +0900 Subject: [PATCH 2/6] probably you want to put debian/compat, not compat --- compat | 1 - 1 file changed, 1 deletion(-) delete mode 100644 compat diff --git a/compat b/compat deleted file mode 100644 index ec635144..00000000 --- a/compat +++ /dev/null @@ -1 +0,0 @@ -9 From 4a8a146e4eb7aeac2126862a4ca27dab705360a9 Mon Sep 17 00:00:00 2001 From: Hideki Yamane Date: Fri, 27 Mar 2015 01:58:11 +0900 Subject: [PATCH 3/6] simplify rules --- debian/rules | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 8026117e..f558dcd1 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,10 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) %: dh $@ -override_dh_auto_configure: configure_config +override_dh_auto_configure: + if [ $(shell uname -m) = 'x86_64' ]; then echo "1\n2\n" | ./configure; fi + if [ $(shell uname -m) = 'i686' ]; then echo "1\n1\n" | ./configure; fi + if [ $(shell uname -m) = 'armv6l' ]; then echo "1\n1\n" | ./configure; fi override_dh_auto_clean: rm -fr Makefile* usr bin tmp src/bin/BuiltHamcoreFiles @@ -16,9 +19,3 @@ override_dh_auto_install: patch -f < debian/makefile.patch mkdir -p usr/bin make install - -configure_config: - if [ $(shell uname -m) = 'x86_64' ]; then echo "1\n2\n" | ./configure; fi - if [ $(shell uname -m) = 'i686' ]; then echo "1\n1\n" | ./configure; fi - if [ $(shell uname -m) = 'armv6l' ]; then echo "1\n1\n" | ./configure; fi - From 85afa3612a24b42f89a612b76490bcdb2aa7324b Mon Sep 17 00:00:00 2001 From: Hideki Yamane Date: Fri, 27 Mar 2015 02:00:00 +0900 Subject: [PATCH 4/6] debian uses package specific info as README.Debian --- debian/{README.TXT => README.Debian} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/{README.TXT => README.Debian} (100%) diff --git a/debian/README.TXT b/debian/README.Debian similarity index 100% rename from debian/README.TXT rename to debian/README.Debian From d41cffb2ab8c908adc8b7aa004992c21fac90139 Mon Sep 17 00:00:00 2001 From: Hideki Yamane Date: Fri, 27 Mar 2015 02:04:00 +0900 Subject: [PATCH 5/6] remove useless lines CFLAGS and LDFLAGS are not used in this rules file. and verbose switch should be disabled by default --- debian/rules | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index f558dcd1..b252f241 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,5 @@ #!/usr/bin/make -f - -export DH_VERBOSE=1 -CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) +#export DH_VERBOSE=1 %: dh $@ From 78487038fa10dfee468b3214661487df9fc1a662 Mon Sep 17 00:00:00 2001 From: Hideki Yamane Date: Fri, 27 Mar 2015 02:06:10 +0900 Subject: [PATCH 6/6] use debian/clean file, instead of writing in rules --- debian/clean | 5 +++++ debian/rules | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 debian/clean diff --git a/debian/clean b/debian/clean new file mode 100644 index 00000000..487f200f --- /dev/null +++ b/debian/clean @@ -0,0 +1,5 @@ +Makefile* +usr +bin +tmp +src/bin/BuiltHamcoreFiles diff --git a/debian/rules b/debian/rules index b252f241..ac9d03e7 100755 --- a/debian/rules +++ b/debian/rules @@ -9,9 +9,6 @@ override_dh_auto_configure: if [ $(shell uname -m) = 'i686' ]; then echo "1\n1\n" | ./configure; fi if [ $(shell uname -m) = 'armv6l' ]; then echo "1\n1\n" | ./configure; fi -override_dh_auto_clean: - rm -fr Makefile* usr bin tmp src/bin/BuiltHamcoreFiles - override_dh_auto_install: patch -f < debian/makefile.patch mkdir -p usr/bin