debian/README.Debian | 19 +
debian/README.source | 73 ++++++
debian/changelog | 22 +-
debian/compat | 2
debian/control | 16 -
debian/copyright | 2
debian/rules | 31 +-
debian/watch | 2
debian/xsfbs/repack.sh | 32 ++
debian/xsfbs/xsfbs-autoreconf.mk | 150 --------------
debian/xsfbs/xsfbs.mk | 127 +----------
debian/xsfbs/xsfbs.sh | 417 +++++++++++++++++----------------------
12 files changed, 374 insertions(+), 519 deletions(-)
New commits:
commit ae793fbc07b96952274c685d340754e19f265d48
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 21:13:04 2009 -0400
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index dc0d1c4..5234f4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
+xcursor-themes (1.0.1-6) unstable; urgency=low
[ Brice Goglin ]
* Replace xbase-clients with x11-apps in Build-Depends since this is
@@ -21,7 +21,7 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* Fix the copyright notice to point to the right place
* Remove dh_clean -k and add a dh_prep in configure target
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:44:56 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 21:05:10 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
commit 8dcd05eaee07ce9ef5203f1e7d864d4c6645aa9f
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:45:14 2009 -0400
Remove dh_clean -k and add a dh_prep in configure target
diff --git a/debian/changelog b/debian/changelog
index 01755f1..dc0d1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* autoreconf at build time. Add automake to build-deps.
* Bump debhelper compat to 7. No changes needed.
* Fix the copyright notice to point to the right place
+ * Remove dh_clean -k and add a dh_prep in configure target
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:42:28 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:44:56 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/rules b/debian/rules
index ce2fa57..63fc576 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ endif
configure:
dh_testdir
+ dh_prep
autoreconf -vfi
build: build-stamp
@@ -69,7 +70,6 @@ clean: xsfclean cleanscripts
install: build
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
commit 8c503e6a0ee401b547bfa9d962b8ac1a1da577ae
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:42:45 2009 -0400
Fix the copyright notice to point to the right place
diff --git a/debian/changelog b/debian/changelog
index 44ad3c7..01755f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* Add a watch file
* autoreconf at build time. Add automake to build-deps.
* Bump debhelper compat to 7. No changes needed.
+ * Fix the copyright notice to point to the right place
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:40:27 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:42:28 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/copyright b/debian/copyright
index 271163c..0422670 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,2 +1,2 @@
This package is licensed under the MIT/X11 licence; please see
-/usr/share/doc/x-common/copyright for full copyright information.
+/usr/share/doc/x11-common/copyright for full copyright information.
commit a1a4ab3d9a18a39bf986ccbbf6e9019fc3fb7ce5
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:40:55 2009 -0400
Bump debhelper compat to 7. No changes needed.
diff --git a/debian/changelog b/debian/changelog
index b9c4a7c..44ad3c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* Bump standards version to 3.8.3.0
* Add a watch file
* autoreconf at build time. Add automake to build-deps.
+ * Bump debhelper compat to 7. No changes needed.
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:38:44 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:40:27 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index d368e23..09a949f 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 <dnusi...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, x11-apps | xcursorgen,
libxcursor-dev, automake
+Build-Depends: debhelper (>= 7.0.0), pkg-config, x11-apps | xcursorgen,
libxcursor-dev, automake
Standards-Version: 3.8.3.0
Package: xcursor-themes
commit 79aab781011a7f50cd92a4e4cdcde2740a01a1df
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:39:12 2009 -0400
autoreconf at build time. Add automake to build-deps.
diff --git a/debian/changelog b/debian/changelog
index 8f377a6..b9c4a7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* Add support for parallel make
* Bump standards version to 3.8.3.0
* Add a watch file
+ * autoreconf at build time. Add automake to build-deps.
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:21:29 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:38:44 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 4efed2a..d368e23 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 <dnusi...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, x11-apps | xcursorgen,
libxcursor-dev
+Build-Depends: debhelper (>= 4.0.0), pkg-config, x11-apps | xcursorgen,
libxcursor-dev, automake
Standards-Version: 3.8.3.0
Package: xcursor-themes
diff --git a/debian/rules b/debian/rules
index d42835e..ce2fa57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,12 +32,15 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+configure:
+ dh_testdir
+ autoreconf -vfi
-build: genscripts build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure genscripts
dh_testdir
- mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && CFLAGS="$(CFLAGS)" \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
@@ -46,7 +49,7 @@ build-stamp:
touch build-stamp
-clean: cleanscripts
+clean: xsfclean cleanscripts
dh_testdir
dh_testroot
rm -f build-stamp
@@ -56,6 +59,10 @@ clean: cleanscripts
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
+ rm -f aclocal.m4 compile config.guess config.sub configure
+ rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
+ rm -f config.h.in
+ rm -f $$(find -name Makefile.in)
dh_clean
@@ -70,8 +77,8 @@ install: build
install -d $(CURDIR)/debian/tmp/etc/X11/cursors
install -m 644 $(CURDIR)/debian/*.theme
$(CURDIR)/debian/tmp/etc/X11/cursors/
-# Build architecture-dependent files here.
-binary-arch: build install
+# Build architecture-independent files here.
+binary-indep: build install
dh_testdir
dh_testroot
@@ -89,9 +96,5 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
+binary: binary-indep
.PHONY: build clean binary-indep binary-arch binary install
commit 4c289884e217eb1c0fe53006b7fe0ed22b3eb4f1
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:25:47 2009 -0400
Add a watch file
diff --git a/debian/changelog b/debian/changelog
index 3ccf595..8f377a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* Remove conflicts and replaces on ancient xlibs-data
* Add support for parallel make
* Bump standards version to 3.8.3.0
+ * Add a watch file
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:17:40 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:21:29 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..aadf8c4
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/data/
xcursor-themes-(.*)\.tar\.gz
commit 92100cb80bf708f227a672e9b10c84667c4e8b80
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:17:57 2009 -0400
Bump standards version to 3.8.3.0
diff --git a/debian/changelog b/debian/changelog
index 6e28ccb..3ccf595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* Remove Branden and Fabio from the Maintainer list
* Remove conflicts and replaces on ancient xlibs-data
* Add support for parallel make
+ * Bump standards version to 3.8.3.0
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:16:19 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:17:40 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 22d33d6..4efed2a 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 <dnusi...@debian.org>
Build-Depends: debhelper (>= 4.0.0), pkg-config, x11-apps | xcursorgen,
libxcursor-dev
-Standards-Version: 3.6.1.0
+Standards-Version: 3.8.3.0
Package: xcursor-themes
Architecture: all
commit 1ade60447fd3b27a8c9c8fdd158906b4fca760b7
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:17:08 2009 -0400
Add support for parallel make
diff --git a/debian/changelog b/debian/changelog
index ad8f3a5..6e28ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
* Clean up the package description a little. Closes: #408837
* Remove Branden and Fabio from the Maintainer list
* Remove conflicts and replaces on ancient xlibs-data
+ * Add support for parallel make
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:05:48 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:16:19 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/rules b/debian/rules
index 6bf446e..d42835e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,10 @@ endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+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)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
commit 98f4422d532e54548a33ab91999a9d54ef62ea0b
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:06:12 2009 -0400
Remove conflicts and replaces on ancient xlibs-data
diff --git a/debian/changelog b/debian/changelog
index dfd6ea9..ad8f3a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
README.Debian file. Closes: #365061
* Clean up the package description a little. Closes: #408837
* Remove Branden and Fabio from the Maintainer list
+ * Remove conflicts and replaces on ancient xlibs-data
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:02:42 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:05:48 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/control b/debian/control
index dae5c4d..22d33d6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,6 @@ Standards-Version: 3.6.1.0
Package: xcursor-themes
Architecture: all
Depends: ${misc:Depends}
-Conflicts: xlibs-data (<< 6.8.2-35)
-Replaces: xlibs-data (<< 6.8.2-35)
Description: Base X cursor themes
This package contains the additional base X cursor themes --
handhelds, redglass, and whiteglass. These themes are not essential
commit b1927efbb09134f66ac533c8259d374de4288456
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:03:23 2009 -0400
Remove Branden and Fabio from the Maintainer list
diff --git a/debian/changelog b/debian/changelog
index 29c7c78..dfd6ea9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
to John Goerzen for reporting this and Hamish for providing the
README.Debian file. Closes: #365061
* Clean up the package description a little. Closes: #408837
+ * Remove Branden and Fabio from the Maintainer list
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:01:18 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:02:42 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 9cb6eb6..dae5c4d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xcursor-themes
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Branden Robinson
<bran...@debian.org>, Fabio M. Di Nitto <fabbi...@fabbione.net>
+Uploaders: David Nusinow <dnusi...@debian.org>
Build-Depends: debhelper (>= 4.0.0), pkg-config, x11-apps | xcursorgen,
libxcursor-dev
Standards-Version: 3.6.1.0
commit 15a0fe5800e86662c9ac89e29866390a62315b6f
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 20:02:28 2009 -0400
Clean up the package description a little. Closes: #408837
diff --git a/debian/changelog b/debian/changelog
index 838272b..29c7c78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
Also includes description of what cursors the package provides. Thanks
to John Goerzen for reporting this and Hamish for providing the
README.Debian file. Closes: #365061
+ * Clean up the package description a little. Closes: #408837
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 19:55:53 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 20:01:18 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
diff --git a/debian/control b/debian/control
index e476b9a..9cb6eb6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,6 @@ Depends: ${misc:Depends}
Conflicts: xlibs-data (<< 6.8.2-35)
Replaces: xlibs-data (<< 6.8.2-35)
Description: Base X cursor themes
- This package contains the base X cursor themes -- handhelds, redglass, and
- whiteglass. These themes used to be contained in the xlibs-data package.
They
- are for use with the Xcursor library.
- .
- Please see libxcursor1 for more information.
+ This package contains the additional base X cursor themes --
+ handhelds, redglass, and whiteglass. These themes are not essential
+ for the X server to run.
commit 44a95a2757477d0e1cc14791deea72427d66089a
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 19:58:23 2009 -0400
Add README.Debian explaining how to use these cursors
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..09b5975
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,19 @@
+Cursor themes included in this package:
+handhelds - Tiny cursor set appropriate for low resolution displays
+redglass - Fancy red-faced cursor set
+whiteglass - Fancy white-faced cursor set
+
+Additionally this package makes available the core theme via the
+Debian Alternatives system:
+core - The classic X11 cursor theme
+
+
+To change the theme used system-wide run:
+ update-alternatives --config x-cursor-theme
+
+To change the theme for a single user account you can create a symlink
+to a theme file in ~/.icons/default/:
+ # (for example to use the "core" theme)
+ THEME=core
+ mkdir -p ~/.icons/default/
+ ln -s /etc/X11/cursors/$THEME.theme ~/.icons/default/index.theme
diff --git a/debian/changelog b/debian/changelog
index 720bb0a..838272b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,12 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
[ David Nusinow ]
* Update xsfbs
+ * Add README.Debian explaining how to use these cursors.
+ Also includes description of what cursors the package provides. Thanks
+ to John Goerzen for reporting this and Hamish for providing the
+ README.Debian file. Closes: #365061
- -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 19:55:27 -0400
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 19:55:53 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
commit 8ec9786aa2a0e8c53a7fa15b9f8b6bfdfd767ada
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Aug 19 19:55:49 2009 -0400
Update xsfbs
diff --git a/debian/changelog b/debian/changelog
index 2129a5e..720bb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Replace xbase-clients with x11-apps in Build-Depends since this is
where xcursorgen is now.
- -- Brice Goglin <bgog...@debian.org> Tue, 08 Jan 2008 00:25:24 +0100
+ [ David Nusinow ]
+ * Update xsfbs
+
+ -- David Nusinow <dnusi...@debian.org> Wed, 19 Aug 2009 19:55:27 -0400
xcursor-themes (1.0.1-5) unstable; urgency=high
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcris...@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 <jcris...@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 <dnusi...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 $$logn...@$$(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 <jcris...@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 <jcris...@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 <bgog...@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; \
>$@
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
