[clanlib] 05/06: dh 9, short rules, "3.0 (quilt)" format.
Stephen Kitt
skitt at moszumanska.debian.org
Fri Jun 10 22:04:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository clanlib.
commit d9dfa910499b6e986916bf1f826d2064d636129b
Author: Stephen Kitt <steve at sk2.org>
Date: Fri Jun 10 23:56:24 2016 +0200
dh 9, short rules, "3.0 (quilt)" format.
---
debian/README.source | 57 ----------------------------------
debian/changelog | 2 ++
debian/compat | 2 +-
debian/control | 7 ++---
debian/libclanlib-dev.links | 1 -
debian/libclansdl-1.0v5.links | 1 -
debian/rules | 72 +++++--------------------------------------
debian/source/format | 1 +
8 files changed, 14 insertions(+), 129 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/changelog b/debian/changelog
index 979619f..b4e4fe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ clanlib (1.0~svn3827-5) UNRELEASED; urgency=medium
* Acknowledge NMU, thanks Tobias! (Closes: #811017)
* Apply Chris Lamb's patch to make the build reproducible. (Closes:
#790357)
+ * Switch to short dh rules, "3.0 (quilt)" source format and debhelper
+ compatibility level 9. (Closes: #821971)
* Clean up debian/control with cme.
* Standards-Version 3.9.8, no further change required.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 3abd8d4..5a0d4e3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,8 @@ Uploaders: Sam Hocevar <sho at debian.org>,
Barry deFreese <bdefreese at debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper (>= 5.0),
- quilt,
- autoconf,
- automake,
- libtool,
+Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
bzip2,
libesd0-dev,
libfreetype6-dev,
diff --git a/debian/libclanlib-dev.links b/debian/libclanlib-dev.links
index 7fb8ef2..361b4e6 100644
--- a/debian/libclanlib-dev.links
+++ b/debian/libclanlib-dev.links
@@ -1,2 +1 @@
-/usr/share/doc/libclanapp-1.0v5 /usr/share/doc/libclanlib-dev
/usr/include/ClanLib-1.0/ClanLib /usr/include/ClanLib
diff --git a/debian/libclansdl-1.0v5.links b/debian/libclansdl-1.0v5.links
deleted file mode 100644
index 5f59e06..0000000
--- a/debian/libclansdl-1.0v5.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/libclanapp-1.0v5 /usr/share/doc/libclansdl-1.0v5
diff --git a/debian/rules b/debian/rules
index eb6a41c..f24c98e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,25 +27,14 @@ CONFIG_FLAGS := \
--x-includes=/usr/include/X11 \
--prefix=/usr --mandir=/usr/share/man
-build: configure-stamp build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-configure-stamp:
- dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
- autoreconf -fvi
+%:
+ dh $@ --with autoreconf
+override_dh_auto_configure:
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure $(CONFIG_FLAGS)
- touch $@
-clean:
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
+override_dh_auto_clean:
+ dh_auto_clean
rm -f build-stamp configure-stamp
rm -f config.sub config.guess ltmain.sh configure
rm -f missing depcomp install-sh aclocal.m4
@@ -53,54 +42,9 @@ clean:
rm -f Documentation/*.html
rm -f Documentation/Tutorial/*.html
rm -f Documentation/Tutorial/Kavanek/*.html
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -rf .pc
- dh_clean
-install: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- find debian/tmp -name '*.la' -exec rm '{}' ';'
- dh_install --fail-missing --sourcedir=debian/tmp
+override_dh_installdocs-arch:
+ dh_installdocs --link-doc=libclanapp-1.0v5
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdebconf -i
- dh_installdocs -pclanlib-doc
+override_dh_installexamples-indep:
dh_installexamples -pclanlib-doc Examples/*
- dh_installchangelogs -pclanlib-doc
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdebconf -a
- dh_installdocs -plibclanapp-1.0v5
- dh_installchangelogs -plibclanapp-1.0v5
- dh_strip -a
- dh_link -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -plibclanapp-1.0v5 -V "libclanapp-1.0v5"
- dh_makeshlibs -plibclansdl-1.0v5 -V "libclansdl-1.0v5"
- dh_installdeb -a
- dh_shlibdeps -a -L libclanapp-1.0v5 -L libclansdl-1.0v5 -ldebian/libclanapp-1.0v5/usr/lib:debian/libclansdl-1.0v5/usr/lib
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep build clean install
-
-# vim: sw=8:ts=8:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/clanlib.git
More information about the Pkg-games-commits
mailing list