debian/changelog | 10 ++++++++--
debian/control | 2 +-
debian/copyright | 2 +-
debian/xsfbs/xsfbs.mk | 27 ++++++++++++++++++---------
4 files changed, 28 insertions(+), 13 deletions(-)
New commits:
commit 36e656e5b4c158b036a18a962322fb4abb208c13
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jul 24 19:17:15 2007 +0200
Add myself to Uploaders, prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index e0c2d5e..fff03c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-base (1:1.0.0-5) UNRELEASED; urgency=low
+xfonts-base (1:1.0.0-5) unstable; urgency=low
[ Branden Robinson ]
* Update Debian copyright file.
@@ -21,8 +21,9 @@ xfonts-base (1:1.0.0-5) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add upstream URL to debian/copyright (closes: #434288). Thanks, Josip
Rodin!
+ * Add myself to Uploaders.
- -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:04:26 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:16:52 +0200
xfonts-base (1:1.0.0-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f908caa..2fe9211 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-base
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <[email protected]>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.31), pkg-config, xfonts-utils
Standards-Version: 3.7.2
commit 96a296875820ccb38756b5252f6bfb7025a78cb9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jul 24 19:07:53 2007 +0200
Add upstream URL to debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 4e314f2..e0c2d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xfonts-base (1:1.0.0-5) UNRELEASED; urgency=low
+ [ Branden Robinson ]
* Update Debian copyright file.
+ Remove Adobe copyright notices; nothing in the upstream sources
case-insensitive matches "adobe", let alone bears a copyright notice of
@@ -17,7 +18,11 @@ xfonts-base (1:1.0.0-5) UNRELEASED; urgency=low
this for us via dh_installxfonts and ${misc:Depends}, so the dependency
is no longer directly our responsibility.
- -- Branden Robinson <[EMAIL PROTECTED]> Sun, 8 Apr 2007 20:54:40 -0400
+ [ Julien Cristau ]
+ * Add upstream URL to debian/copyright (closes: #434288). Thanks, Josip
+ Rodin!
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:04:26 +0200
xfonts-base (1:1.0.0-4) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index b375560..05eb9d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Source package: xfonts-base
Obtained from:
- XXX: upstream GIT URLs for:
+ http://xorg.freedesktop.org/releases/individual/font/
font-arabic-misc-X11R7.0-1.0.0
font-cursor-misc-X11R7.0-1.0.0
font-daewoo-misc-X11R7.0-1.0.0
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
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)"; \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
