[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. b2786bd3dddc098b58d2111898ae9152175dfddc

[Per Olofsson]

The following commit has been merged in the master branch:
commit b2786bd3dddc098b58d2111898ae9152175dfddc
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Thu Jul 16 00:11:20 2009 +0200

    Simplify debian/rules even more by using the new dh override feature. Also use dh for quilt. Build-deps accordingly.

diff --git a/debian/changelog b/debian/changelog
index b9f896f..9bcbe6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ lyx (1.6.3-3) UNRELEASED; urgency=low
   * Make a symlink from /usr/share/doc/latex-xft-fonts to ttf-lyx. Saves
     space.
   * Add patch fix-manpage-errors which fixes errors in tex2lyx(1).
+  * Simplify debian/rules even more by using the new dh override
+    feature. Also use dh for quilt. Build-deps accordingly.
 
  -- Per Olofsson <pelle at debian.org>  Sun, 05 Jul 2009 23:18:04 +0200
 
diff --git a/debian/control b/debian/control
index 82fdbc6..5cf485e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Git: git://git.debian.org/git/pkg-lyx/lyx.git
 Vcs-Browser: http://git.debian.org/?p=pkg-lyx/lyx.git
 Homepage: http://www.lyx.org/
 Build-Depends: libaiksaurus-dev, python-support (>= 0.6),
- debhelper (>= 7), quilt,
+ debhelper (>= 7.0.50), quilt (>= 0.46-7),
  libz-dev, libx11-dev, libaspell-dev,
  autotools-dev, libqt4-dev, libboost-dev (>= 1.38.0),
  libboost-filesystem-dev, libboost-signals-dev,
diff --git a/debian/rules b/debian/rules
index 2c9cd2c..46b8c54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -29,10 +27,10 @@ CONFIGURE_OPTIONS += \
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-configure: patch configure-stamp
-configure-stamp:
-	dh_testdir
+%:
+	dh --with quilt $@
 
+override_dh_auto_configure:
 	set -e; if ! [ -f config/config.sub.backup ]; then \
 		mv config/config.sub config/config.sub.backup; \
 		ln -s /usr/share/misc/config.sub config/config.sub; \
@@ -41,18 +39,10 @@ configure-stamp:
 	test -d build-tree || mkdir build-tree
 	cd build-tree && ../configure $(CONFIGURE_OPTIONS)
 
-	touch configure-stamp
-
-build: configure build-stamp
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
 	cd build-tree && $(MAKE)
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
 
+override_dh_auto_clean:
 	! test -e build-tree || rm -r build-tree
 	! test -f config/config.sub.backup || \
 		mv config/config.sub.backup config/config.sub
@@ -60,21 +50,9 @@ clean: unpatch
 # clean out compiled python code left around after building
 	find lib -name '*.pyc' -exec rm -v {} \;
 
-	dh_clean
-
-install: build
-# hack: remove debhelper logs so that install target is idempotent
-	rm -f debian/*.log
-
-	dh_testdir
-	dh_testroot
-	dh_prep
-
+override_dh_auto_install:
 	cd build-tree && $(MAKE) install DESTDIR=`pwd`/../debian/lyx-common
 
-	dh_installdirs
-	dh_install
-
 # move binaries to arch package
 	mv debian/lyx-common/usr/bin debian/lyx/usr/bin
 	mv debian/lyx-common/usr/share/man debian/lyx/usr/share/man
@@ -95,20 +73,13 @@ install: build
 		debian/lyx-common/usr/share/texmf/tex/latex/lyx
 	cp debian/bash_completion debian/lyx-common/etc/bash_completion.d/lyx
 
-	dh_link
+override_dh_pysupport:
 	dh_pysupport /usr/share/lyx
+
+override_dh_install:
+	dh_install
 	dh_installtex -plyx-common
 	dh_installdefoma -pttf-lyx
 
-# now run the rest of the debhelper commands
-	dh install --after dh_install
-
-binary-indep: build install
-	dh binary-indep --before builddeb
-	dh_builddeb -i -- -Z bzip2
-
-binary-arch: build install
-	dh binary-arch --before builddeb
-	dh_builddeb -a -- -Z bzip2
-
-binary: binary-indep binary-arch
+override_dh_builddeb:
+	dh_builddeb -- -Z bzip2

-- 
LyX packaging