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

X Strike Force XFree86 SVN commit: r1657 - people/fabbione/trunk/debian



Author: fabbione
Date: 2004-07-15 04:25:40 -0500 (Thu, 15 Jul 2004)
New Revision: 1657

Modified:
   people/fabbione/trunk/debian/CHANGESET
   people/fabbione/trunk/debian/rules
Log:
Remove abuse of CAT in debian/rules


Modified: people/fabbione/trunk/debian/CHANGESET
===================================================================
--- people/fabbione/trunk/debian/CHANGESET	2004-07-15 09:19:46 UTC (rev 1656)
+++ people/fabbione/trunk/debian/CHANGESET	2004-07-15 09:25:40 UTC (rev 1657)
@@ -8,6 +8,9 @@
 (It should always be safe to merge the latest version of TODO or CHANGESETS
 files anywhere.)
 
+Remove abuse of CAT in debian/rules
+    1657
+
 Document MANIFEST changes in debian/README
     1653
 

Modified: people/fabbione/trunk/debian/rules
===================================================================
--- people/fabbione/trunk/debian/rules	2004-07-15 09:19:46 UTC (rev 1656)
+++ people/fabbione/trunk/debian/rules	2004-07-15 09:25:40 UTC (rev 1657)
@@ -345,12 +345,12 @@
 	(cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) > debian/MANIFEST.$(ARCH).new
 	# create proper MANIFEST from our well known sources
 	if [ ! -e debian/build-all ]; then \
-	  cp debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH); \
+	  sort -u debian/MANIFEST.$(ARCH).in > debian/MANIFEST.$(ARCH); \
 	$(ELSE) \
 	  if [ -e debian/MANIFEST.$(ARCH).all ]; then \
-	    cat debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all | sort > debian/MANIFEST.$(ARCH); \
+	    sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all > debian/MANIFEST.$(ARCH); \
 	  $(ELSE) \
-	    cat debian/MANIFEST.$(ARCH).in debian/MANIFEST.all | sort > debian/MANIFEST.$(ARCH); \
+	    sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all > debian/MANIFEST.$(ARCH); \
 	  fi; \
 	fi
 	# confirm that the installed file list has not changed



Reply to: