xfonts-base: Changes to 'debian-unstable'
debian/changelog |7 +++
debian/control |1 +
2 files changed, 8 insertions(+)
New commits:
commit fec61f0238afe34d149f0f39cabbec2407d9a390
Author: Julien Cristau
Date: Sat Sep 24 14:47:45 2016 +0200
Import 1:1.0.4+nmu1
diff --git a/debian/changelog b/debian/changelog
index 09f0af4..9075d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-base (1:1.0.4+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add multiarch metadata (Closes: 677851)
+
+ -- Wookey Wed, 08 Jul 2015 17:30:53 +0100
+
xfonts-base (1:1.0.4) unstable; urgency=medium
* Remove Cyril and David from Uploaders.
diff --git a/debian/control b/debian/control
index bdedefc..c0ce8cb 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Standards-Version: 3.8.3
Package: xfonts-base
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Replaces: xfonts-misc
Suggests: xfs | xserver
xfonts-base: Changes to 'debian-unstable'
debian/changelog |1 + debian/control|2 +- debian/copyright |2 +- debian/watch.font-arabic-misc |2 +- debian/watch.font-cursor-misc |2 +- debian/watch.font-daewoo-misc |2 +- debian/watch.font-dec-misc|2 +- debian/watch.font-isas-misc |2 +- debian/watch.font-jis-misc|2 +- debian/watch.font-micro-misc |2 +- debian/watch.font-misc-misc |2 +- debian/watch.font-mutt-misc |2 +- debian/watch.font-schumacher-misc |2 +- debian/watch.font-sony-misc |2 +- debian/watch.font-sun-misc|2 +- 15 files changed, 15 insertions(+), 14 deletions(-) New commits: commit e934df78cfe71a5b3e63c4ff66c3123bcd6736bc Author: Julien Cristau Date: Sun Aug 21 18:56:51 2016 +0200 Switch Vcs-Git to https diff --git a/debian/control b/debian/control index da64426..5404308 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends-Indep: xfonts-utils (>= 1:7.5), xutils-dev (>= 1:7.5+4), Standards-Version: 3.8.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-base +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-base.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/font/xfonts-base.git Package: xfonts-base commit 324aa013624d2acb253ecc5ac7bba55c6b91b580 Author: Julien Cristau Date: Sun Aug 21 18:56:27 2016 +0200 Switch upstream xorg.freedesktop.org URLs in packaging to https. diff --git a/debian/changelog b/debian/changelog index c150c24..0d82650 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xfonts-base (1:1.0.5) UNRELEASED; urgency=medium * Add Vcs-* control fields. + * Switch upstream xorg.freedesktop.org URLs in packaging to https. -- Julien Cristau Mon, 02 Feb 2015 21:03:57 +0100 diff --git a/debian/copyright b/debian/copyright index d68b9b8..be8611b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Source package: xfonts-base Obtained from: -http://xorg.freedesktop.org/releases/individual/font/ +https://xorg.freedesktop.org/releases/individual/font/ font-arabic-misc font-cursor-misc font-daewoo-misc diff --git a/debian/watch.font-arabic-misc b/debian/watch.font-arabic-misc index 3c24854..0a25f01 100644 --- a/debian/watch.font-arabic-misc +++ b/debian/watch.font-arabic-misc @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/arabic-misc version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-arabic-misc-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-arabic-misc-(.*)\.tar\.gz diff --git a/debian/watch.font-cursor-misc b/debian/watch.font-cursor-misc index f976320..9f1d28c 100644 --- a/debian/watch.font-cursor-misc +++ b/debian/watch.font-cursor-misc @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/cursor-misc version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-cursor-misc-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-cursor-misc-(.*)\.tar\.gz diff --git a/debian/watch.font-daewoo-misc b/debian/watch.font-daewoo-misc index c3cb12a..9aca433 100644 --- a/debian/watch.font-daewoo-misc +++ b/debian/watch.font-daewoo-misc @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/daewoo-misc version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-daewoo-misc-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-daewoo-misc-(.*)\.tar\.gz diff --git a/debian/watch.font-dec-misc b/debian/watch.font-dec-misc index 64568d4..371dd3d 100644 --- a/debian/watch.font-dec-misc +++ b/debian/watch.font-dec-misc @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/dec-misc version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-dec-misc-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-dec-misc-(.*)\.tar\.gz diff --git a/debian/watch.font-isas-misc b/debian/watch.font-isas-misc index 61efc9e..71d9272 100644 --- a/debian/watch.font-isas-misc +++ b/debian/watch.font-isas-misc @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/isas-misc version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-isas-misc-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-isas-misc-(.*)\.tar\.gz diff --git a/debian/watch.font-jis-misc b/debian/watch.font-jis-misc index d92f55d..26af14c 100644 --- a/debian/watch.font-jis-misc +++ b/debian/watch.font-jis-misc @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/jis-misc version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-jis-misc-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-jis-misc-(.*)\.tar\.gz diff --git a/debian/watch.font-micro-misc b/debian/watch.font-micro-misc index 0f31bf5..b9fe9e5 100644 --- a/debian/watch.font-micro-misc +++ b/debian/watch.font-micro
xfonts-base: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/control |2 ++ 2 files changed, 8 insertions(+) New commits: commit ac9cd6333df977217b0adda6aab452a7b651f3a0 Author: Julien Cristau Date: Mon Feb 2 21:04:06 2015 +0100 Add Vcs-* control fields. diff --git a/debian/changelog b/debian/changelog index 09f0af4..c150c24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfonts-base (1:1.0.5) UNRELEASED; urgency=medium + + * Add Vcs-* control fields. + + -- Julien Cristau Mon, 02 Feb 2015 21:03:57 +0100 + xfonts-base (1:1.0.4) unstable; urgency=medium * Remove Cyril and David from Uploaders. diff --git a/debian/control b/debian/control index bdedefc..da64426 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,8 @@ Build-Depends-Indep: xfonts-utils (>= 1:7.5), xutils-dev (>= 1:7.5+4), Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-base +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/font/xfonts-base.git Package: xfonts-base Architecture: all -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1yined-0002ch...@moszumanska.debian.org
xfonts-base: Changes to 'debian-unstable'
debian/changelog |6 debian/compat |2 debian/control |2 debian/rules | 15 - debian/xsfbs/repack.sh | 32 -- debian/xsfbs/xsfbs.mk | 285 -- debian/xsfbs/xsfbs.sh | 622 - 7 files changed, 13 insertions(+), 951 deletions(-) New commits: commit b1d208a2fe98de49f3a1dfe2f20b620518f8b754 Author: Julien Cristau Date: Sun Feb 1 11:36:57 2015 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index dd723f4..09f0af4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfonts-base (1:1.0.4) UNRELEASED; urgency=medium +xfonts-base (1:1.0.4) unstable; urgency=medium * Remove Cyril and David from Uploaders. * Set GZIP=-n when calling make to avoid timestamps in compressed font @@ -6,7 +6,7 @@ xfonts-base (1:1.0.4) UNRELEASED; urgency=medium * Get rid of debian/xsfbs/. * Bump debhelper compat level to 7. - -- Julien Cristau Sat, 31 Jan 2015 16:47:42 +0100 + -- Julien Cristau Sun, 01 Feb 2015 11:36:40 +0100 xfonts-base (1:1.0.3) unstable; urgency=low commit fa1881e27ffc636d47f5a8ca0f7065dbdeeb245f Author: Julien Cristau Date: Sun Feb 1 11:34:54 2015 +0100 Bump debhelper compat level to 7. diff --git a/debian/changelog b/debian/changelog index a40825b..dd723f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xfonts-base (1:1.0.4) UNRELEASED; urgency=medium * Set GZIP=-n when calling make to avoid timestamps in compressed font files. * Get rid of debian/xsfbs/. + * Bump debhelper compat level to 7. -- Julien Cristau Sat, 31 Jan 2015 16:47:42 +0100 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 6c5ab8e..bdedefc 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: fonts Priority: optional Maintainer: Debian X Strike Force Build-Depends: - debhelper (>= 5), + debhelper (>= 7), Build-Depends-Indep: pkg-config, xfonts-utils (>= 1:7.5), diff --git a/debian/rules b/debian/rules index c013b2f..d73519e 100755 --- a/debian/rules +++ b/debian/rules @@ -65,7 +65,6 @@ build-stamp: $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS)) clean: dh_testdir - rm -f build-stamp rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* @@ -96,7 +95,7 @@ binary-indep: build install dh_testdir dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --fail-missing --exclude fonts.dir \ + dh_install --fail-missing --exclude fonts.dir \ --exclude fonts.scale dh_installxfonts dh_installchangelogs commit b8251b744c6edfd4f20393b8d6b051066163651c Author: Julien Cristau Date: Sun Feb 1 10:46:14 2015 +0100 Get rid of debian/xsfbs/. diff --git a/debian/changelog b/debian/changelog index d18b837..a40825b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xfonts-base (1:1.0.4) UNRELEASED; urgency=medium * Remove Cyril and David from Uploaders. * Set GZIP=-n when calling make to avoid timestamps in compressed font files. + * Get rid of debian/xsfbs/. -- Julien Cristau Sat, 31 Jan 2015 16:47:42 +0100 diff --git a/debian/rules b/debian/rules index c632465..c013b2f 100755 --- a/debian/rules +++ b/debian/rules @@ -12,13 +12,13 @@ # shared library. PACKAGE = xfonts-base -include debian/xsfbs/xsfbs.mk - ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif +STAMP_DIR = debian/stamps + # This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list # each subdirectory explicitly so that the build system knows what to build. @@ -46,6 +46,7 @@ else endif $(STAMP_DIR)/build-%: + mkdir -p $(STAMP_DIR) mkdir -p $*-build cd $*-build && \ ../$*/configure \ @@ -59,19 +60,18 @@ $(STAMP_DIR)/build-%: build: build-stamp -build-stamp: $(STAMP_DIR)/prepare $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS)) +build-stamp: $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS)) >$@ -clean: xsfclean +clean: dh_testdir - dh_testroot rm -f build-stamp rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache rm -rf *-build - + rm -rf $(STAMP_DIR) dh_clean install: build diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh deleted file mode 100755 index 5935cc9..000 --- a/debian/xsfbs/repack.sh +++ /dev/null @@ -1,32
xfonts-base: Changes to 'debian-unstable'
debian/changelog |8
debian/control |1 -
debian/rules |2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit d4027167592c0c22e1236a4b6bf5855f77b04e53
Author: Julien Cristau
Date: Sat Jan 31 18:49:08 2015 +0100
Set GZIP=-n when calling make to avoid timestamps in compressed font files.
diff --git a/debian/changelog b/debian/changelog
index 5afa9c6..d18b837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xfonts-base (1:1.0.4) UNRELEASED; urgency=medium
* Remove Cyril and David from Uploaders.
+ * Set GZIP=-n when calling make to avoid timestamps in compressed font
+files.
-- Julien Cristau Sat, 31 Jan 2015 16:47:42 +0100
diff --git a/debian/rules b/debian/rules
index ea4de74..c632465 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ $(STAMP_DIR)/build-%:
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
$(confflags)
- $(MAKE) -C $*-build
+ $(MAKE) -C $*-build GZIP=-n
>$@
commit 8064fb4675c6754ca34f5bf20e6ffa689c88eb6c
Author: Julien Cristau
Date: Sat Jan 31 16:47:51 2015 +0100
Remove Cyril and David from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 4a333d7..5afa9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfonts-base (1:1.0.4) UNRELEASED; urgency=medium
+
+ * Remove Cyril and David from Uploaders.
+
+ -- Julien Cristau Sat, 31 Jan 2015 16:47:42 +0100
+
xfonts-base (1:1.0.3) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 40147b6..6c5ab8e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xfonts-base
Section: fonts
Priority: optional
Maintainer: Debian X Strike Force
-Uploaders: David Nusinow , Cyril Brulebois
Build-Depends:
debhelper (>= 5),
Build-Depends-Indep:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yhcas-00037n...@moszumanska.debian.org
xfonts-base: Changes to 'debian-unstable'
debian/changelog | 12 ++-- debian/control | 10 +++--- 2 files changed, 17 insertions(+), 5 deletions(-) New commits: commit 51c8663c2b1ce1c4e451f6d6b0d32cd491b65b7c Author: Cyril Brulebois Date: Tue Nov 16 22:31:02 2010 +0100 Upload to unstable. Also bump version numbers to match upstream's. diff --git a/debian/changelog b/debian/changelog index 72eb8fd..4a333d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfonts-base (1:1.0.2) UNRELEASED; urgency=low +xfonts-base (1:1.0.3) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -26,7 +26,7 @@ xfonts-base (1:1.0.2) UNRELEASED; urgency=low * Wrap build-deps. * Add xutils-dev build-dep for new macros. - -- Julien Cristau Sat, 16 Jan 2010 16:47:59 + + -- Cyril Brulebois Tue, 16 Nov 2010 22:29:41 +0100 xfonts-base (1:1.0.1) unstable; urgency=low commit 4cc9ad6389f10274548f858f6685c4302d072904 Author: Cyril Brulebois Date: Tue Nov 16 22:29:31 2010 +0100 Add xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index 4c90b75..72eb8fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ xfonts-base (1:1.0.2) UNRELEASED; urgency=low U+FFE6 range (Closes: #252045). * Add myself to Uploaders. * Wrap build-deps. + * Add xutils-dev build-dep for new macros. -- Julien Cristau Sat, 16 Jan 2010 16:47:59 + diff --git a/debian/control b/debian/control index d25634f..40147b6 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: Build-Depends-Indep: pkg-config, xfonts-utils (>= 1:7.5), + xutils-dev (>= 1:7.5+4), Standards-Version: 3.8.3 Package: xfonts-base commit afa81595b7db88c018abaff8e979e96cb526a6fb Author: Cyril Brulebois Date: Tue Nov 16 22:29:00 2010 +0100 Wrap build-deps. diff --git a/debian/changelog b/debian/changelog index 03bbd41..4c90b75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ xfonts-base (1:1.0.2) UNRELEASED; urgency=low * font-misc-misc 1.0.2 fixes an off-by-one error in U+FFE1 through U+FFE6 range (Closes: #252045). * Add myself to Uploaders. + * Wrap build-deps. -- Julien Cristau Sat, 16 Jan 2010 16:47:59 + diff --git a/debian/control b/debian/control index fd528d3..d25634f 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,11 @@ Section: fonts Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow , Cyril Brulebois -Build-Depends: debhelper (>= 5) -Build-Depends-Indep: pkg-config, xfonts-utils (>= 1:7.5) +Build-Depends: + debhelper (>= 5), +Build-Depends-Indep: + pkg-config, + xfonts-utils (>= 1:7.5), Standards-Version: 3.8.3 Package: xfonts-base commit 327d328dbf02a2742c0c9388752e96491f1ebb7e Author: Cyril Brulebois Date: Tue Nov 16 22:20:09 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 6153d3d..03bbd41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ xfonts-base (1:1.0.2) UNRELEASED; urgency=low [ Cyril Brulebois ] * font-misc-misc 1.0.2 fixes an off-by-one error in U+FFE1 through U+FFE6 range (Closes: #252045). + * Add myself to Uploaders. -- Julien Cristau Sat, 16 Jan 2010 16:47:59 + diff --git a/debian/control b/debian/control index 0554b8f..fd528d3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xfonts-base Section: fonts Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow +Uploaders: David Nusinow , Cyril Brulebois Build-Depends: debhelper (>= 5) Build-Depends-Indep: pkg-config, xfonts-utils (>= 1:7.5) Standards-Version: 3.8.3 commit 680a76146a3bd2b886f98c0c19897683d6663ca6 Author: Cyril Brulebois Date: Tue Nov 16 22:19:03 2010 +0100 font-misc-misc 1.0.2 fixes an off-by-one error in U+FFE1 through U+FFE6 range (Closes: #252045). diff --git a/debian/changelog b/debian/changelog index 1abc68e..6153d3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ xfonts-base (1:1.0.2) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders @@ -18,6 +19,10 @@ xfonts-base (1:1.0.2) UNRELEASED; urgency=low - font-sun-misc 1.0.3 + update debian/copyright from upstream COPYING + [ Cyril Brulebois ] + * font-misc-misc 1.0.2 fixes an off-by-one error in U+FFE1 through +U+FFE6 range (Closes: #252045). + -- Julien Cristau Sat, 16 Jan 2010 16:47:59 + xfonts-base (1:1.0.1) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pitb5-0006xr...@alioth.debian.org
xfonts-base: Changes to 'debian-unstable'
debian/README.source |2 +-
debian/xsfbs/xsfbs.mk | 35 ++-
2 files changed, 23 insertions(+), 14 deletions(-)
New commits:
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois
Date: Sun May 2 02:14:45 2010 +0200
Add xorg-driver-{video,input} to Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep
2>/dev/null)
# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau
Date: Fri Apr 16 22:14:46 2010 +0200
Update serverabi rule for xserver 1.7.6.901
Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers. The ${xserver:Depends} variable is deprecated.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
>$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
serverabi: install
-ifeq ($(SERVERMINVERS),)
- @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >>
debian/$(PACKAGE).substvars
endif
# vim:set noet ai sts=8 sw=8 tw=0:
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*"
branch.
Otherwise, the upstream sources are manually installed in
xfonts-base: Changes to 'debian-unstable'
debian/changelog | 14 debian/copyright | 86 font-arabic-misc/ChangeLog| 74 font-arabic-misc/INSTALL | 291 ++ font-arabic-misc/Makefile.am | 11 font-arabic-misc/Makefile.in | 38 font-arabic-misc/aclocal.m4 | 2789 +++-- font-arabic-misc/config.guess | 274 +- font-arabic-misc/config.sub | 137 - font-arabic-misc/configure| 3835 +++--- font-arabic-misc/configure.ac | 10 font-cursor-misc/ChangeLog| 74 font-cursor-misc/INSTALL | 291 ++ font-cursor-misc/Makefile.am | 11 font-cursor-misc/Makefile.in | 38 font-cursor-misc/aclocal.m4 | 2789 +++-- font-cursor-misc/config.guess | 274 +- font-cursor-misc/config.sub | 137 - font-cursor-misc/configure| 3835 +++--- font-cursor-misc/configure.ac | 10 font-daewoo-misc/ChangeLog| 74 font-daewoo-misc/INSTALL | 291 ++ font-daewoo-misc/Makefile.am | 11 font-daewoo-misc/Makefile.in | 38 font-daewoo-misc/aclocal.m4 | 2789 +++-- font-daewoo-misc/config.guess | 274 +- font-daewoo-misc/config.sub | 137 - font-daewoo-misc/configure| 3835 +++--- font-daewoo-misc/configure.ac | 10 font-dec-misc/ChangeLog | 74 font-dec-misc/INSTALL | 291 ++ font-dec-misc/Makefile.am | 11 font-dec-misc/Makefile.in | 38 font-dec-misc/aclocal.m4 | 2789 +++-- font-dec-misc/config.guess| 274 +- font-dec-misc/config.sub | 137 - font-dec-misc/configure | 3835 +++--- font-dec-misc/configure.ac| 10 font-isas-misc/ChangeLog | 74 font-isas-misc/INSTALL| 291 ++ font-isas-misc/Makefile.am| 11 font-isas-misc/Makefile.in| 38 font-isas-misc/aclocal.m4 | 2789 +++-- font-isas-misc/config.guess | 274 +- font-isas-misc/config.sub | 137 - font-isas-misc/configure | 3835 +++--- font-isas-misc/configure.ac | 10 font-jis-misc/ChangeLog | 74 font-jis-misc/INSTALL | 291 ++ font-jis-misc/Makefile.am | 11 font-jis-misc/Makefile.in | 38 font-jis-misc/aclocal.m4 | 2789 +++-- font-jis-misc/config.guess| 274 +- font-jis-misc/config.sub | 137 - font-jis-misc/configure | 3835 +++--- font-jis-misc/configure.ac| 10 font-micro-misc/ChangeLog | 74 font-micro-misc/INSTALL | 291 ++ font-micro-misc/Makefile.am | 11 font-micro-misc/Makefile.in | 38 font-micro-misc/aclocal.m4| 2789 +++-- font-micro-misc/config.guess | 274 +- font-micro-misc/config.sub| 137 - font-micro-misc/configure | 3835 +++--- font-micro-misc/configure.ac | 10 font-misc-misc/ChangeLog | 74 font-misc-misc/INSTALL| 291 ++ font-misc-misc/Makefile.am| 11 font-misc-misc/Makefile.in| 36 font-misc-misc/aclocal.m4 | 2789 +++-- font-misc-misc/config.guess | 274 +- font-misc-misc/config.sub | 137 - font-misc-misc/configure | 4226 -- font-misc-misc/configure.ac | 10 font-mutt-misc/ChangeLog | 90 font-mutt-misc/INSTALL| 291 ++ font-mutt-misc/Makefile.am| 11 font-mutt-misc/Makefile.in| 38 font-mutt-misc/aclocal.m4 | 2789 +++-- font-mutt-misc/config.guess | 274 +- font-mutt-misc/config.sub | 137 - font-mutt-misc/configure | 3835 +++--- font-mutt-misc/configure.ac | 10 font-mutt-misc/cu12.bdf | 24 font-schumacher-misc/ChangeLog| 74 font-schumacher-misc/INSTALL | 291 ++ font-schumacher-misc/Makefile.am | 11 font-schumacher-misc/Makefile.in | 38 font-schumacher-misc/aclocal.m4 | 2789 +++-- font-schumacher-misc/config.guess | 274 +- font-schumacher-misc/config.sub | 137 - font-schumacher-misc/configure| 4207 - font-schumacher-misc/configure.ac | 10 font-sony-misc/ChangeLog | 74 font-sony-misc/INSTALL| 291 ++ font-sony-misc/Makefile.am| 11 font-sony-misc/Makefile.in| 38 font-sony-misc/aclocal.m4 | 2789 +++-- font-sony-misc/config.guess | 274 +- font-sony-misc/config.sub | 137 - font-sony-misc/config
xfonts-base: Changes to 'debian-unstable'
debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 630bac7e5703e254a334a23c708679ccf964b8c2 Author: Julien Cristau Date: Sat Jan 23 01:46:49 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index e6bcf33..714ce80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xfonts-base (1:1.0.2) UNRELEASED; urgency=low * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Julien Cristau Sat, 16 Jan 2010 16:47:59 + diff --git a/debian/control b/debian/control index 4a167b4..0554b8f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xfonts-base Section: fonts Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow , Julien Cristau +Uploaders: David Nusinow Build-Depends: debhelper (>= 5) Build-Depends-Indep: pkg-config, xfonts-utils (>= 1:7.5) Standards-Version: 3.8.3 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xfonts-base: Changes to 'debian-unstable'
debian/changelog |7 +++
debian/rules | 10 +-
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 2377851517a0a2e279dc214585df3ca447ac46c8
Author: Julien Cristau
Date: Sat Jan 16 16:49:08 2010 +
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 95de373..e6bcf33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-base (1:1.0.2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau Sat, 16 Jan 2010 16:47:59 +
+
xfonts-base (1:1.0.1) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/rules b/debian/rules
index b9dc929..ea4de74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,14 +46,14 @@ else
endif
$(STAMP_DIR)/build-%:
- mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
- cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p $*-build
+ cd $*-build && \
../$*/configure \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
$(confflags)
- $(MAKE) -C $*-obj-$(DEB_BUILD_GNU_TYPE)
+ $(MAKE) -C $*-build
>$@
@@ -70,7 +70,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf *-obj-*
+ rm -rf *-build
dh_clean
@@ -80,7 +80,7 @@ install: build
dh_clean -k
dh_installdirs
for FILE in $(SUBDIRS); do \
- cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \
+ cd "$$FILE"-build \
&& $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install; \
cd ..; \
done
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xfonts-base: Changes to 'debian-unstable'
debian/changelog | 32 debian/control |8 debian/patches/remove-wrongly-registered-katakana-glyphs | 97 debian/patches/series|1 debian/rules | 73 debian/watch | 17 debian/watch.font-arabic-misc|2 debian/watch.font-cursor-misc|2 debian/watch.font-daewoo-misc|2 debian/watch.font-dec-misc |2 debian/watch.font-isas-misc |2 debian/watch.font-jis-misc |2 debian/watch.font-micro-misc |2 debian/watch.font-misc-misc |2 debian/watch.font-mutt-misc |2 debian/watch.font-schumacher-misc|2 debian/watch.font-sony-misc |2 debian/watch.font-sun-misc |2 debian/xfonts-base.postinst.in | 21 debian/xfonts-base.postrm.in | 30 debian/xfonts-base.preinst.in| 26 debian/xsfbs/xsfbs.mk| 17 debian/xsfbs/xsfbs.sh|4 font-arabic-misc-X11R7.0-1.0.0/COPYING | 23 font-arabic-misc-X11R7.0-1.0.0/ChangeLog | 26 font-arabic-misc-X11R7.0-1.0.0/Makefile.am | 46 font-arabic-misc-X11R7.0-1.0.0/Makefile.in | 456 font-arabic-misc-X11R7.0-1.0.0/README| 72 font-arabic-misc-X11R7.0-1.0.0/aclocal.m4| 647 font-arabic-misc-X11R7.0-1.0.0/arabic24.bdf |14298 font-arabic-misc-X11R7.0-1.0.0/autogen.sh| 12 font-arabic-misc-X11R7.0-1.0.0/configure | 3423 font-arabic-misc-X11R7.0-1.0.0/configure.ac | 46 font-arabic-misc-X11R7.0-1.0.0/install-sh| 294 font-arabic-misc-X11R7.0-1.0.0/missing | 336 font-arabic-misc-X11R7.0-1.0.0/mkinstalldirs | 111 font-arabic-misc-X11R7.0-1.0.0/uniarab.txt | 225 font-arabic-misc/COPYING | 23 font-arabic-misc/ChangeLog | 147 font-arabic-misc/Makefile.am | 55 font-arabic-misc/Makefile.in | 588 font-arabic-misc/README | 24 font-arabic-misc/aclocal.m4 | 2079 font-arabic-misc/arabic24.bdf|14298 font-arabic-misc/config.guess| 1561 font-arabic-misc/config.sub | 1686 font-arabic-misc/configure | 6624 font-arabic-misc/configure.ac| 45 font-arabic-misc/install-sh | 520 font-arabic-misc/missing | 376 font-arabic-misc/uniarab.txt | 225 font-cursor-misc-X11R7.0-1.0.0/COPYING |1 font-cursor-misc-X11R7.0-1.0.0/ChangeLog | 26 font-cursor-misc-X11R7.0-1.0.0/Makefile.am | 47 font-cursor-misc-X11R7.0-1.0.0/Makefile.in | 458 font-cursor-misc-X11R7.0-1.0.0/aclocal.m4| 647 font-cursor-misc-X11R7.0-1.0.0/autogen.sh| 12 font-cursor-misc-X11R7.0-1.0.0/configure | 3423 font-cursor-misc-X11R7.0-1.0.0/configure.ac | 46 font-cursor-misc-X11R7.0-1.0.0/cursor.bdf| 3289 font-cursor-misc-X11R7.0-1.0.0/install-sh| 294 font-cursor-misc-X11R7.0-1.0.0/missing | 336 font-cursor-misc-X11R7.0-1.0.0/mkinstalldirs | 111 font-cursor-misc/COPYING |1 font-cursor-misc/ChangeLog | 130 font-cursor-misc/Makefile.am | 56 font-cursor-misc/Makefile.in | 590 font-cursor-misc/README | 24 font-cursor-misc/aclocal.m4 | 2079 font-cursor-misc/config.guess| 1561 font-cursor-misc/config.sub | 1686 font-cursor-misc/configure | 6624 font-cursor-misc/configure.ac| 45 font-cursor-misc/cursor.bdf | 3289 font-cursor-misc/install-sh | 520 font-cursor-misc/missing
xfonts-base: Changes to 'debian-unstable'
debian/README.source | 73 +++
debian/changelog |8 +
debian/control|4
debian/xsfbs/xsfbs.mk |4
debian/xsfbs/xsfbs.sh | 241 --
5 files changed, 81 insertions(+), 249 deletions(-)
New commits:
commit b68834a71e5e73865dbb51885884793348a3ad0f
Author: David Nusinow
Date: Wed Sep 2 21:57:53 2009 -0400
Remove note about requiring this package for the X server to work.
Thanks Piotr Engelking. Closes: #534499
diff --git a/debian/changelog b/debian/changelog
index fcc60ef..385fa78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xfonts-base (1:1.0.0-7) UNRELEASED; urgency=low
* Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+ * Remove note about requiring this package for the X server to work.
+Thanks Piotr Engelking. Closes: #534499
-- David Nusinow Wed, 26 Aug 2009 23:32:33 -0400
diff --git a/debian/control b/debian/control
index 493cd65..6f70858 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,3 @@ Description: standard fonts for X
xfonts-base provides a standard set of low-resolution bitmapped fonts. In
most cases it is desirable to have the X font server (xfs) and/or an X server
installed to make the fonts available to X clients.
- .
- If you are not using a remote font server, you must install this package
- if you are installing an X server. It contains fonts, including the
- 'fixed' font, without which X servers will not work.
commit 3d0890a5191f07e64a504c2773fbc84211985ee7
Author: David Nusinow
Date: Wed Aug 26 23:32:33 2009 -0400
Update xsfbs to 5693792171d885769e58d053c08b11acd12a
diff --git a/debian/changelog b/debian/changelog
index d10f012..fcc60ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfonts-base (1:1.0.0-7) UNRELEASED; urgency=low
+
+ * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow Wed, 26 Aug 2009 23:32:33 -0400
+
xfonts-base (1:1.0.0-6) unstable; urgency=low
* Drop paragraph about xfonts-base-transcoded from the description. That
commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
-# does the operand contain any whitespace?
-if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered"
\
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
-fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
-if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-"(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
-smoking_guns=$(grep -l "$1" $possible_culprits || true)
-if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f i
xfonts-base: Changes to 'debian-unstable'
debian/changelog | 31 + debian/control |7 debian/patches/remove-wrongly-registered-katakana-glyphs | 97 +++ debian/patches/series|1 debian/rules |4 debian/watch | 17 debian/xsfbs/repack.sh | 32 + debian/xsfbs/xsfbs-autoreconf.mk | 150 - debian/xsfbs/xsfbs.mk| 127 debian/xsfbs/xsfbs.sh| 412 ++- 10 files changed, 382 insertions(+), 496 deletions(-) New commits: commit d5850684908c66341332d20f4566a3ced58c1c09 Author: Julien Cristau Date: Wed Apr 8 09:31:44 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index e80fc2f..d10f012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfonts-base (1:1.0.0-6) UNRELEASED; urgency=low +xfonts-base (1:1.0.0-6) unstable; urgency=low * Drop paragraph about xfonts-base-transcoded from the description. That package has been dropped in the modular packaging, and the fonts it used @@ -10,7 +10,7 @@ xfonts-base (1:1.0.0-6) UNRELEASED; urgency=low - use dh_clean -k in the install target, not plain dh_clean * Update xsfbs. - -- Julien Cristau Tue, 24 Jul 2007 19:58:47 +0200 + -- Julien Cristau Wed, 08 Apr 2009 09:31:28 +0100 xfonts-base (1:1.0.0-5.1) unstable; urgency=low commit e492e3509e4f0a29209f0875ff6945c050fc650c Author: Julien Cristau Date: Wed Apr 8 09:26:47 2009 +0100 Fix rules dependencies diff --git a/debian/rules b/debian/rules index 79646ae..7b1be15 100755 --- a/debian/rules +++ b/debian/rules @@ -50,8 +50,8 @@ else endif -build: prepare build-stamp -build-stamp: patch +build: build-stamp +build-stamp: $(STAMP_DIR)/patch dh_testdir for FILE in "$(SUBDIRS)"; do \ echo "$$FILE"; \ commit 93dfe8f3663b151ec483516727b292cab544fd55 Author: Julien Cristau Date: Wed Apr 8 09:23:33 2009 +0100 Revert inappropriate NMU changes - change debian/compat back to 5 - the download page is not a homepage - use dh_clean -k in the install target, not plain dh_clean diff --git a/debian/changelog b/debian/changelog index ea2ddbf..2526462 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ xfonts-base (1:1.0.0-6) UNRELEASED; urgency=low * Drop paragraph about xfonts-base-transcoded from the description. That package has been dropped in the modular packaging, and the fonts it used to contain are now in xfonts-base. Thanks again to Josip Rodin! + * Import 1:1.0.0-5.1 NMU from Hideki Yamane. + * Revert inappropriate NMU changes: +- change debian/compat back to 5 +- the download page is not a homepage +- use dh_clean -k in the install target, not plain dh_clean -- Julien Cristau Tue, 24 Jul 2007 19:58:47 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +5 diff --git a/debian/control b/debian/control index 32837e8..493cd65 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,9 @@ Section: fonts Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow , Branden Robinson , Julien Cristau -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper Build-Depends-Indep: pkg-config, xfonts-utils, quilt Standards-Version: 3.8.1 -Homepage: http://xorg.freedesktop.org/releases/individual/font/ Package: xfonts-base Architecture: all diff --git a/debian/rules b/debian/rules index 3a26ab8..79646ae 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ build-stamp: patch done >$@ -clean: unpatch xsfclean +clean: xsfclean dh_testdir dh_testroot rm -f build-stamp @@ -81,7 +81,7 @@ clean: unpatch xsfclean install: build dh_testdir dh_testroot - dh_clean + dh_clean -k dh_installdirs for FILE in "$(SUBDIRS)"; do \ cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \ commit e9155523994a7fb14922540486f82f4c878698ca Author: Julien Cristau Date: Wed Apr 8 09:17:28 2009 +0100 Import 1:1.0.0-5.1 NMU diff --git a/debian/changelog b/debian/changelog index fff03c2..cc78f90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +xfonts-base (1:1.0.0-5.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: +- Standards-Version: 3.8.1 +- new section "fonts" +- Build-Depends: debhelper (>=7) +- add "Homepage:" field +- fix "I: xfonts-base source: build-depends-without-arch-dep" + so "Build-Depends-Indep: pkg-config, xfonts-utils", and add quilt + * debian/compat: set 7 + * debian/patches: +- add "remove-wrongly-registered-
xfonts-base: Changes to 'debian-unstable'
debian/changelog |8 debian/control |5 - 2 files changed, 8 insertions(+), 5 deletions(-) New commits: commit 14d45b1c1de7641fbb1e76d7e4aa3b572ab565bf Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Jul 24 20:00:06 2007 +0200 Drop paragraph about xfonts-base-transcoded from the description. That package has been dropped in the modular packaging, and the fonts it used to contain are now in xfonts-base. Thanks again to Josip Rodin! diff --git a/debian/changelog b/debian/changelog index fff03c2..7747ae5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xfonts-base (1:1.0.0-6) UNRELEASED; urgency=low + + * Drop paragraph about xfonts-base-transcoded from the description. That +package has been dropped in the modular packaging, and the fonts it used +to contain are now in xfonts-base. Thanks again to Josip Rodin! + + -- Julien Cristau <[EMAIL PROTECTED]> Tue, 24 Jul 2007 19:58:47 +0200 + xfonts-base (1:1.0.0-5) unstable; urgency=low [ Branden Robinson ] diff --git a/debian/control b/debian/control index 2fe9211..149be40 100644 --- a/debian/control +++ b/debian/control @@ -16,11 +16,6 @@ Description: standard fonts for X most cases it is desirable to have the X font server (xfs) and/or an X server installed to make the fonts available to X clients. . - This package contains primarily fonts in the ISO 10646-1 and ISO 8859-1 - encodings, to conserve disk space. (A small selection of fonts in ISO - 8859-8, JIS-X0208.1983, JIS-X0208.1976, and GB2312.1980 fonts are also - included.) For other encodings, see the xfonts-base-transcoded package. - . If you are not using a remote font server, you must install this package if you are installing an X server. It contains fonts, including the 'fixed' font, without which X servers will not work. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xfonts-base: Changes to 'debian-unstable'
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
-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
xfonts-base: Changes to 'debian-unstable'
debian/rules | 57 +-
debian/xfonts-base.postinst.in |6
debian/xfonts-base.postrm.in | 15
debian/xfonts-base.preinst.in| 20
debian/xsfbs/xsfbs-autoreconf.mk | 150 ++
debian/xsfbs/xsfbs.mk| 379
debian/xsfbs/xsfbs.sh| 907 +++
7 files changed, 1493 insertions(+), 41 deletions(-)
New commits:
commit d7a4b2a880f0332bb4dac0609f146f9388a51a36
Author: Branden Robinson <[EMAIL PROTECTED](none)>
Date: Wed Apr 18 02:40:50 2007 -0400
Perform janitorial work.
* Add licensing information to package preinst script.
* Use more convential Make idiom for creating a target.
* Add #DEBHELPER# expando to preinst script.
* Update comments in Debian rules file.
* Wrap lines at 80 columns.
* Update Vim modelines.
* Remove Subversion Id keywords.
* Update copyright notices where applicable.
diff --git a/debian/rules b/debian/rules
index 03787cd..bbcd9bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,34 @@
#!/usr/bin/make -f
-# debian/rules for the Debian xfonts-base package.
+# Debian xfonts-base package building rules
# Copyright © 2004 Scott James Remnant <[EMAIL PROTECTED]>
# Copyright © 2005 Daniel Stone <[EMAIL PROTECTED]>
# Copyright © 2005 David Nusinow <[EMAIL PROTECTED]>
+# Copyright © 2007 Branden Robinson <[EMAIL PROTECTED]>
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+#export DH_VERBOSE = 1
-# set this to the name of the main shlib's binary package
+# If this is a library package, set this to name of the package containing the
+# shared library.
PACKAGE = xfonts-base
include debian/xsfbs/xsfbs.mk
-# This package contains multiple modules as shipped by upstream. Each module
is # contained in a subdirectory in the root dir of the package. You must list
each
-# subdirectory explicitly so that the build system knows what to build
-SUBDIRS="font-arabic-misc-X11R7.0-1.0.0 font-cursor-misc-X11R7.0-1.0.0
font-daewoo-misc-X11R7.0-1.0.0 font-dec-misc-X11R7.0-1.0.0
font-isas-misc-X11R7.0-1.0.0 font-jis-misc-X11R7.0-1.0.0
font-micro-misc-X11R7.0-1.0.0 font-misc-misc-X11R7.0-1.0.0
font-mutt-misc-X11R7.0-1.0.0 font-schumacher-misc-X11R7.0-1.0.0
font-sony-misc-X11R7.0-1.0.0 font-sun-misc-X11R7.0-1.0.0"
+# This package contains multiple modules as shipped by upstream. Each module
is
+# contained in a subdirectory in the root dir of the package. You must list
+# each subdirectory explicitly so that the build system knows what to build.
+SUBDIRS="font-arabic-misc-X11R7.0-1.0.0 \
+ font-cursor-misc-X11R7.0-1.0.0 \
+ font-daewoo-misc-X11R7.0-1.0.0 \
+ font-dec-misc-X11R7.0-1.0.0 \
+ font-isas-misc-X11R7.0-1.0.0 \
+ font-jis-misc-X11R7.0-1.0.0 \
+ font-micro-misc-X11R7.0-1.0.0 \
+ font-misc-misc-X11R7.0-1.0.0 \
+ font-mutt-misc-X11R7.0-1.0.0 \
+ font-schumacher-misc-X11R7.0-1.0.0 \
+ font-sony-misc-X11R7.0-1.0.0 \
+ font-sun-misc-X11R7.0-1.0.0"
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -40,23 +54,22 @@ build: prepare build-stamp
build-stamp:
dh_testdir
for FILE in "$(SUBDIRS)"; do \
- echo "$$FILE" ; \
+ echo "$$FILE"; \
mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
- (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
- ../"$$FILE"/configure --prefix=/usr
--mandir=\$${prefix}/share/man \
---infodir=\$${prefix}/share/info $(confflags) \
---with-fontdir=\$${prefix}/share/fonts/X11/misc \
-CFLAGS="$(CFLAGS)" && \
- $(MAKE)) || exit 1; \
+ (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \
+ && ../"$$FILE"/configure --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --with-fontdir=\$${prefix}/share/fonts/X11/misc \
+ CFLAGS="$(CFLAGS)" \
+ && $(MAKE)) || exit 1; \
done
-
- touch build-stamp
+ >$@
clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -70,9 +83,9 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
-
for FILE in "$(SUBDIRS)"; do \
- cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
DESTDIR=$(CURDIR)/debian/tmp install ; \
+ cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \
+ && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install; \
cd ..; \
done
install -D -m644 debian/fonts.alias \
@@ -80,15 +93,15 @@ install: build
# Build architecture-
xfonts-base: Changes to 'debian-unstable'
debian/changelog | 13 +++--
debian/control |7 ---
2 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 474af23b1cf341c6e7dd0fefa00646bb1b12cb0e
Author: Branden Robinson <[EMAIL PROTECTED](none)>
Date: Sun Apr 8 20:57:55 2007 -0400
Update package description.
+ Stop claiming that the package also provides font file manipulation
utilities. It no longer does; those moved to xfonts-utils. (To aid
transitions, xfonts-base should have grown a dependency on xfonts-utils,
but etch is out now and it's too late to help people upgrading from
sarge.)
+ Stop documenting the dependency on xutils; debhelper now worries about
this for us via dh_installxfonts and ${misc:Depends}, so the dependency
is no longer directly our responsibility.
diff --git a/debian/changelog b/debian/changelog
index 412d1bd..4e314f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,17 @@ xfonts-base (1:1.0.0-5) UNRELEASED; urgency=low
+ Add many copyright notices, licenses, and other notations of status
(such as "public domain") from upstream sources.
+ Add other information required by Debian Policy §12.5.
-
- -- Branden Robinson <[EMAIL PROTECTED]> Sun, 8 Apr 2007 14:59:14 -0400
+ * Update package description.
++ Stop claiming that the package also provides font file manipulation
+ utilities. It no longer does; those moved to xfonts-utils. (To aid
+ transitions, xfonts-base should have grown a dependency on xfonts-utils,
+ but etch is out now and it's too late to help people upgrading from
+ sarge.)
++ Stop documenting the dependency on xutils; debhelper now worries about
+ 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
xfonts-base (1:1.0.0-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6b499be..f908caa 100644
--- a/debian/control
+++ b/debian/control
@@ -24,10 +24,3 @@ Description: standard fonts for X
If you are not using a remote font server, you must install this package
if you are installing an X server. It contains fonts, including the
'fixed' font, without which X servers will not work.
- .
- This package also provides a set of files that can be used by the X or
- fonts server to transcode fonts from one encoding to another (e.g., KOI8-R
- to ISO-8859-5).
- .
- This package requires the xutils package to prepare the font directories
- for use by an X server or X font server.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xfonts-base: Changes to 'debian-unstable'
debian/copyright |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) New commits: commit b4072380f5ec8d5d80bc23c58b55debf7e71cb0c Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Apr 8 22:39:38 2007 +0200 Fix typo. diff --git a/debian/copyright b/debian/copyright index 2e65b3d..b375560 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,7 +26,7 @@ Debian package author(s): Debian copyright(s)/licence(s): -Unless otherwise noted, all modifications and additions to the upstream soruces +Unless otherwise noted, all modifications and additions to the upstream sources found in this Debian package bear the following copyright and license terms: Copyright 1996-2004 Branden Robinson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xfonts-base: Changes to 'debian-unstable'
debian/changelog |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) New commits: commit d166d905ea79da85caced2105c2973ab688babab Author: Branden Robinson <[EMAIL PROTECTED](none)> Date: Sun Apr 8 15:16:29 2007 -0400 Fix typo. diff --git a/debian/changelog b/debian/changelog index 0e2bc8d..412d1bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ xfonts-base (1:1.0.0-5) UNRELEASED; urgency=low case-insensitive matches "adobe", let alone bears a copyright notice of theirs. + Add many copyright notices, licenses, and other notations of status - (such as "public domain') from upstream sources. + (such as "public domain") from upstream sources. + Add other information required by Debian Policy §12.5. -- Branden Robinson <[EMAIL PROTECTED]> Sun, 8 Apr 2007 14:59:14 -0400 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xfonts-base: Changes to 'debian-unstable'
debian/changelog | 12 ++ debian/copyright | 235 ++- 2 files changed, 228 insertions(+), 19 deletions(-) New commits: commit 781fe1fc9dd8667fc3f5135e7595f6bd190485ba Author: Branden Robinson <[EMAIL PROTECTED](none)> Date: Sun Apr 8 15:07:40 2007 -0400 Update Debian copyright file. + Remove Adobe copyright notices; nothing in the upstream sources case-insensitive matches "adobe", let alone bears a copyright notice of theirs. + Add many copyright notices, licenses, and other notations of status (such as "public domain') from upstream sources. + Add other information required by Debian Policy §12.5. diff --git a/debian/changelog b/debian/changelog index 75dc4d0..0e2bc8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xfonts-base (1:1.0.0-5) UNRELEASED; urgency=low + + * Update Debian copyright file. ++ Remove Adobe copyright notices; nothing in the upstream sources + case-insensitive matches "adobe", let alone bears a copyright notice of + theirs. ++ Add many copyright notices, licenses, and other notations of status + (such as "public domain') from upstream sources. ++ Add other information required by Debian Policy §12.5. + + -- Branden Robinson <[EMAIL PROTECTED]> Sun, 8 Apr 2007 14:59:14 -0400 + xfonts-base (1:1.0.0-4) unstable; urgency=low [ Eugene Konev ] diff --git a/debian/copyright b/debian/copyright index 850cf94..2e65b3d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,19 +1,216 @@ -Copyright 1984-1989, 1994 Adobe Systems Incorporated. -Copyright 1988, 1994 Digital Equipment Corporation. - -Adobe is a trademark of Adobe Systems Incorporated which may be -registered in certain jurisdictions. -Permission to use these trademarks is hereby granted only in -association with the images described in this file. - -Permission to use, copy, modify, distribute and sell this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notices appear in all -copies and that both those copyright notices and this permission -notice appear in supporting documentation, and that the names of -Adobe Systems and Digital Equipment Corporation not be used in -advertising or publicity pertaining to distribution of the software -without specific, written prior permission. Adobe Systems and -Digital Equipment Corporation make no representations about the -suitability of this software for any purpose. It is provided "as -is" without express or implied warranty. +Source package: xfonts-base +Obtained from: +XXX: upstream GIT URLs for: +font-arabic-misc-X11R7.0-1.0.0 +font-cursor-misc-X11R7.0-1.0.0 +font-daewoo-misc-X11R7.0-1.0.0 +font-dec-misc-X11R7.0-1.0.0 +font-isas-misc-X11R7.0-1.0.0 +font-jis-misc-X11R7.0-1.0.0 +font-micro-misc-X11R7.0-1.0.0 +font-misc-misc-X11R7.0-1.0.0 +font-mutt-misc-X11R7.0-1.0.0 +font-schumacher-misc-X11R7.0-1.0.0 +font-sony-misc-X11R7.0-1.0.0 +font-sun-misc-X11R7.0-1.0.0 +Upstream author(s): +various; see copyright notices below +Debian package author(s): +Stephen Early +Mark Eichin +Branden Robinson +ISHIKAWA Mutsumi +Scott James Remnant +Daniel Stone +David Nusinow + +Debian copyright(s)/licence(s): + +Unless otherwise noted, all modifications and additions to the upstream soruces +found in this Debian package bear the following copyright and license terms: + +Copyright 1996-2004 Branden Robinson + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR(S) AND COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +IN THE SOFTWARE. + +Upstream copyright(s)/licence(s): + +font-arabic-misc-X11R7.0-1.0.0/COPYING: +Copyright 1996, 1997, 1998, 1999 Computing Research Labs, New Mexico State +University + +Permission is hereby granted, free of charge, to any person obtaining a cop
xfonts-base: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 5cc5459ba767a05989aad3dff36fa0689ede8d1e Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 6 21:20:14 2007 -0500 autoreconf commit 0914a48cdc41eda357985bbf14c0e9468d9908c1 Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 6 21:08:24 2007 -0500 Add fonts and packaging bits that got missed in the conversion to git commit b9710f179c26e0cb5a327e43b486532fcdc6d019 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Sep 30 21:05:52 2006 + * Drop X11R7 from aliases install path. * Switch to dh_installxfonts. * Bump policy to 3.7.2 (now we are compliant). * Remove unused debhelper helpers. * Build package in binary-indep, not in binary-arch. * Bump debhelper compat to 5 and version build-dep to >= 5.0.31 * Remove Fabio from uploaders with his permission. He's always welcome back. * Upload to unstable commit 853a2f1b7613e5a60394de56e60dc540d121d104 Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Feb 24 03:01:54 2006 + * Include mention of the fixed font in the package description so people with this common error can find the package. Thanks Andras Korn. (closes: #354017) commit 1483561c7f4892e5a1acc8647e2dec25a4798f29 Author: David Nusinow <[EMAIL PROTECTED]> Date: Wed Feb 22 01:32:49 2006 + Fix chmod on fonts.alias install and add -75dpi.postrm.in that I'd missed previously commit 589c1d7e2830aa3de535b4324b4da85feceb64d5 Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 21 03:53:42 2006 + Ingore fonts.scale, not fonts.alias commit 4cf8336d644db5dfcb80e9b7dcc2655e1876a3cd Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 21 02:08:30 2006 + exclude fonts.alias during install. Thanks Eugene Konev. commit f1b5d0002b83dd4390ff27871059dc7e2a1fd0e9 Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 21 01:27:41 2006 + Add replaces so anyone testing the internal stuff doesn't get bitten commit 90f84fcd770a44f195577ac5092cdc4bfe6e52a0 Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 21 01:19:55 2006 + Apply Eugene Konev's fixes and also remove the ethiopic fonts from this package for later inclusion elsewhere commit 35fa63658359e156dea7866b9d6323e6e3a8dd41 Author: David Nusinow <[EMAIL PROTECTED]> Date: Mon Feb 20 04:59:59 2006 + Rename xfonts-misc to xfonts-base -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
