libxaw: Changes to 'debian-unstable'
debian/changelog | 6 +-
debian/compat | 2
debian/control | 3 -
debian/rules | 119 +++++++++----------------------------------------------
4 files changed, 28 insertions(+), 102 deletions(-)
New commits:
commit 84ff2cf17b873f0246e49424beb5618f34f54c19
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 12 17:15:55 2014 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index a44ba5c..860895d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxaw (2:1.0.12-2) UNRELEASED; urgency=medium
+libxaw (2:1.0.12-2) unstable; urgency=medium
* Fix typo in package description (closes: #736829). Thanks, darkestkhan!
* Rewrite debian/rules to use dh. Bump debhelper compat and build-dep to 9.
Use dh-autoreconf.
- -- Julien Cristau <jcristau@debian.org> Mon, 27 Jan 2014 13:53:06 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 12 Jul 2014 17:15:51 +0200
libxaw (2:1.0.12-1) unstable; urgency=medium
commit 76d8447bd4266ae147f7284f7b3ac6fb9573dbc0
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 12 17:05:51 2014 +0200
Rewrite debian/rules to use dh.
Bump debhelper compat and build-dep to 9. Use dh-autoreconf.
diff --git a/debian/changelog b/debian/changelog
index 8bb2ac7..a44ba5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libxaw (2:1.0.12-2) UNRELEASED; urgency=medium
* Fix typo in package description (closes: #736829). Thanks, darkestkhan!
+ * Rewrite debian/rules to use dh. Bump debhelper compat and build-dep to 9.
+ Use dh-autoreconf.
-- Julien Cristau <jcristau@debian.org> Mon, 27 Jan 2014 13:53:06 +0100
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 08b2822..d96cac7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 9),
dpkg-dev (>= 1.16.0),
libx11-dev (>= 1:0.99.2),
x11proto-core-dev (>= 7.0.1),
@@ -17,6 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
+ dh-autoreconf,
# specs:
xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.9.1
diff --git a/debian/rules b/debian/rules
index a589365..77575da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,111 +7,34 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
-
-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
-confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
-
-configure: $(QUILT_STAMPFN)
- autoreconf -vfi
-
-build: build-indep
-build-indep: docflags = --enable-specs
-build-indep: build-stamp
-build-arch: docflags = --disable-specs
-build-arch: build-stamp
+%:
+ dh $@ --with quilt,autoreconf --builddirectory=build/ --parallel
-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 \
- --docdir=\$${datadir}/doc/libxaw7-dev \
- --disable-xaw6 \
- --with-xmlto --without-fop \
- --disable-silent-rules \
- $(confflags) \
- $(docflags)
+docflags = --enable-specs
- cd build && $(MAKE)
- >$@
+override_dh_auto_configure-arch: docflags = --disable-specs
+override_dh_auto_configure-arch override_dh_auto_configure-indep:
+ dh_auto_configure -- \
+ --docdir=\$${datadir}/doc/libxaw7-dev \
+ --disable-xaw6 \
+ --with-xmlto --without-fop \
+ --disable-silent-rules \
+ $(docflags) \
+ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
-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
- find -name Makefile.in -delete
- rm -f compile config.guess config.sub configure depcomp install-sh
- rm -f ltmain.sh missing INSTALL aclocal.m4 mkinstalldirs config.h.in
- dh_clean
-
-install: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+override_dh_auto_install:
+ dh_auto_install
rm -f debian/tmp/usr/lib/*/libXaw.so
ln -s libXaw7.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXaw.so
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installdocs -s
- dh_install -s --fail-missing --exclude=.la
- dh_installman -s
- dh_installchangelogs -s
- dh_link -s
- dh_strip -s -Nlibxaw7
- dh_strip -plibxaw7 --dbg-package=libxaw7-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
+override_dh_install:
+ dh_install --fail-missing --exclude=.la
-# Build architecture-independent files here.
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installdocs -i
- dh_install -i --fail-missing --exclude=.la
- dh_installman -i
- dh_installchangelogs -i
- dh_link -i
- dh_compress -i -X.xml
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-# Nothing to do
+override_dh_strip:
+ dh_strip -Nlibxaw7
+ dh_strip -plibxaw7 --dbg-package=libxaw7-dbg
-binary: binary-indep binary-arch
-.PHONY: build build-indep build-arch
-.PHONY: clean binary-indep binary-arch binary install
+override_dh_compress:
+ dh_compress -X.xml
Reply to: