[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxfont: Changes to 'debian-unstable'



 debian/changelog |   10 ++++++++++
 debian/control   |    6 ++----
 debian/copyright |    2 +-
 debian/rules     |    3 ---
 4 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 66a1e6ec323beaa825cb3504c33dd7bc2d696eaa
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 2f1a381..8008eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libxfont (1:2.0.1-3) 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 18:32:25 +0100
 
diff --git a/debian/rules b/debian/rules
index 9fc9ecd..5c96f16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 PACKAGE  = libxfont2
 OOT      = --builddirectory=build
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
 CFLAGS  += -Wall
 CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
@@ -21,7 +19,6 @@ CONFFLAGS += \
 	--enable-devel-docs \
 	--without-fop \
 	--disable-silent-rules \
-	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	CFLAGS="$(CFLAGS)" \
 	CPPFLAGS="$(CPPFLAGS)" \
 	LDFLAGS="$(LDFLAGS)"

commit 3d40adf73dd9db76c7697af88e686187db063a1c
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 e3fa0fa..2f1a381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxfont (1:2.0.1-3) 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.
 
  -- Andreas Boll <andreas.boll.dev@gmail.com>  Thu, 24 Nov 2016 18:32:25 +0100
 
diff --git a/debian/control b/debian/control
index 5db7f6c..b6a70f5 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
@@ -58,7 +58,7 @@ Description: X11 font rasterisation library (development headers)
  libxfont2.  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 67c1778c989c9028b2839afed2048cf52cda2e2c
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 f405ec5..e3fa0fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxfont (1:2.0.1-3) UNRELEASED; urgency=medium
 
   * 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 18:32:25 +0100
 
diff --git a/debian/control b/debian/control
index f21e14f..5db7f6c 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ Package: libxfont2
 Section: libs
 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 0ec31fb908e5aa761a6718ffd3b63849469db255
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date:   Thu Nov 24 18:32:45 2016 +0100

    Remove dh-autoreconf build-dep. Not needed with debhelper 10.

diff --git a/debian/changelog b/debian/changelog
index 89e2467..f405ec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxfont (1:2.0.1-3) UNRELEASED; urgency=medium
+
+  * Remove dh-autoreconf build-dep. Not needed with debhelper 10.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com>  Thu, 24 Nov 2016 18:32:25 +0100
+
 libxfont (1:2.0.1-2) unstable; urgency=medium
 
   * Switch to -dbgsym packages.
diff --git a/debian/control b/debian/control
index d995292..f21e14f 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),


Reply to: