libxmu: Changes to 'debian-unstable'
debian/changelog | 12 +++++
debian/compat | 2
debian/control | 11 ++---
debian/rules | 117 ++++++++-----------------------------------------------
4 files changed, 37 insertions(+), 105 deletions(-)
New commits:
commit b18ee087af7a2841aa072cffa84cbc0c7457a0c1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 14 10:10:38 2015 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 34f32a7..5ecebf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxmu (2:1.1.2-2) UNRELEASED; urgency=medium
+libxmu (2:1.1.2-2) unstable; urgency=medium
[ Andreas Boll ]
* Switch to dh with the autoreconf and quilt addons, fixing possible FTBFS
@@ -8,7 +8,7 @@ libxmu (2:1.1.2-2) UNRELEASED; urgency=medium
* Remove Cyril from Uploaders.
* Bump Standards-Version to 3.9.6, update Vcs-* control fields.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 13 Nov 2015 20:43:36 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 14 Nov 2015 10:04:44 +0100
libxmu (2:1.1.2-1) unstable; urgency=low
commit ba152fce0e5943887160c172564d0321cbaa17f7
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 14 10:04:21 2015 +0100
Amend changelog to close FTBFS bug
diff --git a/debian/changelog b/debian/changelog
index 998780d..34f32a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
libxmu (2:1.1.2-2) UNRELEASED; urgency=medium
[ Andreas Boll ]
- * Switch to dh with the autoreconf and quilt addons.
+ * Switch to dh with the autoreconf and quilt addons, fixing possible FTBFS
+ when building in parallel (closes: #801059). Thanks, Matthias Klose!
[ Julien Cristau ]
* Remove Cyril from Uploaders.
commit c60d706e7e44d5338e268d053608ba8a35ab02e2
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 14 10:03:07 2015 +0100
Bump Standards-Version to 3.9.6, update Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 1d01707..998780d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxmu (2:1.1.2-2) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Remove Cyril from Uploaders.
+ * Bump Standards-Version to 3.9.6, update Vcs-* control fields.
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 13 Nov 2015 20:43:36 +0100
diff --git a/debian/control b/debian/control
index 5bc76e9..21409e0 100644
--- a/debian/control
+++ b/debian/control
@@ -17,9 +17,9 @@ Build-Depends:
xmlto (>= 0.0.22),
xorg-sgml-doctools (>= 1:1.8),
w3m,
-Standards-Version: 3.8.3
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/lib/libxmu
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libxmu.git
Package: libxmu6
Section: libs
commit 5390e945791a98fbd1dbadecc9f56ebd39e7b1a4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 14 10:01:54 2015 +0100
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 5d790d1..1d01707 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
libxmu (2:1.1.2-2) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* Switch to dh with the autoreconf and quilt addons.
+ [ Julien Cristau ]
+ * Remove Cyril from Uploaders.
+
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 13 Nov 2015 20:43:36 +0100
libxmu (2:1.1.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1f51029..5bc76e9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: libxmu
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
commit 8462e779b73d815053e27bc5d0a0e14ffe5c72ab
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Nov 13 20:44:11 2015 +0100
Switch to dh with the autoreconf and quilt addons.
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/debian/changelog b/debian/changelog
index c65fef4..5d790d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxmu (2:1.1.2-2) UNRELEASED; urgency=medium
+
+ * Switch to dh with the autoreconf and quilt addons.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 13 Nov 2015 20:43:36 +0100
+
libxmu (2:1.1.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 054ff51..1f51029 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 8.1.3),
- dpkg-dev (>= 1.16.0),
+ debhelper (>= 9),
+ dh-autoreconf,
libx11-dev (>= 1:0.99.2),
libxt-dev (>= 1:0.99.1),
libxext-dev (>= 1:0.99.1),
diff --git a/debian/rules b/debian/rules
index 3fe6792..101ab5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,107 +7,28 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
-
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-configure: $(QUILT_STAMPFN)
- dh_testdir
- autoreconf -vfi
-
-build: build-arch build-indep
-build-indep build-arch: build-stamp
-build-stamp: configure
- dh_testdir
-
- mkdir -p build
- cd build && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --infodir=\$${prefix}/share/info $(confflags) \
- --docdir=\$${prefix}/share/doc/libxmu-headers \
- --with-xmlto --without-fop \
- CFLAGS="$(CFLAGS)"
- cd build && $(MAKE)
- >$@
-
-clean: unpatch
- 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*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build
- rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure
- rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
- find -name Makefile.in -delete
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- # No need to keep '*.xml' around:
+.PHONY: build
+build:
+ dh build --with quilt,autoreconf --builddirectory=build/ --parallel
+
+%:
+ dh $@ --with quilt,autoreconf --builddirectory=build/ --parallel
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --docdir=\$${prefix}/share/doc/libxmu-headers \
+ --with-xmlto \
+ --without-fop
+
+override_dh_auto_install:
+ dh_auto_install
find debian/tmp/usr/share/doc/libxmu-headers -name '*.xml' -delete
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
+override_dh_install-arch:
+ dh_install --fail-missing -Xusr/include -X.la
- dh_installdocs -s
- dh_install -s --fail-missing -Xusr/include -X.la
- dh_installchangelogs -s
- dh_link -s
+override_dh_strip:
dh_strip -Nlibxmu6 -Nlibxmuu1
dh_strip -plibxmu6 --dbg-package=libxmu6-dbg
dh_strip -plibxmuu1 --dbg-package=libxmuu1-dbg
- dh_compress -s
- dh_fixperms -s
- dh_makeshlibs -s
- dh_shlibdeps -s
- dh_installdeb -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
-
-# Build architecture-independent files here.
-binary-indep: DH_OPTIONS=-i
-binary-indep: build install
- dh_installdocs
- dh_install
- dh_installchangelogs
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
Reply to: