X Strike Force XFree86 SVN commit: r1279 - in trunk/debian: . scripts
Author: branden
Date: 2004-04-19 10:42:05 -0500 (Mon, 19 Apr 2004)
New Revision: 1279
Modified:
trunk/debian/changelog
trunk/debian/scripts/prune-non-free
Log:
Rewrite prune-non-free.
+ Do a simple directory check before removing any files.
+ Make list of files removed correspond exactly to those listed in
debian/copyright.
+ Add comments.
Set svn:executable property.
Set svn:keywords property to "Id".
Add Vim modeline.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-19 15:32:49 UTC (rev 1278)
+++ trunk/debian/changelog 2004-04-19 15:42:05 UTC (rev 1279)
@@ -263,9 +263,9 @@
"type6_euro" model definitions, instead of defining "type6" twice (thanks,
Denis Barbier).
- * Move prune-non-free script to debian/scripts directory.
+ * Rewrite prune-non-free script, and move it to debian/scripts directory.
- -- Branden Robinson <branden@debian.org> Mon, 19 Apr 2004 10:32:09 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 19 Apr 2004 10:39:43 -0500
xfree86 (4.3.0-7) unstable; urgency=medium
Modified: trunk/debian/scripts/prune-non-free
===================================================================
--- trunk/debian/scripts/prune-non-free 2004-04-19 15:32:49 UTC (rev 1278)
+++ trunk/debian/scripts/prune-non-free 2004-04-19 15:42:05 UTC (rev 1279)
@@ -1,11 +1,225 @@
#!/bin/sh
-rm -f build-tree/xc/fonts/scaled/TTF/*.ttf
-rm -f build-tree/xc/fonts/scaled/TTF/fonts.scale
-rm -f build-tree/xc/fonts/scaled/Type1/U*.?f?
-rm -f build-tree/xc/fonts/scaled/Type1/cour*.?f?
-rm -f build-tree/xc/fonts/scaled/Type1/l*.?f?
-rm -f build-tree/xc/fonts/scaled/Meltho/*.otf
-rm -f build-tree/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
-rm -f build-tree/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
-rm -f build-tree/xc/programs/Xserver/hw/xfree86/doc/REAME.DRI
-rm -f build-tree/xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp
+
+# Scrubs known non-DFSG-compliant stuff out of the source tree so that a
+# DFSG-free .orig.tar.gz for the source package can be created.
+
+# $Id$
+
+PROGNAME=${0##*/}
+
+if [ ! -d xc ]; then
+ echo "$PROGNAME: no unpacked source tree in current working directory" >&2
+ exit 1
+fi
+
+# The files listed below should correspond exactly to those described as removed
+# in debian/copyright, which should also explain why they were removed.
+
+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/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-Book.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-BookOblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-Demi.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/AvantGarde-DemiOblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Courier.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-Bold.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-BoldOblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica-Oblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Helvetica.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-Book.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-BookOblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-Demi.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/LubalinGraph-DemiOblique.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Bold.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-BoldItalic.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Italic.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/NewCenturySchlbk-Roman.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-Demi.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-DemiItalic.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-Light.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Souvenir-LightItalic.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Symbol.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Bold.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Italic.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/Times-Roman.pmf
+rm -f xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/fonts/ZapfDingbats.pmf
+
+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/doc/sgml/DRI.sgml
+rm -f xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+
+# vim:set ai et sts=4 sw=4 tw=80:
Property changes on: trunk/debian/scripts/prune-non-free
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id
Reply to: