The following commit has been merged in the master branch:
commit 98950d6ce5eeb99681916c73aa8908403aa45c56
Author: Niels Thykier <[email protected]>
Date: Mon Mar 12 12:57:20 2012 +0100
t/*: remove copy/waste and "modernize" rules files
Update a number of rules files to use override targets (etc.), where
it would not influence the (intended) test. Remove 4 copy/waste rules
files that serve no purpose.
Signed-off-by: Niels Thykier <[email protected]>
diff --git a/t/tests/changelog-file-general/debian/debian/rules
b/t/tests/changelog-file-general/debian/debian/rules
index a212c6a..d4c39dd 100755
--- a/t/tests/changelog-file-general/debian/debian/rules
+++ b/t/tests/changelog-file-general/debian/debian/rules
@@ -4,9 +4,7 @@ pkg = $(shell dh_listpackages)
%:
dh $@
-binary:
- dh binary --before dh_installchangelogs
+override_dh_installchangelogs:
install -c -m 644 debian/changelog \
debian/$(pkg)/usr/share/doc/$(pkg)/changelog.Debian
gzip -1 debian/$(pkg)/usr/share/doc/$(pkg)/changelog.Debian
- dh binary --after dh_installchangelogs
diff --git a/t/tests/cruft-general-diff/debian/debian/rules
b/t/tests/cruft-general-diff/debian/debian/rules
index d2231a2..413418b 100755
--- a/t/tests/cruft-general-diff/debian/debian/rules
+++ b/t/tests/cruft-general-diff/debian/debian/rules
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff --git a/t/tests/cruft-general-native/debian/debian/rules
b/t/tests/cruft-general-native/debian/debian/rules
index d2231a2..413418b 100755
--- a/t/tests/cruft-general-native/debian/debian/rules
+++ b/t/tests/cruft-general-native/debian/debian/rules
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff --git a/t/tests/cruft-general-quilt/debian/debian/rules
b/t/tests/cruft-general-quilt/debian/debian/rules
index d2231a2..413418b 100755
--- a/t/tests/cruft-general-quilt/debian/debian/rules
+++ b/t/tests/cruft-general-quilt/debian/debian/rules
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff --git a/t/tests/cruft-general-wig-pen/debian/debian/rules
b/t/tests/cruft-general-wig-pen/debian/debian/rules
index d2231a2..413418b 100755
--- a/t/tests/cruft-general-wig-pen/debian/debian/rules
+++ b/t/tests/cruft-general-wig-pen/debian/debian/rules
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff --git a/t/tests/debhelper-arch-depends/debian/debian/rules
b/t/tests/debhelper-arch-depends/debian/debian/rules
index 27900c2..726a39c 100755
--- a/t/tests/debhelper-arch-depends/debian/debian/rules
+++ b/t/tests/debhelper-arch-depends/debian/debian/rules
@@ -2,9 +2,7 @@
%:
dh $@
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_prep
+override_dh_prep:
-dh_clideps
- dh binary-indep --remaining
+ dh_prep
+
diff --git a/t/tests/debhelper-brace-expansion/debian/debian/rules
b/t/tests/debhelper-brace-expansion/debian/debian/rules
index 737231b..16d8ba1 100755
--- a/t/tests/debhelper-brace-expansion/debian/debian/rules
+++ b/t/tests/debhelper-brace-expansion/debian/debian/rules
@@ -4,6 +4,5 @@
# Skip dh_install since there are braces in the install configuration file and
# it would error out on at least some systems.
-binary:
- dh binary --before dh_install
- dh binary --after dh_install
+override_dh_install:
+
diff --git a/t/tests/debhelper-dh-nativejava/debian/debian/rules
b/t/tests/debhelper-dh-nativejava/debian/debian/rules
index 3045226..5963ecc 100755
--- a/t/tests/debhelper-dh-nativejava/debian/debian/rules
+++ b/t/tests/debhelper-dh-nativejava/debian/debian/rules
@@ -2,9 +2,5 @@
%:
dh $@
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_prep
+override_dh_prep:
-dh_nativejava
- dh binary-indep --remaining
diff --git a/t/tests/init.d-script-registration/debian/debian/rules
b/t/tests/init.d-script-registration/debian/debian/rules
index 8d53c91..cacd977 100755
--- a/t/tests/init.d-script-registration/debian/debian/rules
+++ b/t/tests/init.d-script-registration/debian/debian/rules
@@ -1,10 +1,9 @@
#!/usr/bin/make -f
%:
- dh $*
+ dh $@
-binary:
- dh $@ --until dh_fixperms
+override_dh_fixperms:
+ dh_fixperms
chmod -x debian/init.d-script-registration/etc/init.d/README
chmod -x debian/init.d-script-registration/etc/init.d/skeleton
- dh $@ --remaining
diff --git a/t/tests/lintian-overrides/debian/debian/rules
b/t/tests/lintian-overrides/debian/debian/rules
index a611d72..8685ec8 100755
--- a/t/tests/lintian-overrides/debian/debian/rules
+++ b/t/tests/lintian-overrides/debian/debian/rules
@@ -5,9 +5,8 @@ pkg=lintian-overrides
%:
dh $@
-binary:
- dh binary --before install
+override_dh_fixperms:
install -D -m 0644 $(CURDIR)/debian/overrides \
$(CURDIR)/debian/$(pkg)/usr/share/lintian/overrides/$(pkg)
dh_fixperms
- dh binary --remaining
+
diff --git a/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules
b/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules
index bb4437f..79fc28b 100755
--- a/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules
+++ b/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
build: build-stamp
+build-arch:
+build-indep:
+
build-stamp:
dh build
touch $@
@@ -23,4 +26,4 @@ binary-indep: install
binary: binary-arch binary-indep
-.PHONY: binary binary-arch binary-indep install clean build
+.PHONY: binary binary-arch binary-indep install clean build build-arch
build-indep
diff --git a/t/tests/rules-dh-unused-target-nonempty/tags
b/t/tests/rules-dh-unused-target-nonempty/tags
index 475f57f..eff746c 100644
--- a/t/tests/rules-dh-unused-target-nonempty/tags
+++ b/t/tests/rules-dh-unused-target-nonempty/tags
@@ -1,3 +1 @@
W: rules-dh-unused-target-nonempty source:
binary-arch-rules-but-pkg-is-arch-indep
-W: rules-dh-unused-target-nonempty source:
debian-rules-missing-recommended-target build-arch
-W: rules-dh-unused-target-nonempty source:
debian-rules-missing-recommended-target build-indep
diff --git a/t/tests/rules-general/debian/debian/rules
b/t/tests/rules-general/debian/debian/rules
index c6597dd..dc93ea5 100755
--- a/t/tests/rules-general/debian/debian/rules
+++ b/t/tests/rules-general/debian/debian/rules
@@ -5,9 +5,6 @@ DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
%:
dh $@
-override_dh_python:
- dh_python2
-
clean:
dh_clean
echo $(DEB_BUILD_OPTS) $(PWD)
diff --git a/t/tests/rules-general/tags b/t/tests/rules-general/tags
index 5c8c7e2..f6931fa 100644
--- a/t/tests/rules-general/tags
+++ b/t/tests/rules-general/tags
@@ -1,4 +1,4 @@
E: rules-general source: clean-should-be-satisfied-by-build-depends debhelper
E: rules-general source: debian-rules-automatically-updates-control line 3
-W: rules-general source: debian-rules-uses-DEB_BUILD_OPTS line 13
-W: rules-general source: debian-rules-uses-pwd line 13
+W: rules-general source: debian-rules-uses-DEB_BUILD_OPTS line 10
+W: rules-general source: debian-rules-uses-pwd line 10
diff --git a/t/tests/shared-libs-exec-bit/debian/debian/rules
b/t/tests/shared-libs-exec-bit/debian/debian/rules
index bbe07f9..15411c5 100644
--- a/t/tests/shared-libs-exec-bit/debian/debian/rules
+++ b/t/tests/shared-libs-exec-bit/debian/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
%:
dh $@
diff --git a/t/tests/shared-libs-exit-fork/debian/debian/rules
b/t/tests/shared-libs-exit-fork/debian/debian/rules
deleted file mode 100644
index c7d497f..0000000
--- a/t/tests/shared-libs-exit-fork/debian/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
diff --git a/t/tests/shared-libs-exit/debian/debian/rules
b/t/tests/shared-libs-exit/debian/debian/rules
deleted file mode 100644
index c7d497f..0000000
--- a/t/tests/shared-libs-exit/debian/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
diff --git a/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/rules
b/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/rules
deleted file mode 100644
index c7d497f..0000000
--- a/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
diff --git a/t/tests/shared-libs-multi-arch-foreign/debian/debian/rules
b/t/tests/shared-libs-multi-arch-foreign/debian/debian/rules
deleted file mode 100644
index c7d497f..0000000
--- a/t/tests/shared-libs-multi-arch-foreign/debian/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
