debian/changelog | 11 +++++++++++
debian/control | 2 +-
debian/copyright | 3 +++
debian/rules | 2 --
debian/xfonts-encodings.install | 1 -
debian/xfonts-encodings.links | 2 --
debian/xfonts-encodings.lintian | 3 ---
debian/xsfbs/xsfbs.mk | 27 ++++++++++++++++++---------
8 files changed, 33 insertions(+), 18 deletions(-)
New commits:
commit 0b206ad278f818dc958f5637a2d3c30a33fba0f7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jul 24 19:45:49 2007 +0200
Drop compatibility symlinks in /usr/X11R6.
AFAIK they aren't needed in lenny.
Also drop related lintian overrides.
diff --git a/debian/changelog b/debian/changelog
index 136aa38..0764681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ xfonts-encodings (1:1.0.2-2) unstable; urgency=low
Rodin!
* Add myself to Uploaders and remove Branden and Fabio with their
permission.
+ * Drop compatibility symlinks in /usr/X11R6, which shouldn't be needed
+ anymore.
- -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:38:59 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:42:33 +0200
xfonts-encodings (1:1.0.2-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 96d3e41..fdf96f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,8 +66,6 @@ install: build
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
- mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian/overrides
- cp $(CURDIR)/debian/xfonts-encodings.lintian
$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfonts-encodings
# Build architecture-dependent files here.
binary-arch: build install
diff --git a/debian/xfonts-encodings.install b/debian/xfonts-encodings.install
index 91d502a..20ac300 100644
--- a/debian/xfonts-encodings.install
+++ b/debian/xfonts-encodings.install
@@ -1,2 +1 @@
usr/share/fonts/X11/encodings
-usr/share/lintian/overrides/xfonts-encodings
diff --git a/debian/xfonts-encodings.links b/debian/xfonts-encodings.links
deleted file mode 100644
index 41c23a8..0000000
--- a/debian/xfonts-encodings.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/fonts/X11/encodings/encodings.dir
usr/X11R6/lib/X11/fonts/encodings/encodings.dir
-usr/share/fonts/X11/encodings/large/encodings.dir
usr/X11R6/lib/X11/fonts/encodings/large/encodings.dir
diff --git a/debian/xfonts-encodings.lintian b/debian/xfonts-encodings.lintian
deleted file mode 100644
index 10d593f..0000000
--- a/debian/xfonts-encodings.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-# We install compatibility files to /usr/X11R6
-xfonts-encodings binary: package-installs-file-to-usr-x11r6
-xfonts-encodings binary: package-installs-font-to-usr-x11r6
commit 882cd6da16e52e2e0775d0191c093665c790d5db
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jul 24 19:39:35 2007 +0200
Add myself to Uploaders and remove Branden and Fabio.
diff --git a/debian/changelog b/debian/changelog
index bec078e..136aa38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xfonts-encodings (1:1.0.2-2) unstable; urgency=low
* Add upstream URL to debian/copyright (closes: #434290). Thanks, Josip
Rodin!
+ * Add myself to Uploaders and remove Branden and Fabio with their
+ permission.
- -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:36:58 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:38:59 +0200
xfonts-encodings (1:1.0.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 14ce21f..2be01bc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-encodings
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <[email protected]>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), quilt
Build-Depends-Indep: pkg-config, xfonts-utils
Standards-Version: 3.7.2.0
commit 2447bc4831af0b740d7462b1d0c91204203f0db6
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jul 24 19:37:44 2007 +0200
Add upstream URL to debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index c6b1f0e..bec078e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-encodings (1:1.0.2-2) unstable; urgency=low
+
+ * Add upstream URL to debian/copyright (closes: #434290). Thanks, Josip
+ Rodin!
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:36:58 +0200
+
xfonts-encodings (1:1.0.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/copyright b/debian/copyright
index 7ea03ea..fe074dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package contains the encodings tarball downloaded from
+http://xorg.freedesktop.org/releases/individual/font/
+
Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
All Rights Reserved.
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]
