The following commit has been merged in the master branch:
commit 508bbdea7f5cbddaf449db8efae59a9edac0d0ad
Author: Benjamin Drung <[email protected]>
Date: Wed Apr 20 18:35:54 2011 +0200
Switch to simple dh 8 rule.
diff --git a/Makefile b/Makefile
index 04264d0..095f2a0 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ DESTDIR =
PERL_MODULES = Devscripts
EXAMPLES = conf.default
+DOCDIR ?= /usr/share/doc/devscripts
+
all: version make_scripts $(EXAMPLES) translated_manpages
version:
@@ -34,6 +36,7 @@ clean: clean_scripts clean_translated_manpages
install: all install_scripts
cp -a $(PERL_MODULES) $(DESTDIR)$(PERLMOD_DIR)
cp $(EXAMPLES) $(DESTDIR)$(EXAMPLES_DIR)
+ install -D README $(DESTDIR)$(DOCDIR)/README
make_scripts: version
$(MAKE) -C scripts/
diff --git a/debian/changelog b/debian/changelog
index d67cf67..ccbd466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ devscripts (2.10.73) UNRELEASED; urgency=low
[ Benjamin Drung ]
* Add myself to uploaders.
* Wrap and sort lists in debian/control. (Closes: #577999)
+ * Switch to simple dh 8 rule.
- -- Benjamin Drung <[email protected]> Wed, 20 Apr 2011 11:12:51 +0200
+ -- Benjamin Drung <[email protected]> Wed, 20 Apr 2011 18:35:11 +0200
devscripts (2.10.72) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 1e8b314..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+8
diff --git a/debian/control b/debian/control
index c26ad12..d81500d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Uploaders: Julian Gilbey <[email protected]>,
Ryan Niebur <[email protected]>,
Benjamin Drung <[email protected]>
Standards-Version: 3.9.1.0
-Build-Depends: debhelper (>= 6.0.0),
+Build-Depends: debhelper (>= 8),
docbook-xsl,
libfile-desktopentry-perl,
libjson-perl,
diff --git a/debian/links b/debian/links
index 4891b68..03bc431 100644
--- a/debian/links
+++ b/debian/links
@@ -5,3 +5,5 @@
/usr/share/devscripts/conf.default
/usr/share/doc/devscripts/devscripts.conf.ex
/usr/share/man/man1/debchange.1.gz /usr/share/man/man1/dch.1.gz
/usr/share/man/man1/pts-subscribe.1.gz
/usr/share/man/man1/pts-unsubscribe.1.gz
+/usr/share/man/fr/man1/debchange.1.gz /usr/share/man/fr/man1/dch.1.gz
+/usr/share/man/fr/man1/pts-subscribe.1.gz
/usr/share/man/fr/man1/pts-unsubscribe.1.gz
diff --git a/debian/lintian.overrides b/debian/lintian-overrides
similarity index 100%
rename from debian/lintian.overrides
rename to debian/lintian-overrides
diff --git a/debian/rules b/debian/rules
index d3573fe..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,92 +1,4 @@
#!/usr/bin/make -f
-# debian/rules for devscripts, based on the example file rules.indep.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-optimize := -O0
-else
-optimize := -O2
-endif
-
-# Here we perform some checks to ensure that we haven't goofed or left
-# debugging code around or ... before we build the package
-test: test-stamp
-test-stamp:
- # debugging info in bts?
- if grep -q '\$$debug *= *1' scripts/bts.pl; then exit 1; else exit 0; fi
- touch test-stamp
-
-build-indep: build-stamp-indep
-build-stamp-indep: test-stamp
- dh_testdir
- touch build-stamp-indep
-
-build-arch: build-stamp-arch
-build-stamp-arch: test-stamp
- dh_testdir
- $(MAKE) CFLAGS='-g $(optimize) -Wall'
- touch build-stamp-arch
-
-build: build-arch build-indep
-
-clean:
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f build-stamp* test-stamp
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- dh_install
- chmod +x debian/devscripts/usr/share/bug/devscripts/script
- install -d debian/devscripts/usr/share/lintian/overrides
- install -p -m644 debian/lintian.overrides \
- debian/devscripts/usr/share/lintian/overrides/devscripts
- $(MAKE) DESTDIR=$(CURDIR)/debian/devscripts install
-
-# Build architecture-independent files here.
-binary-indep: build-indep
-# We have nothing to do
-
-# Build architecture-dependent files here.
-binary-arch: build-arch install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installexamples
- dh_installman
- dh_link
- if [ -f debian/devscripts/usr/share/man/fr/man1/debchange.1 ]; then \
- dh_link /usr/share/man/fr/man1/debchange.1.gz \
- /usr/share/man/fr/man1/dch.1.gz; \
- fi
- if [ -f debian/devscripts/usr/share/man/fr/man1/pts-subscribe.1 ]; \
- then \
- dh_link /usr/share/man/fr/man1/pts-subscribe.1.gz \
- /usr/share/man/fr/man1/pts-unsubscribe.1.gz; \
- fi
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build-arch build-indep build clean binary-indep binary-arch binary \
- install
-
-# Local variables:
-# mode: makefile
-# End:
+%:
+ dh $@
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
