libxfont: Changes to 'debian-unstable-libxfont1'
debian/changelog | 11 +++++++++++
debian/control | 6 ++----
debian/copyright | 2 +-
debian/rules | 5 +----
4 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 844819bbdab2d99be79fee635225fcc29422440a
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Nov 24 18:21:52 2016 +0100
Remove superfluous --libdir from dh_auto_configure. Not needed with debhelper >= 9.
diff --git a/debian/changelog b/debian/changelog
index 5ff507a..d002df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libxfont1 (1:1.5.2-4) UNRELEASED; urgency=medium
* Remove dh-autoreconf build-dep. Not needed with debhelper 10.
* Remove obsolete Conflicts from pre-wheezy.
* Update a bunch of URLs in packaging to https.
+ * Remove superfluous --libdir from dh_auto_configure. Not needed with
+ debhelper >= 9.
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 24 Nov 2016 17:54:29 +0100
diff --git a/debian/rules b/debian/rules
index f552897..a86c462 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
CFLAGS += -Wall
CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
@@ -20,7 +18,6 @@ CONFFLAGS += \
--enable-devel-docs \
--without-fop \
--disable-silent-rules \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LDFLAGS="$(LDFLAGS)"
commit 34a0c6f0fb6389f313cbd1bb9355944617f9f9d7
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Nov 24 18:00:03 2016 +0100
Update a bunch of URLs in packaging to https.
diff --git a/debian/changelog b/debian/changelog
index 81b3393..5ff507a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxfont1 (1:1.5.2-4) UNRELEASED; urgency=medium
* Fix a typo in override_dh_strip.
* Remove dh-autoreconf build-dep. Not needed with debhelper 10.
* Remove obsolete Conflicts from pre-wheezy.
+ * Update a bunch of URLs in packaging to https.
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 24 Nov 2016 17:54:29 +0100
diff --git a/debian/control b/debian/control
index f855b69..baf7a21 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: X11 font rasterisation library
selection and rasterisation (through external libraries).
.
More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
.
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXfont
@@ -50,7 +50,7 @@ Description: X11 font rasterisation library (development headers)
libxfont1. Non-developers likely have little use for this package.
.
More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
.
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXfont
diff --git a/debian/copyright b/debian/copyright
index 14bcbbd..ac6171d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/lib/
+https://xorg.freedesktop.org/releases/individual/lib/
Copyright © 2007 Red Hat, Inc
Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
commit e26e30c226605b61ec16da33917aa3bef51e9957
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Nov 24 17:58:38 2016 +0100
Remove obsolete Conflicts from pre-wheezy.
diff --git a/debian/changelog b/debian/changelog
index bbaf027..81b3393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxfont1 (1:1.5.2-4) UNRELEASED; urgency=medium
* Fix a typo in override_dh_strip.
* Remove dh-autoreconf build-dep. Not needed with debhelper 10.
+ * Remove obsolete Conflicts from pre-wheezy.
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 24 Nov 2016 17:54:29 +0100
diff --git a/debian/control b/debian/control
index a183a59..f855b69 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ Package: libxfont1
Section: oldlibs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xprint (<< 2:1.6.0-1)
Breaks: xfs (<< 1:1.1.4)
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
commit 5427a7a806d0d4872de12bcf51e9a42b2d28a273
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Nov 24 17:57:25 2016 +0100
Remove dh-autoreconf build-dep. Not needed with debhelper 10.
diff --git a/debian/changelog b/debian/changelog
index 048df42..bbaf027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxfont1 (1:1.5.2-4) UNRELEASED; urgency=medium
* Fix a typo in override_dh_strip.
+ * Remove dh-autoreconf build-dep. Not needed with debhelper 10.
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 24 Nov 2016 17:54:29 +0100
diff --git a/debian/control b/debian/control
index 82d4450..a183a59 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Timo Aaltonen <tjaalton@debian.org>
Build-Depends:
debhelper (>= 10),
- dh-autoreconf,
quilt,
pkg-config,
libfontenc-dev (>= 1:1.0.5-2),
commit e2737f36696f919595174dc7a9e3b4fc5d3941e5
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Nov 24 17:55:09 2016 +0100
Fix a typo in override_dh_strip.
diff --git a/debian/changelog b/debian/changelog
index 99c0dbb..048df42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxfont1 (1:1.5.2-4) UNRELEASED; urgency=medium
+
+ * Fix a typo in override_dh_strip.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 24 Nov 2016 17:54:29 +0100
+
libxfont1 (1:1.5.2-3) unstable; urgency=medium
* Drop libxfont1-udeb.
diff --git a/debian/rules b/debian/rules
index 9547dd7..f552897 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ override_dh_install:
dh_install -a --fail-missing
override_dh_strip:
- dh_strip --dbgsym-migration='libxfont2-dbg (<< 1:1.5.2-3~)'
+ dh_strip --dbgsym-migration='libxfont1-dbg (<< 1:1.5.2-3~)'
override_dh_makeshlibs:
dh_makeshlibs -V'libxfont1 (>= 1:1.4.2)'
Reply to: