r822 - in /unstable/vls/debian: changelog control rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Jul 16 12:01:33 2007
New Revision: 822

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=822
Log:
* Update autotools/config.guess and .sub at build time from the versions in
  autotools-dev; build-dep on autotools-dev.

Modified:
    unstable/vls/debian/changelog
    unstable/vls/debian/control
    unstable/vls/debian/rules

Modified: unstable/vls/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vls/debian/changelog?rev=822&op=diff
==============================================================================
--- unstable/vls/debian/changelog (original)
+++ unstable/vls/debian/changelog Mon Jul 16 12:01:33 2007
@@ -1,8 +1,10 @@
-vls (0.5.4+cvs20031028-9) UNRELEASED; urgency=low
+vls (0.5.4+cvs20031028-9) unstable; urgency=high
 
   * Honor failures of make distclean.
+  * Update autotools/config.guess and .sub at build time from the versions in
+    autotools-dev; build-dep on autotools-dev.
 
- -- Loic Minier <lool at dooz.org>  Mon, 16 Jul 2007 13:56:42 +0200
+ -- Loic Minier <lool at dooz.org>  Mon, 16 Jul 2007 14:00:05 +0200
 
 vls (0.5.4+cvs20031028-8) unstable; urgency=high
 

Modified: unstable/vls/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vls/debian/control?rev=822&op=diff
==============================================================================
--- unstable/vls/debian/control (original)
+++ unstable/vls/debian/control Mon Jul 16 12:01:33 2007
@@ -9,7 +9,8 @@
                libdvdread-dev,
                libdvb-dev (>= 0.5.5.1-3),
                libdvbpsi4-dev,
-               linux-libc-dev (>= 2.5.999-test7-bk-7)
+               linux-libc-dev (>= 2.5.999-test7-bk-7),
+               autotools-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/vls
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vls/

Modified: unstable/vls/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vls/debian/rules?rev=822&op=diff
==============================================================================
--- unstable/vls/debian/rules (original)
+++ unstable/vls/debian/rules Mon Jul 16 12:01:33 2007
@@ -9,6 +9,15 @@
 build-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	# backup the original files to restore them in the clean target
+	-test -r autotools/config.sub && \
+		cp autotools/config.sub autotools/config.sub.orig
+	-test -r autotools/config.guess && \
+		cp autotools/config.guess autotools/config.guess.orig
+	-test -r /usr/share/misc/config.sub && \
+		cp -f /usr/share/misc/config.sub autotools/config.sub
+	-test -r /usr/share/misc/config.guess && \
+		cp -f /usr/share/misc/config.guess autotools/config.guess
 	./configure --prefix=/usr --sysconfdir=/etc --disable-debug \
 		--mandir=$${prefix}/share/man --infodir=$${prefix}/share/info \
 		--enable-dvd --enable-dvb --with-libdvb=/usr/include/libdvb
@@ -19,6 +28,11 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+	# restore files from backup (before unpatching)
+	-test -r autotools/config.sub.orig && \
+		mv -f autotools/config.sub.orig autotools/config.sub
+	-test -r autotools/config.guess.orig && \
+		mv -f autotools/config.guess.orig autotools/config.guess
 	[ ! -f Makefile ] || $(MAKE) distclean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean