debian/changelog | 9 +++++++++
debian/compat | 2 +-
debian/control | 29 +----------------------------
debian/libxfont1-dev.install | 4 ++--
debian/libxfont1-udeb.install | 2 --
debian/rules | 33 ++++++++-------------------------
6 files changed, 21 insertions(+), 58 deletions(-)
New commits:
commit ba9419fc4eeed2b55c07311ffb2747524a7c15d3
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 24 00:17:05 2016 +0200
release to sid
diff --git a/debian/changelog b/debian/changelog
index 75872a4..99c0dbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxfont1 (1:1.5.2-3) UNRELEASED; urgency=medium
+libxfont1 (1:1.5.2-3) unstable; urgency=medium
* Drop libxfont1-udeb.
* Switch to -dbgsym.
* Bump debhelper compat to 10. Drop --with quilt and --parallel flags,
they are enabled by default now.
- -- Timo Aaltonen <tjaal...@debian.org> Thu, 24 Nov 2016 00:00:12 +0200
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 24 Nov 2016 00:16:53 +0200
libxfont1 (1:1.5.2-2) unstable; urgency=medium
commit 372002a061a90e7a9943356d3b24a595515cf2a4
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 24 00:16:42 2016 +0200
keep confflags in one place
diff --git a/debian/rules b/debian/rules
index 2872adf..9547dd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS := $(LDFLAGS:-Wl,-Bsymbolic-functions=)
CONFFLAGS += \
+ --with-bzip2 \
+ --with-xmlto \
--disable-fc \
--enable-builtins \
--enable-pcfformat \
@@ -25,7 +27,7 @@ CONFFLAGS += \
override_dh_auto_configure:
- dh_auto_configure -- --with-bzip2 --with-xmlto $(CONFFLAGS)
+ dh_auto_configure -- $(CONFFLAGS)
override_dh_install:
find debian/tmp -name '*.la' -delete
commit 76d1482e46b6461c5727fa43b2ad748c86972d84
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 24 00:13:04 2016 +0200
Bump debhelper compat to 10. Drop --with quilt and --parallel flags, they
are enabled by default now.
diff --git a/debian/changelog b/debian/changelog
index d79204e..75872a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libxfont1 (1:1.5.2-3) UNRELEASED; urgency=medium
* Drop libxfont1-udeb.
* Switch to -dbgsym.
+ * Bump debhelper compat to 10. Drop --with quilt and --parallel flags,
+ they are enabled by default now.
-- Timo Aaltonen <tjaal...@debian.org> Thu, 24 Nov 2016 00:00:12 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 21765be..82d4450 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Timo Aaltonen <tjaal...@debian.org>
Build-Depends:
- debhelper (>= 8.1.3),
+ debhelper (>= 10),
dh-autoreconf,
quilt,
pkg-config,
diff --git a/debian/rules b/debian/rules
index 3bfc518..2872adf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,4 +38,4 @@ override_dh_makeshlibs:
dh_makeshlibs -V'libxfont1 (>= 1:1.4.2)'
%:
- dh $@ --with quilt,autoreconf --parallel --builddirectory=build/
+ dh $@ --with quilt --builddirectory=build/
commit a8b928e75fc6800cc60cfe380eb498ad8faa3ed0
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 24 00:11:35 2016 +0200
Switch to -dbgsym.
diff --git a/debian/changelog b/debian/changelog
index 224bd55..d79204e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxfont1 (1:1.5.2-3) UNRELEASED; urgency=medium
* Drop libxfont1-udeb.
+ * Switch to -dbgsym.
-- Timo Aaltonen <tjaal...@debian.org> Thu, 24 Nov 2016 00:00:12 +0200
diff --git a/debian/control b/debian/control
index 24f0e15..21765be 100644
--- a/debian/control
+++ b/debian/control
@@ -40,25 +40,6 @@ Description: X11 font rasterisation library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXfont
-Package: libxfont1-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version})
-Multi-Arch: same
-Description: X11 font rasterisation library (debug package)
- libXfont provides various services for X servers, most notably font
- selection and rasterisation (through external libraries).
- .
- This package contains the debug versions of the library found in libxfont1.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXfont
-
Package: libxfont1-dev
Section: libdevel
Architecture: any
diff --git a/debian/rules b/debian/rules
index 084f11a..3bfc518 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-PACKAGE = libxfont1
-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
@@ -34,8 +32,7 @@ override_dh_install:
dh_install -a --fail-missing
override_dh_strip:
- dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
- dh_strip -N$(PACKAGE)
+ dh_strip --dbgsym-migration='libxfont2-dbg (<< 1:1.5.2-3~)'
override_dh_makeshlibs:
dh_makeshlibs -V'libxfont1 (>= 1:1.4.2)'
commit 94acb3ac1d76574ec04a3e09318883d1b084a362
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 24 00:07:34 2016 +0200
Drop libxfont1-udeb.
diff --git a/debian/changelog b/debian/changelog
index e8b1f05..224bd55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxfont1 (1:1.5.2-3) UNRELEASED; urgency=medium
+
+ * Drop libxfont1-udeb.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 24 Nov 2016 00:00:12 +0200
+
libxfont1 (1:1.5.2-2) unstable; urgency=medium
* Rename source to libxfont1.
diff --git a/debian/control b/debian/control
index 216ad74..24f0e15 100644
--- a/debian/control
+++ b/debian/control
@@ -40,14 +40,6 @@ Description: X11 font rasterisation library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXfont
-Package: libxfont1-udeb
-XC-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-dev.install b/debian/libxfont1-dev.install
index 2d8f9dd..e371e35 100644
--- a/debian/libxfont1-dev.install
+++ b/debian/libxfont1-dev.install
@@ -4,5 +4,5 @@ usr/lib/*/libXfont.so
usr/lib/*/pkgconfig/xfont.pc
# Extra doc, under noinst_* in doc/Makefile.am:
-../../build-main/doc/*.html usr/share/doc/libxfont1-dev/
-../../build-main/doc/*.txt usr/share/doc/libxfont1-dev/
+../../build/doc/*.html usr/share/doc/libxfont1-dev/
+../../build/doc/*.txt usr/share/doc/libxfont1-dev/
diff --git a/debian/libxfont1-udeb.install b/debian/libxfont1-udeb.install
deleted file mode 100644
index ec85c92..0000000
--- a/debian/libxfont1-udeb.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libXfont.so.1* usr/lib
-
diff --git a/debian/rules b/debian/rules
index 3b931a6..084f11a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
PACKAGE = libxfont1
-OOT = --builddirectory=build
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -27,34 +26,19 @@ CONFFLAGS += \
LDFLAGS="$(LDFLAGS)"
-override_dh_auto_clean:
- dh_auto_clean
- rm -rf build-main/ debian/tmp-main/
- rm -rf build-udeb/ debian/tmp-udeb/
-
override_dh_auto_configure:
- dh_auto_configure $(OOT)-main/ -- --with-bzip2 --with-xmlto
$(CONFFLAGS)
- dh_auto_configure $(OOT)-udeb/ -- --without-bzip2 --without-xmlto
$(CONFFLAGS)
-
-override_dh_auto_build:
- $(MAKE) -C build-main/
- $(MAKE) -C build-udeb/
-
-override_dh_auto_install:
- $(MAKE) -C build-main/ install DESTDIR=$(CURDIR)/debian/tmp-main
- $(MAKE) -C build-udeb/ install DESTDIR=$(CURDIR)/debian/tmp-udeb
+ dh_auto_configure -- --with-bzip2 --with-xmlto $(CONFFLAGS)
override_dh_install:
- find debian/tmp-* -name '*.la' -delete
- dh_install -a -N$(PACKAGE)-udeb --sourcedir=debian/tmp-main
--fail-missing
- dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb
--fail-missing
+ find debian/tmp -name '*.la' -delete
+ dh_install -a --fail-missing
override_dh_strip:
dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
dh_strip -N$(PACKAGE)
override_dh_makeshlibs:
- dh_makeshlibs -V'libxfont1 (>= 1:1.4.2)' --add-udeb=$(PACKAGE)-udeb
+ dh_makeshlibs -V'libxfont1 (>= 1:1.4.2)'
%:
- dh $@ --with quilt,autoreconf --parallel
+ dh $@ --with quilt,autoreconf --parallel --builddirectory=build/
