xfonts-scalable: Changes to 'debian-unstable'
debian/README.source | 73 +++
debian/changelog | 20
debian/control | 8
debian/copyright | 3
debian/rules | 13
debian/watch | 2
debian/xfonts-scalable.postinst.in | 9
debian/xfonts-scalable.postrm.in | 11
debian/xfonts-scalable.preinst.in | 22
debian/xsfbs/repack.sh | 32 +
debian/xsfbs/xsfbs.mk | 293 ++++++++++++
debian/xsfbs/xsfbs.sh | 853 +++++++++++++++++++++++++++++++++++++
12 files changed, 1287 insertions(+), 52 deletions(-)
New commits:
commit eea5d2f91cd26994faf7934c16895dc0a8ddb01f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 14:24:56 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1ca8538..e7e6ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
+xfonts-scalable (1:1.0.0-7) unstable; urgency=low
* Add upstream download URL to debian/copyright.
* Update xsfbs.
@@ -16,7 +16,7 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Remove Branden from Uploaders.
* Bump Standards-Version to 3.8.2.
- -- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 14:24:53 +0200
xfonts-scalable (1:1.0.0-6) unstable; urgency=high
commit 44dbdf626c8bddef92e6c23dbbce0e07c14600e5
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 14:19:50 2009 +0200
Bump Standards-Version to 3.8.2.
diff --git a/debian/changelog b/debian/changelog
index 9cf7ecb..1ca8538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
FCCACHE=/bin/true instead of build-depending on fontconfig.
* Stop calling defoma-app update fontconfig, Joss says this is obsolete.
* Remove Branden from Uploaders.
+ * Bump Standards-Version to 3.8.2.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/control b/debian/control
index 5f3af1d..c40f2b9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends: debhelper (>= 5.0.31), xfonts-utils
-Standards-Version: 3.7.2
+Standards-Version: 3.8.2
Package: xfonts-scalable
Architecture: all
commit e6945bd3f59d4c2afd9ce514fe627887085b7bed
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 14:16:46 2009 +0200
Remove Branden from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 9843f8e..9cf7ecb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Remove obsolete build-deps on pkg-config and xutils, configure with
FCCACHE=/bin/true instead of build-depending on fontconfig.
* Stop calling defoma-app update fontconfig, Joss says this is obsolete.
+ * Remove Branden from Uploaders.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/control b/debian/control
index 599ab35..5f3af1d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-scalable
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends: debhelper (>= 5.0.31), xfonts-utils
Standards-Version: 3.7.2
commit 0dc4d0c6866776cb4e6c97675038745357a39b4a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 14:16:21 2009 +0200
Stop calling defoma-app update fontconfig, Joss says this is obsolete.
diff --git a/debian/changelog b/debian/changelog
index 934c8e3..9843f8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
parallel=%.
* Remove obsolete build-deps on pkg-config and xutils, configure with
FCCACHE=/bin/true instead of build-depending on fontconfig.
+ * Stop calling defoma-app update fontconfig, Joss says this is obsolete.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/xfonts-scalable.postinst.in b/debian/xfonts-scalable.postinst.in
index 5db7239..f86bb44 100644
--- a/debian/xfonts-scalable.postinst.in
+++ b/debian/xfonts-scalable.postinst.in
@@ -19,11 +19,6 @@ THIS_SCRIPT=postinst
FONTDIRS="Type1"
UPDATECMDS="update-fonts-scale update-fonts-alias"
-if which defoma-app >/dev/null 2>&1 && \
- [ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
- defoma-app update fontconfig
-fi
-
font_update
exit 0
diff --git a/debian/xfonts-scalable.postrm.in b/debian/xfonts-scalable.postrm.in
index 8ffc220..12c8f88 100644
--- a/debian/xfonts-scalable.postrm.in
+++ b/debian/xfonts-scalable.postrm.in
@@ -20,11 +20,6 @@ if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="Type1"
UPDATECMDS="update-fonts-scale update-fonts-alias"
- if which defoma-app >/dev/null 2>&1 && \
- [ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
- defoma-app update fontconfig
- fi
-
font_update
fi
commit 77b75fd099cc36eeceb141be5f8ce7b5fbad0c52
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 14:13:35 2009 +0200
Drop some obsolete build-deps
Remove obsolete build-deps on pkg-config and xutils, configure with
FCCACHE=/bin/true instead of build-depending on fontconfig.
diff --git a/debian/changelog b/debian/changelog
index 61ffd7d..934c8e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Add dependency on ${misc:Depends}.
* Update DEB_BUILD_OPTIONS parsing to handle space-separated values and
parallel=%.
+ * Remove obsolete build-deps on pkg-config and xutils, configure with
+ FCCACHE=/bin/true instead of build-depending on fontconfig.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/control b/debian/control
index f995c00..599ab35 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5.0.31), pkg-config, xutils, xfonts-utils, fontconfig
+Build-Depends: debhelper (>= 5.0.31), xfonts-utils
Standards-Version: 3.7.2
Package: xfonts-scalable
diff --git a/debian/rules b/debian/rules
index e8ddeb9..97cd93b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ build-stamp: $(STAMP_DIR)/prepare
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--with-fontdir=/usr/share/fonts/X11/Type1 \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)" FCCACHE=/bin/true
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
touch build-stamp
commit 25aa3ac49e3f3321206fd3049b3e0b1d624a1748
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 13:55:50 2009 +0200
Update DEB_BUILD_OPTIONS parsing
Handle space-separated values and parallel=%.
diff --git a/debian/changelog b/debian/changelog
index a0b4476..61ffd7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Remove calls to fc-cache from postinst and postrm, per
<1244927306.6158.20.camel@tomoyo>.
* Add dependency on ${misc:Depends}.
+ * Update DEB_BUILD_OPTIONS parsing to handle space-separated values and
+ parallel=%.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/rules b/debian/rules
index f34bd15..e8ddeb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,14 @@ PACKAGE = xfonts-scalable
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -32,8 +33,8 @@ else
endif
-build: genscripts build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/prepare
dh_testdir
mkdir obj-$(DEB_BUILD_GNU_TYPE)
commit 0060b892a3b5e1e6ffb02ad228d3b39c33c5b7b0
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 13:52:32 2009 +0200
Add dependency on ${misc:Depends}.
diff --git a/debian/changelog b/debian/changelog
index ff6cfc3..a0b4476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
/etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale conffile.
* Remove calls to fc-cache from postinst and postrm, per
<1244927306.6158.20.camel@tomoyo>.
+ * Add dependency on ${misc:Depends}.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/control b/debian/control
index 064e63f..f995c00 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
Package: xfonts-scalable
Architecture: all
-Depends: xfonts-utils
+Depends: xfonts-utils, ${misc:Depends}
Suggests: xfs | xserver
Conflicts: xfntscl
Description: scalable fonts for X
commit 2a7241966b5157a1f0aa6396d741d8abec1719ba
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 13:51:09 2009 +0200
Remove calls to fc-cache from postinst and postrm
Per <1244927306.6158.20.camel@tomoyo>, this is now handled by a trigger.
diff --git a/debian/changelog b/debian/changelog
index 6e94117..ff6cfc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Add watch file.
* Remove obsolete handling of
/etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale conffile.
+ * Remove calls to fc-cache from postinst and postrm, per
+ <1244927306.6158.20.camel@tomoyo>.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/xfonts-scalable.postinst.in b/debian/xfonts-scalable.postinst.in
index 7cee333..5db7239 100644
--- a/debian/xfonts-scalable.postinst.in
+++ b/debian/xfonts-scalable.postinst.in
@@ -22,8 +22,6 @@ UPDATECMDS="update-fonts-scale update-fonts-alias"
if which defoma-app >/dev/null 2>&1 && \
[ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
defoma-app update fontconfig
-else
- UPDATECMDS="$UPDATECMDS fc-cache"
fi
font_update
diff --git a/debian/xfonts-scalable.postrm.in b/debian/xfonts-scalable.postrm.in
index 2e0c994..8ffc220 100644
--- a/debian/xfonts-scalable.postrm.in
+++ b/debian/xfonts-scalable.postrm.in
@@ -23,8 +23,6 @@ if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
if which defoma-app >/dev/null 2>&1 && \
[ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
defoma-app update fontconfig
- else
- UPDATECMDS="$UPDATECMDS fc-cache"
fi
font_update
commit 79739f5cc8c903dc7d0e36614c3192d7627b9039
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 13:49:08 2009 +0200
Remove obsolete handling of /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
diff --git a/debian/changelog b/debian/changelog
index 9e08a1e..6e94117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Add upstream download URL to debian/copyright.
* Update xsfbs.
* Add watch file.
+ * Remove obsolete handling of
+ /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale conffile.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/xfonts-scalable.postinst.in b/debian/xfonts-scalable.postinst.in
index 3d830f6..7cee333 100644
--- a/debian/xfonts-scalable.postinst.in
+++ b/debian/xfonts-scalable.postinst.in
@@ -16,8 +16,6 @@ THIS_SCRIPT=postinst
#DEBHELPER#
-remove_conffile_commit /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
-
FONTDIRS="Type1"
UPDATECMDS="update-fonts-scale update-fonts-alias"
diff --git a/debian/xfonts-scalable.postrm.in b/debian/xfonts-scalable.postrm.in
index cdbd664..2e0c994 100644
--- a/debian/xfonts-scalable.postrm.in
+++ b/debian/xfonts-scalable.postrm.in
@@ -16,10 +16,6 @@ THIS_SCRIPT=postrm
#DEBHELPER#
-if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
- remove_conffile_rollback /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
-fi
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="Type1"
UPDATECMDS="update-fonts-scale update-fonts-alias"
diff --git a/debian/xfonts-scalable.preinst.in b/debian/xfonts-scalable.preinst.in
deleted file mode 100644
index 958a77f..0000000
--- a/debian/xfonts-scalable.preinst.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Debian xfonts-scalable package pre-installation script
-
-# $Id$
-
-set -e
-
-THIS_PACKAGE=xfonts-scalable
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- if dpkg --compare-versions "$2" lt "1:1.0.0-5"; then
- remove_conffile_prepare /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale \
- b579d5c7759383647c486da590d60815
- fi
-fi
-
-exit 0
-
-# vim:ai:et:sts=2:sw=2:tw=0:
commit be9ae9131032e1ed71d023ff9b58d2a922675f08
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 13:46:25 2009 +0200
Add watch file.
diff --git a/debian/changelog b/debian/changelog
index f191d0a..9e08a1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Add upstream download URL to debian/copyright.
* Update xsfbs.
+ * Add watch file.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..99181ea
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/font/ font-bitstream-type1-(.*)\.tar\.gz
commit 0ea7fc4d1ba2bdb7d83aeacf81eb9d711a7cd82d
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 13:44:49 2009 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index 668c539..f191d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
* Add upstream download URL to debian/copyright.
+ * Update xsfbs.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
commit b3b49c68ac495979d5f7190b262fb1a08180176b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 25 13:43:10 2009 +0200
Add upstream download URL to debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 7f46964..668c539 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfonts-scalable (1:1.0.0-7) UNRELEASED; urgency=low
+
+ * Add upstream download URL to debian/copyright.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 25 Jun 2009 13:42:52 +0200
+
xfonts-scalable (1:1.0.0-6) unstable; urgency=high
[ Julien Cristau ]
diff --git a/debian/copyright b/debian/copyright
index a774900..52b66da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package contains the font-bitstream-type1 tarball downloaded from
+http://xorg.freedesktop.org/releases/individual/font/
+
(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
You are hereby granted permission under all Bitstream propriety rights
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+ exit 0
+fi
+
+if [ "x$1" != x--upstream-version ]; then
+ exit 1
+fi
+
+version="$2"
+filename="$3"
+
+if [ -z "$version" ] || ! [ -f "$filename" ]; then
+ exit 1
+fi
+
+dir="$(pwd)"
+tempdir="$(mktemp -d)"
+
+cd "$tempdir"
+tar xf "$dir/$filename"
+cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf "$dir/$filename" *
+cd "$dir"
+rm -rf "$tempdir"
+echo "Done pruning upstream tarball"
+
+exit 0
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat May 31 13:23:24 2008 +0200
Update xsfbs/quilt patching rules to be compatible with the
"3.0 (quilt)" source package.
Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
# Set up parameters for the upstream build environment.
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/patches ]; then \
- mkdir $(STAMP_DIR)/patches; \
- ln -s $(STAMP_DIR)/patches .pc; \
- echo 2 >$(STAMP_DIR)/patches/.version; \
- fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ -e debian/patches ] && [ ! -e patches ]; then \
- ln -s debian/patches patches; \
- fi; \
>$@
# Apply all patches to the upstream source.
@@ -162,10 +152,10 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
- if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+ if $(QUILT) applied >/dev/null 2>/dev/null; then \
if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
@@ -192,7 +182,7 @@ cleanscripts:
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
- rm -rf .pc patches
+ rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 30 12:26:18 2008 +0200
xsfbs.sh: use 'local' now that policy allows it
Policy 3.7.3 allows /bin/sh scripts to use 'local'.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 0c7607a..72efa95 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -238,19 +238,19 @@ analyze_path () {
# analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
# Thanks to Randolph Chung for this clever hack.
- #local f g
+ local f g
while [ -n "$1" ]; do
reject_whitespace "$1"
- _g=
Reply to: