X Strike Force X.Org X11 SVN commit: r25 - trunk/debian
Author: branden
Date: 2005-03-09 23:36:24 -0500 (Wed, 09 Mar 2005)
New Revision: 25
Modified:
trunk/debian/TODO
trunk/debian/rules
Log:
Add prune-upstream-tree target to rules file.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-03-10 01:06:25 UTC (rev 24)
+++ trunk/debian/TODO 2005-03-10 04:36:24 UTC (rev 25)
@@ -21,16 +21,11 @@
...for EVERY Imakefile imake processes.
* Prune the X.Org X11 tree before generating .orig.tar.gz:
- + anything non-free still in it
- + Debian stuff already packaged separately:
- - xc/extras/expat
- - xc/extras/fontconfig
- - xc/extras/freetype2
- - xc/extras/rman (also non-free)
- - xc/extras/zlib
- - xc/programs/xterm
- + XPRINT Xserver stuff if it can be correctly identified
+ + xterm
+ + XPRINT server
+* Document non-freeness of rman (PolyglotMan) in debian/copyright.
+
* Explore moving some of the Build-Depends to Build-Depends-Indep; stuff needed
only for building fonts and docs should be safely movable there.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-03-10 01:06:25 UTC (rev 24)
+++ trunk/debian/rules 2005-03-10 04:36:24 UTC (rev 25)
@@ -11,6 +11,115 @@
$(MAKE) -C xc distclean
rm -f stamp-build
-.PHONY: build clean
+# This rule removes stuff from the upstream source tree that we don't need, or
+# which has licensing problems. It must be run before creating the
+# .orig.tar.gz.
+prune-upstream-tree:
+ # Remove copies of stuff that is separately packaged in Debian.
+ rm -rf xc/extras/expat
+ rm -rf xc/extras/fontconfig
+ rm -rf xc/extras/fonts/Bitstream-Vera
+ rm -f xc/fonts/scaled/TTF/COPYRIGHT.Vera
+ rm -rf xc/extras/freetype2
+ rm -rf xc/extras/zlib
+ rm -f xc/include/extensions/render.h
+ rm -f xc/include/extensions/renderproto.h
+ rm -rf xc/lib/Xcursor
+ rm -rf xc/lib/Xft
+ rm -rf xc/lib/Xrender
+ # XXX: not yet sure which bits of the Xprint server can be chopped out
+ # rm -rf xc/programs/Xserver/Xprint
+ # XXX: xterm not yet separately packaged
+ # rm -rf xc/programs/xterm
+ # Remove stuff that is under a non-free license; see debian/copyright
+ # for details.
+ # TODO: Document non-freeness of rman (PolyglotMan) in debian/copyright.
+ rm -rf xc/extras/rman
+ rm -f xc/fonts/scaled/Meltho/README
+ rm -f xc/fonts/scaled/Meltho/SyrCOMAdiabene.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMAntioch.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMBatnan.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMBatnanBold.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMCtesiphon.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMEdessa.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalem.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalemBold.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalemItalic.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalemOutline.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMKharput.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMMalankara.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMMardin.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMMardinBold.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMMidyat.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMNisibin.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMNisibinOutline.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMQenNeshrin.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMTalada.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMTurAbdin.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMUrhoy.otf
+ rm -f xc/fonts/scaled/Meltho/SyrCOMUrhoyBold.otf
+ rm -f xc/fonts/scaled/Meltho/license.txt
+ rm -f xc/fonts/scaled/TTF/COPYRIGHT.BH
+ rm -f xc/fonts/scaled/TTF/luximb.ttf
+ rm -f xc/fonts/scaled/TTF/luximbi.ttf
+ rm -f xc/fonts/scaled/TTF/luximr.ttf
+ rm -f xc/fonts/scaled/TTF/luximri.ttf
+ rm -f xc/fonts/scaled/TTF/luxirb.ttf
+ rm -f xc/fonts/scaled/TTF/luxirbi.ttf
+ rm -f xc/fonts/scaled/TTF/luxirr.ttf
+ rm -f xc/fonts/scaled/TTF/luxirri.ttf
+ rm -f xc/fonts/scaled/TTF/luxisb.ttf
+ rm -f xc/fonts/scaled/TTF/luxisbi.ttf
+ rm -f xc/fonts/scaled/TTF/luxisr.ttf
+ rm -f xc/fonts/scaled/TTF/luxisri.ttf
+ rm -f xc/fonts/scaled/Type1/COPYRIGHT.IBM
+ rm -f xc/fonts/scaled/Type1/cour.afm
+ rm -f xc/fonts/scaled/Type1/cour.pfa
+ rm -f xc/fonts/scaled/Type1/courb.afm
+ rm -f xc/fonts/scaled/Type1/courb.pfa
+ rm -f xc/fonts/scaled/Type1/courbi.afm
+ rm -f xc/fonts/scaled/Type1/courbi.pfa
+ rm -f xc/fonts/scaled/Type1/couri.afm
+ rm -f xc/fonts/scaled/Type1/couri.pfa
+ rm -f xc/fonts/scaled/Type1/COPYRIGHT.BH
+ rm -f xc/fonts/scaled/Type1/l047013t.afm
+ rm -f xc/fonts/scaled/Type1/l047013t.pfa
+ rm -f xc/fonts/scaled/Type1/l047016t.afm
+ rm -f xc/fonts/scaled/Type1/l047016t.pfa
+ rm -f xc/fonts/scaled/Type1/l047033t.afm
+ rm -f xc/fonts/scaled/Type1/l047033t.pfa
+ rm -f xc/fonts/scaled/Type1/l047036t.afm
+ rm -f xc/fonts/scaled/Type1/l047036t.pfa
+ rm -f xc/fonts/scaled/Type1/l048013t.afm
+ rm -f xc/fonts/scaled/Type1/l048013t.pfa
+ rm -f xc/fonts/scaled/Type1/l048016t.afm
+ rm -f xc/fonts/scaled/Type1/l048016t.pfa
+ rm -f xc/fonts/scaled/Type1/l048033t.afm
+ rm -f xc/fonts/scaled/Type1/l048033t.pfa
+ rm -f xc/fonts/scaled/Type1/l048036t.afm
+ rm -f xc/fonts/scaled/Type1/l048036t.pfa
+ rm -f xc/fonts/scaled/Type1/l049013t.afm
+ rm -f xc/fonts/scaled/Type1/l049013t.pfa
+ rm -f xc/fonts/scaled/Type1/l049016t.afm
+ rm -f xc/fonts/scaled/Type1/l049016t.pfa
+ rm -f xc/fonts/scaled/Type1/l049033t.afm
+ rm -f xc/fonts/scaled/Type1/l049033t.pfa
+ rm -f xc/fonts/scaled/Type1/l049036t.afm
+ rm -f xc/fonts/scaled/Type1/l049036t.pfa
+ rm -f xc/fonts/scaled/Type1/UTBI____.afm
+ rm -f xc/fonts/scaled/Type1/UTBI____.pfa
+ rm -f xc/fonts/scaled/Type1/UTB_____.afm
+ rm -f xc/fonts/scaled/Type1/UTB_____.pfa
+ rm -f xc/fonts/scaled/Type1/UTI_____.afm
+ rm -f xc/fonts/scaled/Type1/UTI_____.pfa
+ rm -f xc/fonts/scaled/Type1/UTRG____.afm
+ rm -f xc/fonts/scaled/Type1/UTRG____.pfa
+ rm -f xc/programs/Xserver/hw/xfree86/doc/README.DRI
+ rm -f xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp
+ rm -f xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h
+ rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v10002d.uc
+ rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v20002d.uc
+.PHONY: build clean prune-upstream-tree
+
# vim:set ai noet sts=8 sw=8 tw=0:
Reply to: