debian/changelog | 16 ++++++++++++++--
debian/control | 16 ++++++++++++----
debian/libxfont1-udeb.install | 2 ++
debian/libxfont1.shlibs | 1 -
debian/rules | 21 +++++++++++++++++----
5 files changed, 45 insertions(+), 11 deletions(-)
New commits:
commit 68134cb7b2007c673805b1359b64b7423331f77b
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Mar 10 20:05:38 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index efb681c..a40c5f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxfont (1:1.4.1-2) UNRELEASED; urgency=low
+libxfont (1:1.4.1-2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -16,7 +16,7 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
xprint in Conflicts, thanks to lintian.
* Add myself to Uploaders.
- -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
+ -- Cyril Brulebois <k...@debian.org> Wed, 10 Mar 2010 20:05:31 +0100
libxfont (1:1.4.1-1) unstable; urgency=low
commit 6354f33b4319cff8309346677c7211820a96a60c
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Mar 10 20:05:22 2010 +0100
Fix obsolete-relation-form-in-source by using “<<” instead of “<” for
xprint in Conflicts, thanks to lintian.
diff --git a/debian/changelog b/debian/changelog
index 1c40a8b..efb681c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
dependency on libfontenc1-udeb.
* Use a bzip2-less flavour for the udeb.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Fix obsolete-relation-form-in-source by using “<<” instead of “<” for
+ xprint in Conflicts, thanks to lintian.
* Add myself to Uploaders.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
diff --git a/debian/control b/debian/control
index b51497e..b1b82c1 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: libxfont1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xprint (< 2:1.6.0-1)
+Conflicts: xprint (<< 2:1.6.0-1)
Description: X11 font rasterisation library
libXfont provides various services for X servers, most notably font
selection and rasterisation (through external libraries).
commit 56cf5e79b45fee013794348f6b516839f96d8a65
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Mar 10 20:00:39 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index b0df6f4..1c40a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
dependency on libfontenc1-udeb.
* Use a bzip2-less flavour for the udeb.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Add myself to Uploaders.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
diff --git a/debian/control b/debian/control
index f77876b..b51497e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxfont
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
commit 533bb827754c9cc34b5c3b5dfde34d51c79f6ba6
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Mar 10 19:57:23 2010 +0100
Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 7dbed35..b0df6f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
* Version the B-D on libfontenc-dev to ensure libxfont1-udeb gets a
dependency on libfontenc1-udeb.
* Use a bzip2-less flavour for the udeb.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
diff --git a/debian/control b/debian/control
index 5355ffc..f77876b 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
# devel-docs
xmlto,
lynx,
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfont
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxfont.git
commit 156a3f5cfd2cb61dd92486e94367d817dc2a5247
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Feb 26 04:35:19 2010 +0100
Use XC-Package-Type to save some memory.
diff --git a/debian/control b/debian/control
index 6796ac7..5355ffc 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Description: X11 font rasterisation library
git://anongit.freedesktop.org/git/xorg/lib/libXfont
Package: libxfont1-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
commit bdae293177937d3633030a8544c7dfa3b1fb0d67
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Feb 15 01:47:32 2010 +0100
Fix install target.
diff --git a/debian/rules b/debian/rules
index 0efc4f8..d57aed3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,7 @@ install: build
dh_testdir
dh_testroot
dh_clean -k
+ rm -rf debian/tmp-udeb
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
commit 3ac55f796d6aa34f494abd0b41db0c05094b5210
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Feb 10 03:44:51 2010 +0000
Fix clean target.
diff --git a/debian/rules b/debian/rules
index 9312eda..0efc4f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,7 @@ clean: xsfclean
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf build build-udeb
+ rm -rf debian/tmp-udeb
rm -f $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
commit b87bf1556707eba69a6c991cbf3dd293c0314920
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 7 18:48:15 2010 +0000
Use a bzip2-less flavour for the udeb.
diff --git a/debian/changelog b/debian/changelog
index 68e9c7c..7dbed35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
* Add udeb needed for the graphical installer: libxfont1-udeb.
* Version the B-D on libfontenc-dev to ensure libxfont1-udeb gets a
dependency on libfontenc1-udeb.
+ * Use a bzip2-less flavour for the udeb.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
diff --git a/debian/rules b/debian/rules
index d581c11..9312eda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,6 @@ doc_files = \
build/doc/fontlib.html
confflags += \
- --with-bzip2 \
--enable-fc \
--enable-builtins \
--enable-pcfformat \
@@ -52,13 +51,23 @@ build/config.status: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --with-bzip2 \
+ CFLAGS="$(CFLAGS)" LDFLAGS=""
+
+build-udeb/config.status: configure
+ mkdir -p build-udeb
+ cd build-udeb && \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --without-bzip2 \
CFLAGS="$(CFLAGS)" LDFLAGS=""
build: build-stamp
-build-stamp: build/config.status
+build-stamp: build/config.status build-udeb/config.status
dh_testdir
cd build && $(MAKE)
+ cd build-udeb && $(MAKE)
>$@
clean: xsfclean
@@ -70,7 +79,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf build
+ rm -rf build build-udeb
rm -f $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
@@ -84,6 +93,7 @@ install: build
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp-udeb install
# Build architecture-dependent files here.
binary-arch: build install
@@ -92,6 +102,7 @@ binary-arch: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing -XlibXfont.la
+ dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb
install -d debian/libxfont-dev/usr/share/doc/libxfont-dev
install -m 644 $(doc_files)
debian/libxfont-dev/usr/share/doc/libxfont-dev
dh_installchangelogs ChangeLog
commit f62313d345c53926a400cbe57c291ae5c35c30f0
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 6 16:30:07 2010 +0000
Version the B-D on libfontenc-dev to ensure libxfont1-udeb gets a
dependency on libfontenc1-udeb.
diff --git a/debian/changelog b/debian/changelog
index e1e5bcb..68e9c7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Use dh_makeshlibs’s -V argument instead of debian/libxfont1.shlibs
* Add udeb needed for the graphical installer: libxfont1-udeb.
+ * Version the B-D on libfontenc-dev to ensure libxfont1-udeb gets a
+ dependency on libfontenc1-udeb.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
diff --git a/debian/control b/debian/control
index 088b41e..6796ac7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.or
Build-Depends:
debhelper (>= 5),
pkg-config,
- libfontenc-dev,
+ libfontenc-dev (>= 1:1.0.5-2),
x11proto-core-dev,
xtrans-dev,
x11proto-fonts-dev,
commit d94136651c10620ef122db0218a66843bbecd619
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 6 16:23:10 2010 +0000
Add udeb needed for the graphical installer: libxfont1-udeb.
diff --git a/debian/changelog b/debian/changelog
index e77105f..e1e5bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Use dh_makeshlibs’s -V argument instead of debian/libxfont1.shlibs
+ * Add udeb needed for the graphical installer: libxfont1-udeb.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
diff --git a/debian/control b/debian/control
index b24a3a6..088b41e 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,14 @@ Description: X11 font rasterisation library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXfont
+Package: libxfont1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X11 font rasterisation library
+ This is a udeb, or a microdeb, for the debian-installer.
+
Package: libxfont1-dbg
Section: debug
Architecture: any
diff --git a/debian/libxfont1-udeb.install b/debian/libxfont1-udeb.install
new file mode 100644
index 0000000..e73e376
--- /dev/null
+++ b/debian/libxfont1-udeb.install
@@ -0,0 +1,2 @@
+usr/lib/libXfont.so.1*
+
diff --git a/debian/rules b/debian/rules
index f31c32e..d581c11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,7 @@ binary-arch: build install
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
- dh_makeshlibs -V'libxfont1 (>= 1:1.2.9)'
+ dh_makeshlibs -V'libxfont1 (>= 1:1.2.9)' --add-udeb=$(PACKAGE)-udeb
dh_shlibdeps
dh_installdeb
dh_gencontrol
commit e04f455f33e783a550a3ad9641e56a52526c8abe
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 6 16:18:59 2010 +0000
Use dh_makeshlibs’s -V argument instead of debian/libxfont1.shlibs
diff --git a/debian/changelog b/debian/changelog
index af09703..e77105f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
libxfont (1:1.4.1-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
+ [ Cyril Brulebois ]
+ * Use dh_makeshlibs’s -V argument instead of debian/libxfont1.shlibs
+
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
libxfont (1:1.4.1-1) unstable; urgency=low
diff --git a/debian/libxfont1.shlibs b/debian/libxfont1.shlibs
deleted file mode 100644
index 7e3a09d..0000000
--- a/debian/libxfont1.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libXfont 1 libxfont1 (>= 1:1.2.9)
diff --git a/debian/rules b/debian/rules
index 89cd2f0..f31c32e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,7 @@ binary-arch: build install
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
- dh_makeshlibs
+ dh_makeshlibs -V'libxfont1 (>= 1:1.2.9)'
dh_shlibdeps
dh_installdeb
dh_gencontrol
--
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/e1nps5o-0005s3...@alioth.debian.org
