Author: dnusinow
Date: 2006-08-27 20:12:42 -0400 (Sun, 27 Aug 2006)
New Revision: 3073
Modified:
trunk/proto/x11proto-fonts/debian/changelog
trunk/proto/x11proto-fonts/debian/control
trunk/proto/x11proto-fonts/debian/rules
Log:
* Merge x11proto-fonts from 7.1 branch to trunk now that it's in unstable
Modified: trunk/proto/x11proto-fonts/debian/changelog
===================================================================
--- trunk/proto/x11proto-fonts/debian/changelog 2006-08-28 00:11:05 UTC (rev
3072)
+++ trunk/proto/x11proto-fonts/debian/changelog 2006-08-28 00:12:42 UTC (rev
3073)
@@ -1,3 +1,17 @@
+x11proto-fonts (2.0.2-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 <[EMAIL PROTECTED]> Fri, 21 Jul 2006 02:56:59 -0400
+
x11proto-fonts (2.0.2-3) unstable; urgency=low
* Upload to unstable
Modified: trunk/proto/x11proto-fonts/debian/control
===================================================================
--- trunk/proto/x11proto-fonts/debian/control 2006-08-28 00:11:05 UTC (rev
3072)
+++ trunk/proto/x11proto-fonts/debian/control 2006-08-28 00:12:42 UTC (rev
3073)
@@ -2,14 +2,14 @@
Section: x11
Priority: optional
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-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1.0
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL
PROTECTED]>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.7.2
Package: x11proto-fonts-dev
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
-Pre-Depends: x11-common (>= 1:1.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: x11-common (>= 1:7.0.0)
Conflicts: libfs-dev (<< 6.8.2-16)
Replaces: libfs-dev (<< 6.8.2-16)
Description: X11 font extension wire protocol
Modified: trunk/proto/x11proto-fonts/debian/rules
===================================================================
--- trunk/proto/x11proto-fonts/debian/rules 2006-08-28 00:11:05 UTC (rev
3072)
+++ trunk/proto/x11proto-fonts/debian/rules 2006-08-28 00:12:42 UTC (rev
3073)
@@ -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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
