[Commit] fontconfig/debian rules,1.2,1.3 changelog,1.3,1.4 README.Debian,1.1,1.2

[Colin Walters]

Committed by: walters

Update of /local/src/CVS/fontconfig/debian
In directory home.keithp.com:/tmp/cvs-serv4085/debian

Modified Files:
	rules changelog README.Debian 
Log Message:
Merge with latest Debian package.


Index: rules
===================================================================
RCS file: /local/src/CVS/fontconfig/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rules	8 Apr 2003 07:26:15 -0000	1.2
+++ rules	3 May 2003 01:12:26 -0000	1.3
@@ -273,7 +273,7 @@
 	dh_installcron -p$(DEB_CURPACKAGE)
 	dh_installdebconf -p$(DEB_CURPACKAGE)
 	dh_installpam -p$(DEB_CURPACKAGE)
-	dh_installchangelogs -p$(DEB_CURPACKAGE)
+	dh_installchangelogs $(DEB_ALL_CHANGELOG) -p$(DEB_CURPACKAGE)
 	dh_installinit -p$(DEB_CURPACKAGE)
 	dh_install -p$(DEB_CURPACKAGE)
 	$(internal_invoke) deb-binary-hook-$(DEB_CURPACKAGE)
@@ -564,7 +564,7 @@
 	  (for package in $(DEB_ALL_PACKAGES); do \
 	     (cd debian/$$package && find . -type f -o -type l); \
 	   done) | sort -u > debian/cbs-package-list; \
-	  diff -u debian/cbs-install-list debian/cbs-package-list | egrep -v '^+' || true; \
+	  diff -u debian/cbs-install-list debian/cbs-package-list | egrep '^-' || true; \
 	fi
 
 # Required Debian targets

Index: changelog
===================================================================
RCS file: /local/src/CVS/fontconfig/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog	12 Apr 2003 05:32:28 -0000	1.3
+++ changelog	3 May 2003 01:12:26 -0000	1.4
@@ -1,3 +1,31 @@
+fontconfig (2.2.0+cvs20030502-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+
+ -- Colin Walters <walters@debian.org>  Fri,  2 May 2003 19:28:57 -0400
+
+fontconfig (2.2.0-1) unstable; urgency=low
+
+  * The "Harsh Light Of Morning Falls On One Night Stand's DVD Collection"
+    release.
+  * New upstream release.
+
+ -- Colin Walters <walters@debian.org>  Wed, 23 Apr 2003 20:39:54 -0400
+
+fontconfig (2.1.94-1) unstable; urgency=low
+
+  * The "I speak better English than this villian Bush" release.
+    (Courtesy of Mohammed Saeed al-Sahaf).
+  * New upstream (pre)release.
+  * README.Debian:
+    - Remove experimental notice.
+  * debian/patches/fonts-conf-cleanup.patch:
+    - Update.
+  * debian/rules:
+    - Update to the latest version of Colin's Build System.
+
+ -- Colin Walters <walters@debian.org>  Thu, 17 Apr 2003 00:13:37 -0400
+
 fontconfig (2.1.93-1) unstable; urgency=low
 
   * The "Saddam Speech Suspiciously Mentions Nelly Song From Last Summer"

Index: README.Debian
===================================================================
RCS file: /local/src/CVS/fontconfig/debian/README.Debian,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.Debian	4 Apr 2003 19:55:52 -0000	1.1
+++ README.Debian	3 May 2003 01:12:26 -0000	1.2
@@ -1,6 +1,3 @@
-
-This package is still somewhat experimental.
-
 *** IMPORTANT ***
 Recently, fontconfig changed to not include bitmapped fonts in the
 default font path.  There is now a Debconf question about this.