Author: vorlon
Date: 2006-09-18 03:31:07 -0400 (Mon, 18 Sep 2006)
New Revision: 3235

Modified:
   trunk/driver/xserver-xorg-input-acecad/debian/changelog
   trunk/driver/xserver-xorg-input-acecad/debian/control
   trunk/driver/xserver-xorg-input-acecad/debian/rules
Log:
merge 2378:3208 from 7.1 branch, in preparation for upload to unstable

Modified: trunk/driver/xserver-xorg-input-acecad/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-input-acecad/debian/changelog     2006-09-18 
07:26:55 UTC (rev 3234)
+++ trunk/driver/xserver-xorg-input-acecad/debian/changelog     2006-09-18 
07:31:07 UTC (rev 3235)
@@ -1,3 +1,11 @@
+xserver-xorg-input-acecad (1:1.0.0.5-3) UNRELEASED; urgency=low
+
+  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+    idempotency fix.
+  * Run dh_install w/ --list-missing.
+
+ -- Andres Salomon <[EMAIL PROTECTED]>  Mon, 17 Jul 2006 01:06:38 -0400
+
 xserver-xorg-input-acecad (1:1.0.0.5-2) unstable; urgency=low
 
   * Upload to modular

Modified: trunk/driver/xserver-xorg-input-acecad/debian/control
===================================================================
--- trunk/driver/xserver-xorg-input-acecad/debian/control       2006-09-18 
07:26:55 UTC (rev 3234)
+++ trunk/driver/xserver-xorg-input-acecad/debian/control       2006-09-18 
07:31:07 UTC (rev 3235)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0), pkg-config, xserver-xorg-dev, 
linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.1
 
 Package: xserver-xorg-input-acecad
 Architecture: any

Modified: trunk/driver/xserver-xorg-input-acecad/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-input-acecad/debian/rules 2006-09-18 07:26:55 UTC 
(rev 3234)
+++ trunk/driver/xserver-xorg-input-acecad/debian/rules 2006-09-18 07:31:07 UTC 
(rev 3235)
@@ -35,7 +35,7 @@
 build-stamp:
        dh_testdir
 
-       mkdir obj-$(DEB_BUILD_GNU_TYPE)
+       test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
        cd obj-$(DEB_BUILD_GNU_TYPE) && \
        ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
                     --infodir=\$${prefix}/share/info $(confflags) \
@@ -72,7 +72,7 @@
 
        dh_installdocs
        dh_installchangelogs
-       dh_install --sourcedir=debian/tmp
+       dh_install --sourcedir=debian/tmp --list-missing
        dh_link
        dh_strip
        dh_compress


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to