[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3068 - trunk/proto/x11proto-damage/debian



Author: dnusinow
Date: 2006-08-27 19:59:20 -0400 (Sun, 27 Aug 2006)
New Revision: 3068

Modified:
   trunk/proto/x11proto-damage/debian/changelog
   trunk/proto/x11proto-damage/debian/control
   trunk/proto/x11proto-damage/debian/rules
Log:
* Merge x11proto-damage from 7.1 branch to trunk now that it's in unstable


Modified: trunk/proto/x11proto-damage/debian/changelog
===================================================================
--- trunk/proto/x11proto-damage/debian/changelog	2006-08-27 23:58:10 UTC (rev 3067)
+++ trunk/proto/x11proto-damage/debian/changelog	2006-08-27 23:59:20 UTC (rev 3068)
@@ -1,3 +1,17 @@
+x11proto-damage (1.0.3-4) unstable; urgency=low
+
+  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+    idempotency fix.
+  * Run dh_install w/ --list-missing.
+  * Change debhelper build-dep-indep to a normal build-dep, as dh_clean
+    is called inside the clean rule.
+  * Drop duplicate x11-common dep in -dev package.
+  * Bump standards version to 3.7.2.0.
+  * Version x11-common pre-dep in -dev package to 1:7.0.0 to match
+    the rest of Debian.
+
+ -- Andres Salomon <dilinger@debian.org>  Fri, 21 Jul 2006 02:55:48 -0400
+
 x11proto-damage (1.0.3-3) unstable; urgency=low
 
   * Upload to unstable

Modified: trunk/proto/x11proto-damage/debian/control
===================================================================
--- trunk/proto/x11proto-damage/debian/control	2006-08-27 23:58:10 UTC (rev 3067)
+++ trunk/proto/x11proto-damage/debian/control	2006-08-27 23:59:20 UTC (rev 3068)
@@ -2,16 +2,16 @@
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1.0
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Andres Salomon <dilinger@debian.org>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.7.2
 
 Package: x11proto-damage-dev
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, x11proto-fixes-dev, x11proto-core-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-fixes-dev, x11proto-core-dev
 Conflicts: libxdamage-dev (<< 6.8.2-16)
 Replaces: libxdamage-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1:1.0)
+Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 Damage extension wire protocol
  This package provides the wire protocol for the Damage extension, used to
  notify clients of changes made to particular areas.

Modified: trunk/proto/x11proto-damage/debian/rules
===================================================================
--- trunk/proto/x11proto-damage/debian/rules	2006-08-27 23:58:10 UTC (rev 3067)
+++ trunk/proto/x11proto-damage/debian/rules	2006-08-27 23:59:20 UTC (rev 3068)
@@ -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 --disable-shared \
@@ -72,7 +72,7 @@
 
 	dh_installdocs
 	dh_installman
-	dh_install --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp --list-missing
 	dh_installchangelogs
 	dh_link
 	dh_strip



Reply to: