r6986 - packages/trunk/libphysfs/debian

[Barry deFreese]

Author: bddebian-guest
Date: 2008-05-12 20:18:54 +0000 (Mon, 12 May 2008)
New Revision: 6986

Modified:
   packages/trunk/libphysfs/debian/changelog
   packages/trunk/libphysfs/debian/rules
   packages/trunk/libphysfs/debian/watch
Log:
  * Fix up watch file.
  * Re-enable readline support in rules.
    + Add build-dep on libreadline5-dev.


Modified: packages/trunk/libphysfs/debian/changelog
===================================================================
--- packages/trunk/libphysfs/debian/changelog	2008-05-12 18:32:55 UTC (rev 6985)
+++ packages/trunk/libphysfs/debian/changelog	2008-05-12 20:18:54 UTC (rev 6986)
@@ -17,6 +17,9 @@
     + 01_manpages.diff - Fix generated manpages.
   * Add sed script in rules to fix manpage whatis entry.
   * Add VCS tags.
+  * Fix up watch file.
+  * Re-enable readline support in rules.
+    + Add build-dep on libreadline5-dev.
   * Bump debhelper build-dep and compat to 5.
   * Bump Standards Version to 3.7.3. (No changes needed).
 

Modified: packages/trunk/libphysfs/debian/rules
===================================================================
--- packages/trunk/libphysfs/debian/rules	2008-05-12 18:32:55 UTC (rev 6985)
+++ packages/trunk/libphysfs/debian/rules	2008-05-12 20:18:54 UTC (rev 6986)
@@ -9,6 +9,12 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
 include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
@@ -32,12 +38,10 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
+	CFLAGS="$(CFLAGS)" ./configure $(confflags) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--disable-readline
+		--infodir=\$${prefix}/share/info
 
 build: build-stamp
 build-stamp: config.status
@@ -60,7 +64,7 @@
 
 	rm -fR docs/html docs/latex docs/man
 	rm -f config.log config.status config.sub config.guess
-	find ./ -name Makefile |xargs rm -f
+	find ./ -name Makefile -delete
 	rm -f config.h
 	rm -f libtool
 	rm -f stamp-h1

Modified: packages/trunk/libphysfs/debian/watch
===================================================================
--- packages/trunk/libphysfs/debian/watch	2008-05-12 18:32:55 UTC (rev 6985)
+++ packages/trunk/libphysfs/debian/watch	2008-05-12 20:18:54 UTC (rev 6986)
@@ -1,2 +1,2 @@
-version=2
-http://www.icculus.org/physfs/downloads/physfs-(.*)\.tar\.gz debian uupdate
+version=3
+http://www.icculus.org/physfs/downloads/physfs-([\d.]+)\.tar\.gz