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

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



Author: fabbione
Date: 2004-07-15 02:24:41 -0500 (Thu, 15 Jul 2004)
New Revision: 1653

Modified:
   people/fabbione/trunk/debian/CHANGESET
   people/fabbione/trunk/debian/README
Log:
Document MANIFEST changes in debian/README


Modified: people/fabbione/trunk/debian/CHANGESET
===================================================================
--- people/fabbione/trunk/debian/CHANGESET	2004-07-15 07:13:32 UTC (rev 1652)
+++ people/fabbione/trunk/debian/CHANGESET	2004-07-15 07:24:41 UTC (rev 1653)
@@ -8,6 +8,9 @@
 (It should always be safe to merge the latest version of TODO or CHANGESETS
 files anywhere.)
 
+Document MANIFEST changes in debian/README
+    1653
+
 Add MANIFEST.$ARCH.all for special archs (s390 anf hurd-i386) and add support
 in debian/rules.
     1633

Modified: people/fabbione/trunk/debian/README
===================================================================
--- people/fabbione/trunk/debian/README	2004-07-15 07:13:32 UTC (rev 1652)
+++ people/fabbione/trunk/debian/README	2004-07-15 07:24:41 UTC (rev 1653)
@@ -74,14 +74,16 @@
   in our XFree86 binary packages; for instance, our X server wrapper and
   tools for handling fonts.alias and fonts.scale files are here.
 
-MANIFEST.$(ARCH):
-  This file is here to keep track of what the install rules actually
-  install.  If this changes, we need to know about it; there may be new
-  files we want to ship, or there may be a build-dependency problem such
-  that files that should be there are not.  This version is compared
-  against one that is generated after the XFree86 install rule is run.
+MANIFEST.$(ARCH).{in,all} and MANIFEST.all:
+  These files are here to keep track of what the install rules actually
+  install.  The combination of these files creates a MANIFEST.$(ARCH)
+  to reflect what the system expect to be installed after the build.  If this
+  changes, we need to know about it; there may be new files we want to ship,
+  or there may be a build-dependency problem such that files that should be
+  there are not.  This version is compared against one that is generated
+  after the XFree86 install rule is run.
 
-  *VERY IMPORTANT*: It doesn't do any good to replace the MANIFEST file
+  *VERY IMPORTANT*: It doesn't do any good to replace the MANIFEST files
   without making appropriate changes to the debhelper files.  If you find
   that a new MANIFEST file for your architecture needs to be generated,
   contact the package maintainer, branden@debian.org.  Obviously there are
@@ -89,12 +91,17 @@
   build process, but if it has changed, it is important to know why.
 
   Once you have updated the appropriate debhelper files specific to your
-  architecture (see next section), overwrite the old MANIFEST file with the
-  new one.  Then start the build again.  Be sure to get the new canonical
-  version of MANIFEST.$(ARCH) to the XFree86 package maintainer.  (This
-  applies only if you are doing official porting work for the Debian
-  Project.)
+  architecture (see next section), you will have to clean the new MANIFEST
+  from arch independant files. This can be achieved removing all the files
+  listed in MANIFEST{.$(ARCH),}.all from the new MANIFEST file.  Overwrite
+  then the old MANIFEST.$(ARCH) file with the new one.  Then start the build
+  again.  Be sure to get the new canonical version of MANIFEST.$(ARCH) to
+  the XFree86 package maintainer.  (This applies only if you are doing
+  official porting work for the Debian Project.)
 
+  NOTE: MANIFEST.$ARCH.all is preferred to MANIFEST.all (actually required
+  only by two architectures.
+
 $(package).*.$(ARCH):
   These exist in cases where the contents of one of the debhelper files is
   architecture-specific.  As the MANIFEST illustrates, different things get



Reply to: