[Pkg-lyx-devel] svn commit: r509 - in /lyx/branches/lyx-1.6/debian: changelog compat rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Wed Jul 23 18:04:22 2008
New Revision: 509

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=509
Log:
Use new features in debhelper v7 to shorten debian/rules.

Modified:
    lyx/branches/lyx-1.6/debian/changelog
    lyx/branches/lyx-1.6/debian/compat
    lyx/branches/lyx-1.6/debian/rules

Modified: lyx/branches/lyx-1.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.6/debian/changelog?rev=509&op=diff
==============================================================================
--- lyx/branches/lyx-1.6/debian/changelog (original)
+++ lyx/branches/lyx-1.6/debian/changelog Wed Jul 23 18:04:22 2008
@@ -6,6 +6,9 @@
       Closes: #269968
   * Don't try to install the top-level ChangeLog as changelog.gz.
   
+  [ Per Olofsson ]
+  * Use new features in debhelper v7 to shorten debian/rules.
+
  -- Sven Hoexter <sven at timegate.de>  Sun, 20 Jul 2008 16:28:52 +0200
 
 lyx (1.5.5-1) unstable; urgency=low

Modified: lyx/branches/lyx-1.6/debian/compat
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.6/debian/compat?rev=509&op=diff
==============================================================================
--- lyx/branches/lyx-1.6/debian/compat (original)
+++ lyx/branches/lyx-1.6/debian/compat Wed Jul 23 18:04:22 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: lyx/branches/lyx-1.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.6/debian/rules?rev=509&op=diff
==============================================================================
--- lyx/branches/lyx-1.6/debian/rules (original)
+++ lyx/branches/lyx-1.6/debian/rules Wed Jul 23 18:04:22 2008
@@ -63,20 +63,19 @@
 	dh_testdir
 	dh_testroot
 
-	rm -f build-stamp configure-stamp
 	rm -rf build-tree
 	! [ -f config/config.sub.backup ] || \
 		mv config/config.sub.backup config/config.sub
 
 # clean out compiled python code left around after building
-	find lib -name '*.pyc' -exec rm {} \;
+	find lib -name '*.pyc' -exec rm -v {} \;
 
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 
 	cd build-tree && $(MAKE) install DESTDIR=`pwd`/../debian/lyx-common/
 
@@ -105,44 +104,22 @@
 	chmod +x debian/lyx-common/usr/share/lyx/scripts/*
 	chmod +x debian/lyx-common/usr/share/lyx/lyx2lyx/lyx2lyx
 
+	dh_pysupport /usr/share/lyx
+
+	dh install --after dh_install
+
 # remove compiled python files, if any
-	find debian/lyx-common -name '*.pyc' -exec rm {} \;
+	find debian/lyx-common -name '*.pyc' -exec rm -v {} \;
 
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_pysupport -i /usr/share/lyx
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
+	dh binary-indep --before builddeb
 	dh_builddeb -i -- -Z bzip2
 
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installmenu -a
-	dh_installmime -a
-	dh_desktop -a
-	dh_icons -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
+	dh binary-arch --before builddeb
 	dh_builddeb -a -- -Z bzip2
 
 binary: binary-indep binary-arch
 
-build-arch: build
-build-indep: build
-
 .PHONY: build build-arch build-indep clean clean1 \
 	binary-indep binary-arch binary install configure