X Strike Force X.Org X11 SVN commit: r101 - trunk/debian
Author: dnusinow
Date: 2005-05-16 21:12:07 -0500 (Mon, 16 May 2005)
New Revision: 101
Added:
trunk/debian/README
Modified:
trunk/debian/changelog
Log:
Adding README from xfree trunk and re-branding for X.Org.
Added: trunk/debian/README
===================================================================
--- trunk/debian/README 2005-05-17 02:08:59 UTC (rev 100)
+++ trunk/debian/README 2005-05-17 02:12:07 UTC (rev 101)
@@ -0,0 +1,139 @@
+$Id: README 1695 2004-07-29 07:22:25Z branden $
+
+This file attempts to explain some of the oddities of the X.Org Debian
+source package by describing the files and directories not usually found in
+a (debhelperized) source package.
+
+NOTE: A straight build of the X.Org sources without any patches from
+debian/patches will **NOT** work because some non-free fonts had to be
+removed from the source package. Either turn off the building of fonts, or
+be prepared to edit the Imakefile and fonts.scale files in some of the
+directories under xc/fonts/scaled; see debian/copyright for more
+information.
+
+*** If you're building the X.Org packages on a new architecture for Debian,
+*** be sure to read this entire file, and also check the Architecture: lines
+*** for all packages in the control file. Not every package is "any" or
+*** "all", and you may need to add your architecture explicitly to the
+*** Architecture: fields of some packages.
+
+This package uses DBS, the Debian Build System.
+
+Interesting targets supported by the debian/rules file include:
+ debian/rules unpacked Unpacks the source.
+ debian/rules setup Unpacks and patches the source.
+ debian/rules patch-audit Unpacks and patches the source, and
+ verifies that there are no offsets or
+ fuzz in the patches. If you are
+ contributing a patch, please verify that
+ this target works before submitting it;
+ it can save the package maintainers a
+ considerable amount of time.
+ debian/rules make_patch Creates a patch call new.diff in the
+ package root that is the difference
+ betwwen a source tree patched with
+ only the patches from debian/patches
+ and changes that you make to the tree.
+ The new.diff is suitable to be moved
+ into the debian/patches.
+
+scripts:
+ Directory containing the internals of Doogie's Build System. If any
+ architecture-specific make variables need to be declared, you may do so
+ debian/scripts/vars.$(ARCH).
+
+patches:
+ Directory containing patches applied in ASCIIbetical order.
+ numeric prefix indicates disposition of patch
+ 000 patches FROM upstream
+
+ 001-899 patches that should be sent upstream
+
+ 001-099 general-purpose patches
+ 100-149 sparc/sparc64 architecture patches
+ 150-199 powerpc architecture patches
+ 200-249 alpha architecture patches
+ 250-299 m68k architecture patches
+ 300-349 arm architecture patches
+ 350-399 mips/mipsel architecture patches
+ 400-449 hppa architecture patches
+ 450-499 ia64 architecture patches
+ 500-549 s390/s390x architecture patches
+ 550-599 sh{3,4}{,eb} architecture patches
+ 600-649 amd64 architecture patches
+ 800-819 Debian GNU/Hurd patches
+ 820-839 Debian GNU/FreeBSD patches
+ 840-859 Debian GNU/NetBSD patches
+ 860-879 Debian OpenBSD patches
+
+ 900-999 patches that should not be sent upstream
+
+ 900-998 Debian-specific behavior and enhancements
+ 999 experimental or debugging patches (should not
+ generally be present in a production release)
+
+local:
+ This contains Debian-specific programs and documentation that we include
+ in our X.Org binary packages; for instance, our X server wrapper and
+ tools for handling fonts.alias and fonts.scale files are here.
+
+MANIFEST.$(ARCH).{in,all} and MANIFEST.all:
+ These files are here to keep track of what the upstream install rules actually
+ install. Together, these files create a MANIFEST.$(ARCH) file which reflects
+ what the system expects 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 X.Org install
+ rule is run.
+
+ *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
+ maintenance team, the Debian X Strike Force <debian-x@lists.debian.org>.
+ Obviously there are several ways to just shut the manifest check up and
+ proceed with the 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 the next section), architecture-independent files will need
+ to be removed from the list of architecture-specific files listed for your
+ architecture in MANIFEST.$(ARCH).in. Anything listed in MANIFEST.all should
+ not be listed in MANIFEST.$(ARCH).in. Next, start the build again. Repeat
+ this cycle until there are no more MANIFEST mismatches. Be sure to get the
+ new canonical version of MANIFEST.$(ARCH) to the X.Org package maintenance
+ team (if you are doing official porting work for the Debian Project).
+
+ NOTE: If a MANIFEST.$(ARCH).all file exists, it is used in place of
+ MANIFEST.all. This is a rare circumstance, and if you suspect you need to
+ create a MANIFEST.$(ARCH).all file, please contact the X.Org package
+ maintenance team.
+
+$(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
+ installed for different architectures. This feature requires debhelper
+ 2.1.8 or later and is so noted in the Build-Depends.
+
+ If a debhelper file with the .$(ARCH) extension is not present, debhelper
+ will fall back to the version of the file without any .$(ARCH) extension.
+
+ The correctness of the MANIFEST and debhelper files with respect to each other
+ can be checked with the manifest-install-reconcile script in the
+ debian/scripts directory. Run the script as "manifest-install-reconcile
+ validate". It is highly recommended that this be done before making an
+ official package release.
+
+po:
+ This directory contains translations of debconf templates. See the
+ po-debconf(7) manpage for more information.
+
+ NOTE: At present, this package needs to use its own modified version of
+ debconf-updatepo, which is kept in debian/scripts. The "updatepo" target in
+ the debian/rules file will take care of running this modified version for you.
+
+ WARNING: The "updatepo" target should be invoked any time the
+ debian/*.templates files change or a debian/po/*.po translation file is
+ updated. If it is not, dh_installdebconf will run the stock debconf-updatepo
+ script in a way which will clobber important data.
+
+vim:set ai et sw=2 sts=2 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-17 02:08:59 UTC (rev 100)
+++ trunk/debian/changelog 2005-05-17 02:12:07 UTC (rev 101)
@@ -10,6 +10,7 @@
- Update shell-lib.sh to merge changes from current xfree tree
- Change twm manpage to be set to twm.1x rather than twm.1, as in the
xfree packaging
+ - Re-brand XFree86 to X.Org in README
- Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
until I know more about why it was removed.
Reply to: