X Strike Force X.Org X11 SVN commit: r197 - in trunk/debian: . scripts
Author: branden
Date: 2005-06-13 18:32:44 -0500 (Mon, 13 Jun 2005)
New Revision: 197
Added:
trunk/debian/scripts/up-scripts
Removed:
trunk/debian/scripts/prune-non-free
Modified:
trunk/debian/changelog
trunk/debian/copyright
trunk/debian/rules
trunk/debian/scripts/vars
trunk/debian/setperms
Log:
Rework source package to consist of an unpacked source tree, instead of
shipping a .tar.gz inside the .orig.tar.gz.
+ Add debian/scripts/up-scripts (called automatically by dbs's "setup"
target), which copies the source tree into build-tree using hardlinks.
+ Update debian/setperms to ensure that up-scripts is executable.
+ Update debian/vars to stop defining SOURCE_DIR variable.
+ Put debian/scripts in PATH and export it from debian/rules, so that dbs
can find up-scripts.
+ Update target dependencies in debian/rules from "$(patched)" to "setup",
so that we can be sure up-scripts is run.
Make .orig.tar.gz preparation less opaque.
+ Add prune-upstream-tree and make-orig-tar-gz phony targets to
debian/rules. (Note that these are not intended for ordinary package
builds, and have to be manually invoked.)
+ Remove outdated and now-obsolete file debian/scripts/prune-non-free.
+ Add $(SOURCE_NAME) and $(UPSTREAM_VERSION) variables to debian/rules.
Update paths to files containg sourceless firmware in debian/copyright.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/changelog 2005-06-13 23:32:44 UTC (rev 197)
@@ -139,8 +139,28 @@
files in the source package that are missing Subversion Id keywords or the
corresponding property.
- -- Branden Robinson <branden@debian.org> Fri, 10 Jun 2005 18:55:32 -0500
+ * Rework source package to consist of an unpacked source tree, instead of
+ shipping a .tar.gz inside the .orig.tar.gz.
+ + Add debian/scripts/up-scripts (called automatically by dbs's "setup"
+ target), which copies the source tree into build-tree using hardlinks.
+ + Update debian/setperms to ensure that up-scripts is executable.
+ + Update debian/vars to stop defining SOURCE_DIR variable.
+ + Put debian/scripts in PATH and export it from debian/rules, so that dbs
+ can find up-scripts.
+ + Update target dependencies in debian/rules from "$(patched)" to "setup",
+ so that we can be sure up-scripts is run.
+ * Make .orig.tar.gz preparation less opaque.
+ + Add prune-upstream-tree and make-orig-tar-gz phony targets to
+ debian/rules. (Note that these are not intended for ordinary package
+ builds, and have to be manually invoked.)
+ + Remove outdated and now-obsolete file debian/scripts/prune-non-free.
+ + Add $(SOURCE_NAME) and $(UPSTREAM_VERSION) variables to debian/rules.
+
+ * Update paths to files containg sourceless firmware in debian/copyright.
+
+ -- Branden Robinson <branden@debian.org> Mon, 13 Jun 2005 17:10:37 -0500
+
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Urgency set to high due to fix for security flaw (see below).
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/copyright 2005-06-13 23:32:44 UTC (rev 197)
@@ -1,4 +1,4 @@
-$Id: copyright 43 2004-10-17 04:58:39Z fabbione $
+$Id$
Source Package: xorg-x11
Obtained from: freedesktop.org CVS
@@ -174,12 +174,12 @@
7) The following files contain object code without any corresponding
source.
- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h
+ 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/rendition/README.uc
xc/programs/Xserver/hw/xfree86/drivers/rendition/v10002d.uc
xc/programs/Xserver/hw/xfree86/drivers/rendition/v20002d.uc
- xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_cce.c
- xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_cp.c
- xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_ucode.h
(The files r128_cce.c and radeon_cp.c only partially consist of
sourceless object code, but because they are not required to build
@@ -1560,6 +1560,6 @@
--------------------------------------------------------------------------------
- $Id: copyright 43 2004-10-17 04:58:39Z fabbione $
+ $Id$
vim:set ai et sw=4 sts=4 tw=80:
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/rules 2005-06-13 23:32:44 UTC (rev 197)
@@ -26,7 +26,6 @@
# Use the DBS archive/patch handling system.
SCRIPT_DIR = /usr/share/dbs
-TAR_DIR = xc
include $(SCRIPT_DIR)/dbs-build.mk
# dpkg-arch rules
@@ -34,6 +33,9 @@
include $(SCRIPT_DIR)/dpkg-arch.mk
endif
+# Update $PATH so that dbs will be able to find our "up-scripts" script.
+PATH = $(shell echo $$PATH:debian/scripts)
+export PATH
# This is a horrendous kludge to ensure that some scripts we need are executable.
DUMMY:=$(shell if ! [ -x debian/setperms ]; then chmod 755 debian/setperms; fi)
@@ -48,8 +50,14 @@
# Set up parameters for the upstream build environment.
-# Get package version info.
-SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog | grep '^Version:' | awk '{print $$2}')
+# Determine (source) package name from Debian changelog.
+SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \
+ | grep '^Source:' | awk '{print $$2}')
+# Determine package version from Debian changelog.
+SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \
+ | grep '^Version:' | awk '{print $$2}')
+# Determine upstream version number.
+UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//')
# Figure out who's building this package.
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2> /dev/null))}})
@@ -209,12 +217,12 @@
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
configure: $(STAMP_DIR)/configure
-$(STAMP_DIR)/configure: $(patched)
+$(STAMP_DIR)/configure: setup
dh_testdir
# I am more anal than the dbs package maintainer about diffs, it seems.
patch-audit: $(STAMP_DIR)/patch-audit
-$(STAMP_DIR)/patch-audit: $(patched)
+$(STAMP_DIR)/patch-audit: setup
@if egrep -il 'Hunk.*succeeded at.*(fuzz|offset)' \
stampdir/log/patches/*; then \
echo "The above patches had fuzz or offsets. Please fix." >&2; \
@@ -632,6 +640,137 @@
dh_builddeb
touch $@
+# 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.
+# Note: This rule is for Debian package maintainers' convenience, and is not
+# needed for conventional build scenarios.
+prune-upstream-tree:
+ # Ensure we're in the correct directory.
+ test -d xc
+ # 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
+ # 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
+ 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
+ rm -rf xc/programs/Xserver/XpConfig
+ # 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
+ # See debian/copyright for documentation of the failure of the
+ # following files to satisfy the Debian Free Software Guidelines
+ # (DFSG).
+ 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/extras/drm/shared/mga_ucode.h
+ rm -f xc/extras/drm/shared/r128_cce.c
+ rm -f xc/extras/drm/shared/radeon_cp.c
+ rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/README.uc
+ rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v10002d.uc
+ rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v20002d.uc
+
+# Change to what should be the correct directory, ensure it is, and if
+# so, create the .orig.tar.gz file.
+# Note: This rule is for Debian package maintainers' convenience, and is not
+# needed for conventional build scenarios.
+make-orig-tar-gz: prune-upstream-tree
+ ( cd .. \
+ && test -d $(SOURCE_NAME)-$(UPSTREAM_VERSION) \
+ && tar --exclude=debian --exclude=debian/* -cf - $(SOURCE_NAME)-$(UPSTREAM_VERSION) | gzip -9 >$(SOURCE_NAME)_$(UPSTREAM_VERSION).orig.tar.gz )
+
.PHONY: default
.PHONY: genscripts cleanscripts
.PHONY: updatepo
@@ -642,5 +781,6 @@
.PHONY: check-manifest check-manifest-arch check-manifest-indep
.PHONY: environment
.PHONY: build-server install-server binary-server
+.PHONY: prune-upstream-tree make-orig-tar-gz
# vim:set noet ai sts=8 sw=8 tw=0:
Deleted: trunk/debian/scripts/prune-non-free
===================================================================
--- trunk/debian/scripts/prune-non-free 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/scripts/prune-non-free 2005-06-13 23:32:44 UTC (rev 197)
@@ -1,232 +0,0 @@
-#!/bin/sh
-
-# 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: prune-non-free 1280 2004-04-19 16:44:23Z branden $
-
-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
-
-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
-rm -f xc/extras/drm/shared/r128_cce.c
-rm -f xc/extras/drm/shared/radeon_cp.c
-rm -f xc/extras/drm/shared/mga_ucode.h
-
-# vim:set ai et sts=4 sw=4 tw=80:
Added: trunk/debian/scripts/up-scripts
===================================================================
--- trunk/debian/scripts/up-scripts 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/scripts/up-scripts 2005-06-13 23:32:44 UTC (rev 197)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# $Id$
+
+mkdir -p build-tree
+cp -drl xc build-tree
Modified: trunk/debian/scripts/vars
===================================================================
--- trunk/debian/scripts/vars 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/scripts/vars 2005-06-13 23:32:44 UTC (rev 197)
@@ -1,16 +1,10 @@
-# $Id: vars 1348 2004-05-01 17:13:47Z branden $
+# $Id$
# This file is NOT a shell script.
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
#
-# SOURCE_DIR is where to cd to, before unpacking the source.
-#
-# SOURCE_TREE is the combination of SOURCE_DIR and the dir that is embedded
-# into the X tarballs.
-#
-# STAMP_DIR is where to place all the 'stamp' files that allows
-# debian/rules to know when certain targets are done.
+# SOURCE_TREE is the location of the patched source tree relative to the
+# unpacked source package directory.
SOURCE_TREE=build-tree/xc
-SOURCE_DIR=build-tree
Modified: trunk/debian/setperms
===================================================================
--- trunk/debian/setperms 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/setperms 2005-06-13 23:32:44 UTC (rev 197)
@@ -5,6 +5,7 @@
set -e
for FILE in getglibcversion \
+ up-scripts \
vars*; do
chmod 755 debian/scripts/$FILE
done
Reply to: