libxmu: Changes to 'debian-unstable'
debian/changelog | 6 ++
debian/control | 2
debian/patches/01_dont_export_private_deps.diff | 26 ++++++++++++
debian/patches/series | 1
debian/rules | 6 +-
debian/xsfbs/xsfbs.mk | 50 ++++++++----------------
debian/xsfbs/xsfbs.sh | 7 ---
7 files changed, 54 insertions(+), 44 deletions(-)
New commits:
commit 46dfb651624a7c8c789dbb140f72a3eb527f376f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 16:30:08 2008 +0100
Update changelog.
diff --git a/debian/changelog b/debian/changelog
index 0421121..0f20212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,12 @@ libxmu (2:1.0.3-2) UNRELEASED; urgency=low
* Don't export private dependencies in xmu.pc and xmuu.pc. These
dependencies are handled by Requires.private.
* Due to the above, build-depend on quilt and apply the xsfbs patch rules.
+ * Update xsfbs to the latest version as of 2008-01-06.
[ Timo Aaltonen ]
* Bump the epoch so that this can be synced to Ubuntu in the future.
- -- Julien Cristau <jcristau@debian.org> Sun, 06 Jan 2008 16:26:30 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 06 Jan 2008 16:29:36 +0100
libxmu (1:1.0.3-1) unstable; urgency=low
commit b90ed5bc28338aab500f6a6d52a2189bcc14fb44
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 16:27:16 2008 +0100
Don't export private dependencies in xmu.pc and xmuu.pc.
These dependencies are handled by Requires.private.
Build-depend on quilt and apply the xsfbs patch rules.
diff --git a/debian/changelog b/debian/changelog
index 24dcce2..0421121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,14 @@ libxmu (2:1.0.3-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Make libxmu*-dev depend on libxmu-headers (= ${source:Version}). Thanks,
Josh Triplett.
+ * Don't export private dependencies in xmu.pc and xmuu.pc. These
+ dependencies are handled by Requires.private.
+ * Due to the above, build-depend on quilt and apply the xsfbs patch rules.
[ Timo Aaltonen ]
* Bump the epoch so that this can be synced to Ubuntu in the future.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 12:02:43 +0300
+ -- Julien Cristau <jcristau@debian.org> Sun, 06 Jan 2008 16:26:30 +0100
libxmu (1:1.0.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8d8730e..7037085 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>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxt-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), pkg-config
+Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxt-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), pkg-config, quilt
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
diff --git a/debian/patches/01_dont_export_private_deps.diff b/debian/patches/01_dont_export_private_deps.diff
new file mode 100644
index 0000000..64a5828
--- /dev/null
+++ b/debian/patches/01_dont_export_private_deps.diff
@@ -0,0 +1,26 @@
+diff --git a/xmu.pc.in b/xmu.pc.in
+index a086f83..15dabbf 100644
+--- a/xmu.pc.in
++++ b/xmu.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: Xmu
+ Description: Xmu Library
+ Version: @PACKAGE_VERSION@
+-Requires: xproto x11 xt
++Requires: xproto
+ Requires.private: x11 xt xext
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lXmu
+diff --git a/xmuu.pc.in b/xmuu.pc.in
+index 1e91ac4..72fa5f9 100644
+--- a/xmuu.pc.in
++++ b/xmuu.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: Xmuu
+ Description: Mini Xmu Library
+ Version: @PACKAGE_VERSION@
+-Requires: xproto x11
++Requires: xproto
+ Requires.private: x11
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lXmuu
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e22712f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_dont_export_private_deps.diff
diff --git a/debian/rules b/debian/rules
index 73f3782..0dfa02d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ else
endif
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -42,7 +42,7 @@ build-stamp:
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
@@ -64,7 +64,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir
dh_testroot
commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Sep 22 23:49:11 2007 -0400
Remove make-orig-tar-gz target
This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file. Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-#
-# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
-# for the rare situations when one is needed.
-.PHONY: make-orig-tar-gz
-make-orig-tar-gz: clean prune-upstream-tree
- ( cd .. \
- && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \
- echo "Our current working directory has the wrong name. Renaming..." >&2; \
- mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \
- fi; \
- tar --exclude=debian --exclude=debian/* \
- --exclude=.svn --exclude=.svn/* \
- -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \
- | gzip -9 >$(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \
- )
-
# Verify that there are no offsets or fuzz in the patches we apply.
#
# Note: This rule is for Debian package maintainers' convenience, and is not
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
ARCHITECTURE="$(dpkg --print-installation-architecture)"
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
fi; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
fi; \
commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 21:50:47 2007 +0200
Minor fixes in the patching system.
* Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
* Display which patches are applied and removed instead of just the first one (for #428090).
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
# 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/
+
# Set up parameters for the upstream build environment.
# Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next >/dev/null 2>&1; then \
+ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 19:06:05 2007 +0200
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if quilt next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
Reply to: