Author: dnusinow
Date: 2006-08-29 23:17:55 -0400 (Tue, 29 Aug 2006)
New Revision: 3128

Modified:
   trunk/lib/libfs/debian/changelog
   trunk/lib/libfs/debian/control
   trunk/lib/libfs/debian/rules
Log:
* Merge libfs from 7.1 branch to trunk in preparation for upload to
  unstable


Modified: trunk/lib/libfs/debian/changelog
===================================================================
--- trunk/lib/libfs/debian/changelog    2006-08-30 00:40:53 UTC (rev 3127)
+++ trunk/lib/libfs/debian/changelog    2006-08-30 03:17:55 UTC (rev 3128)
@@ -1,3 +1,15 @@
+libfs (2:1.0.0-4) UNRELEASED; urgency=low
+
+  [ Andres Salomon ]
+  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+    idempotency fix.
+  * Run dh_install w/ --list-missing.
+
+  [ Drew Parsons ]
+  * dbg package has priority extra.
+
+ -- Drew Parsons <[EMAIL PROTECTED]>  Sat, 19 Aug 2006 22:19:56 +1000
+
 libfs (2:1.0.0-3) unstable; urgency=low
 
   * Reorder makeshlib command in rules file so that ldconfig is run

Modified: trunk/lib/libfs/debian/control
===================================================================
--- trunk/lib/libfs/debian/control      2006-08-30 00:40:53 UTC (rev 3127)
+++ trunk/lib/libfs/debian/control      2006-08-30 03:17:55 UTC (rev 3128)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force <[email protected]>
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0), pkg-config, x11proto-core-dev (>= 
6.8.99.15+cvs.20050722-1), x11proto-fonts-dev, xtrans-dev
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.1
 
 Package: libfs6
 Architecture: any
@@ -23,6 +23,7 @@
 
 Package: libfs6-dbg
 Architecture: any
+Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libfs6 (= 
${Source-Version})
 Description: X11 Font Services library (debug package)
  libFS, the Font Services library, provides various functions useful to

Modified: trunk/lib/libfs/debian/rules
===================================================================
--- trunk/lib/libfs/debian/rules        2006-08-30 00:40:53 UTC (rev 3127)
+++ trunk/lib/libfs/debian/rules        2006-08-30 03:17:55 UTC (rev 3128)
@@ -36,7 +36,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_testroot
 
        dh_installdocs
-       dh_install --sourcedir=debian/tmp
+       dh_install --sourcedir=debian/tmp --list-missing
        dh_installchangelogs
        dh_link
        dh_strip --dbg-package=$(PACKAGE)


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

Reply via email to