[Pkg-lyx-devel] svn commit: r220 - in /lyx/trunk/debian: changelog control rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Sun Dec  3 14:09:18 2006
New Revision: 220

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=220
Log:
* Include the quilt package's quilt.make instead of running quilt on our
  own. Simplifies debian/rules.

Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/control
    lyx/trunk/debian/rules

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=220&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Sun Dec  3 14:09:18 2006
@@ -1,3 +1,11 @@
+lyx (1.4.3-3) UNRELEASED; urgency=low
+
+  [ Per Olofsson ]
+  * Include the quilt package's quilt.make instead of running quilt on our
+    own. Simplifies debian/rules.
+
+ -- Per Olofsson <pelle at debian.org>  Sun,  3 Dec 2006 14:09:11 +0100
+
 lyx (1.4.3-2) unstable; urgency=low
 
   [ Sven Hoexter ]

Modified: lyx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/control?rev=220&op=diff
==============================================================================
--- lyx/trunk/debian/control (original)
+++ lyx/trunk/debian/control Sun Dec  3 14:09:18 2006
@@ -6,7 +6,7 @@
 Standards-Version: 3.7.2
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-lyx/lyx/trunk
-Build-Depends: tetex-bin | texlive-latex-base, libaiksaurus-dev, python-dev, python-support (>= 0.5.3), debhelper (>= 5.0.37.2), quilt, g++ (>= 4:4.0.1-8), libz-dev, libx11-dev, libaspell-dev, dpkg-dev (>= 1.13.19), autotools-dev, libqt3-mt-dev, libforms-dev, libforms-bin, libxpm-dev, x11proto-core-dev
+Build-Depends: tetex-bin | texlive-latex-base, libaiksaurus-dev, python-dev, python-support (>= 0.5.3), debhelper (>= 5.0.37.2), quilt (>= 0.40-1), g++ (>= 4:4.0.1-8), libz-dev, libx11-dev, libaspell-dev, dpkg-dev (>= 1.13.19), autotools-dev, libqt3-mt-dev, libforms-dev, libforms-bin, libxpm-dev, x11proto-core-dev
 Build-Conflicts: libboost-dev, libboost-regex-dev, libboost-signals-dev
 
 Package: lyx

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=220&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Sun Dec  3 14:09:18 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export QUILT_PATCHES = debian/patches
+include /usr/share/quilt/quilt.make
 
 FRONTENDS = qt xforms
 
@@ -60,11 +60,9 @@
 	sed "s/^\(Build-Depends:.*\)\$$/\\1$$build_deps/" debian/control.in >$@
 	set -e; for i in $(FRONTENDS); do cat debian/control.$$i >> $@; done
 
-build: debian/control build-stamp
+build: debian/control patch build-stamp
 build-stamp:
 	dh_testdir
-
-	quilt push -a || test $$? = 2
 
 	[ -f config/config.sub.backup ] \
 		|| mv config/config.sub config/config.sub.backup
@@ -82,7 +80,8 @@
 	cd build-tree && $(MAKE)
 	touch build-stamp
 
-clean: debian/control
+clean: clean1 unpatch
+clean1: debian/control
 	dh_testdir
 	dh_testroot
 
@@ -90,10 +89,6 @@
 	rm -rf build-tree
 	mv config/config.guess.backup config/config.guess || true
 	mv config/config.sub.backup config/config.sub || true
-
-	quilt pop -a || test $$? = 2
-	! [ -e .pc/.version ] || rm .pc/.version
-	! [ -e .pc ] || rmdir .pc
 
 	dh_clean
 
@@ -177,5 +172,5 @@
 build-arch: build
 build-indep: build
 
-.PHONY: build build-arch build-indep clean \
+.PHONY: build build-arch build-indep clean clean1 \
 	binary-indep binary-arch binary install