X Strike Force X.Org X11 SVN commit: r391 - in trunk/debian: . prune
Author: dnusinow
Date: 2005-07-21 22:13:02 -0500 (Thu, 21 Jul 2005)
New Revision: 391
Added:
trunk/debian/prune/
trunk/debian/prune/non-free
trunk/debian/prune/unnecessary
Modified:
trunk/debian/changelog
Log:
- Change prune target of debian/rules to use file lists in debian/prune
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-22 03:04:56 UTC (rev 390)
+++ trunk/debian/changelog 2005-07-22 03:13:02 UTC (rev 391)
@@ -10,6 +10,7 @@
- Do not impose selinux on the whole world out there: move selinux
specific changes from config/cf/Imake.tmpl to programs/xdm/Imakefile,
as xdm is the only program affected by this patch. Closes: #319121
+ - Change prune target of debian/rules to use file lists in debian/prune
-- David Nusinow <dnusinow@debian.org> Wed, 20 Jul 2005 14:38:43 -0400
Added: trunk/debian/prune/non-free
===================================================================
--- trunk/debian/prune/non-free 2005-07-22 03:04:56 UTC (rev 390)
+++ trunk/debian/prune/non-free 2005-07-22 03:13:02 UTC (rev 391)
@@ -0,0 +1,95 @@
+# Remove stuff that is under a non-free license; see debian/copyright
+# for details.
+# TODO: Document non-freeness of rman (PolyglotMan) in debian/copyright.
+xc/extras/rman
+# See debian/copyright for documentation of the failure of the
+# following files to satisfy the Debian Free Software Guidelines
+# (DFSG).
+xc/fonts/scaled/Meltho/README
+xc/fonts/scaled/Meltho/SyrCOMAdiabene.otf
+xc/fonts/scaled/Meltho/SyrCOMAntioch.otf
+xc/fonts/scaled/Meltho/SyrCOMBatnan.otf
+xc/fonts/scaled/Meltho/SyrCOMBatnanBold.otf
+xc/fonts/scaled/Meltho/SyrCOMCtesiphon.otf
+xc/fonts/scaled/Meltho/SyrCOMEdessa.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalem.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalemBold.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalemItalic.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalemOutline.otf
+xc/fonts/scaled/Meltho/SyrCOMKharput.otf
+xc/fonts/scaled/Meltho/SyrCOMMalankara.otf
+xc/fonts/scaled/Meltho/SyrCOMMardin.otf
+xc/fonts/scaled/Meltho/SyrCOMMardinBold.otf
+xc/fonts/scaled/Meltho/SyrCOMMidyat.otf
+xc/fonts/scaled/Meltho/SyrCOMNisibin.otf
+xc/fonts/scaled/Meltho/SyrCOMNisibinOutline.otf
+xc/fonts/scaled/Meltho/SyrCOMQenNeshrin.otf
+xc/fonts/scaled/Meltho/SyrCOMTalada.otf
+xc/fonts/scaled/Meltho/SyrCOMTurAbdin.otf
+xc/fonts/scaled/Meltho/SyrCOMUrhoy.otf
+xc/fonts/scaled/Meltho/SyrCOMUrhoyBold.otf
+xc/fonts/scaled/Meltho/license.txt
+xc/fonts/scaled/TTF/COPYRIGHT.BH
+xc/fonts/scaled/TTF/luximb.ttf
+xc/fonts/scaled/TTF/luximbi.ttf
+xc/fonts/scaled/TTF/luximr.ttf
+xc/fonts/scaled/TTF/luximri.ttf
+xc/fonts/scaled/TTF/luxirb.ttf
+xc/fonts/scaled/TTF/luxirbi.ttf
+xc/fonts/scaled/TTF/luxirr.ttf
+xc/fonts/scaled/TTF/luxirri.ttf
+xc/fonts/scaled/TTF/luxisb.ttf
+xc/fonts/scaled/TTF/luxisbi.ttf
+xc/fonts/scaled/TTF/luxisr.ttf
+xc/fonts/scaled/TTF/luxisri.ttf
+xc/fonts/scaled/Type1/COPYRIGHT.IBM
+xc/fonts/scaled/Type1/cour.afm
+xc/fonts/scaled/Type1/cour.pfa
+xc/fonts/scaled/Type1/courb.afm
+xc/fonts/scaled/Type1/courb.pfa
+xc/fonts/scaled/Type1/courbi.afm
+xc/fonts/scaled/Type1/courbi.pfa
+xc/fonts/scaled/Type1/couri.afm
+xc/fonts/scaled/Type1/couri.pfa
+xc/fonts/scaled/Type1/COPYRIGHT.BH
+xc/fonts/scaled/Type1/l047013t.afm
+xc/fonts/scaled/Type1/l047013t.pfa
+xc/fonts/scaled/Type1/l047016t.afm
+xc/fonts/scaled/Type1/l047016t.pfa
+xc/fonts/scaled/Type1/l047033t.afm
+xc/fonts/scaled/Type1/l047033t.pfa
+xc/fonts/scaled/Type1/l047036t.afm
+xc/fonts/scaled/Type1/l047036t.pfa
+xc/fonts/scaled/Type1/l048013t.afm
+xc/fonts/scaled/Type1/l048013t.pfa
+xc/fonts/scaled/Type1/l048016t.afm
+xc/fonts/scaled/Type1/l048016t.pfa
+xc/fonts/scaled/Type1/l048033t.afm
+xc/fonts/scaled/Type1/l048033t.pfa
+xc/fonts/scaled/Type1/l048036t.afm
+xc/fonts/scaled/Type1/l048036t.pfa
+xc/fonts/scaled/Type1/l049013t.afm
+xc/fonts/scaled/Type1/l049013t.pfa
+xc/fonts/scaled/Type1/l049016t.afm
+xc/fonts/scaled/Type1/l049016t.pfa
+xc/fonts/scaled/Type1/l049033t.afm
+xc/fonts/scaled/Type1/l049033t.pfa
+xc/fonts/scaled/Type1/l049036t.afm
+xc/fonts/scaled/Type1/l049036t.pfa
+xc/fonts/scaled/Type1/UTBI____.afm
+xc/fonts/scaled/Type1/UTBI____.pfa
+xc/fonts/scaled/Type1/UTB_____.afm
+xc/fonts/scaled/Type1/UTB_____.pfa
+xc/fonts/scaled/Type1/UTI_____.afm
+xc/fonts/scaled/Type1/UTI_____.pfa
+xc/fonts/scaled/Type1/UTRG____.afm
+xc/fonts/scaled/Type1/UTRG____.pfa
+xc/programs/Xserver/hw/xfree86/doc/README.DRI
+xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp
+xc/extras/drm/shared/mga_ucode.h
+xc/extras/drm/shared/r128_cce.c
+xc/extras/drm/shared/radeon_cp.c
+xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h
+xc/programs/Xserver/hw/xfree86/drivers/rendition/README.uc
+xc/programs/Xserver/hw/xfree86/drivers/rendition/v10002d.uc
+xc/programs/Xserver/hw/xfree86/drivers/rendition/v20002d.uc
Added: trunk/debian/prune/unnecessary
===================================================================
--- trunk/debian/prune/unnecessary 2005-07-22 03:04:56 UTC (rev 390)
+++ trunk/debian/prune/unnecessary 2005-07-22 03:13:02 UTC (rev 391)
@@ -0,0 +1,19 @@
+# Remove copies of stuff that is separately packaged in Debian.
+xc/extras/expat
+xc/extras/fontconfig
+xc/extras/fonts/Bitstream-Vera
+xc/fonts/scaled/TTF/COPYRIGHT.Vera
+# XXX: FreeType2 is externally packaged, but its source files are
+# compiled and linked into the libXfont library, which is built as part
+# of xorg-x11 -- so, we have to keep our own local copy of it. Yes,
+# that is horrendously grody.
+# rm -rf xc/extras/freetype2
+xc/extras/zlib
+xc/include/extensions/render.h
+xc/include/extensions/renderproto.h
+xc/lib/Xcursor
+xc/lib/Xft
+xc/lib/Xrender
+xc/programs/Xserver/XpConfig
+# XXX: xterm not yet separately packaged
+# rm -rf xc/programs/xterm
Reply to: