debian/changelog | 6 ++++++
debian/control | 3 +++
debian/xsfbs/xsfbs.mk | 22 ++++++----------------
3 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit d34e4641b8d8456d82286e4509dac0d0d6cdc6bf
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri Jun 13 10:33:11 2008 +0200
Misc fixes to debian/control and debian/copyright
* Add a link to www.X.org in the long description.
diff --git a/debian/changelog b/debian/changelog
index d0fe3d5..6253935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxcomposite (1:0.4.0-4) UNRELEASED; urgency=low
+
+ * Add a link to www.X.org in the long description.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Fri, 13 Jun 2008 11:16:01 +0200
+
libxcomposite (1:0.4.0-3) unstable; urgency=low
* Add dependency on x11proto-core-dev and libxext-dev to libxcomposite-dev,
diff --git a/debian/control b/debian/control
index 128f76d..84bda1e 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Description: X11 Composite extension library
the final drawing of the screen. Rendering is done into an off-screen buffer.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
@@ -42,6 +43,7 @@ Description: X11 Composite extension library (debug package)
libxcomposite1. Non-developers likely have little use for this package.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
@@ -64,6 +66,7 @@ Description: X11 Composite extension library (development
headers)
libxcomposite1. Non-developers likely have little use for this package.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <[EMAIL PROTECTED]>
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 \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
