From: Rhonda D'Vine Date: Thu, 13 Aug 2015 14:58:30 +0000 (+0200) Subject: Merge branch 'dh' X-Git-Tag: debian/0.6.0_pre2-5 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=5476775a4aacb530a376f0ee790ca0fbd6e8ad3f;hp=6133e3671ffd285d67c11f8ffa3b7ff07f958bc4;p=pkg%2Fabook.git Merge branch 'dh' --- diff --git a/debian/abook.install b/debian/abook.install new file mode 100644 index 0000000..771b678 --- /dev/null +++ b/debian/abook.install @@ -0,0 +1,8 @@ +ANNOUNCE usr/share/doc/abook/ +AUTHORS usr/share/doc/abook/ +BUGS usr/share/doc/abook/ +FAQ usr/share/doc/abook/ +README usr/share/doc/abook/ +THANKS usr/share/doc/abook/ +TODO usr/share/doc/abook/ +sample.abookrc usr/share/doc/abook/examples/ diff --git a/debian/changelog b/debian/changelog index 40e15ff..7c2a4e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -abook (0.6.0~pre2-5) UNRELEASED; urgency=low +abook (0.6.0~pre2-5) unstable; urgency=low * fix error into debian/postinst file (Closes: #791803). Thanks to Salvatore Bonaccorso. - * Fix corruption of address book, patch by Jorrit Tijben (Closes: #727245). + * Switch source package to debhelper. + * Fix broken Vcs-git link (Closes: #791612) - -- Denis Briand Sun, 12 Jul 2015 17:01:45 +0200 + -- Denis Briand Thu, 13 Aug 2015 16:48:16 +0200 abook (0.6.0~pre2-4) unstable; urgency=medium diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index fd7ef81..9dab637 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,10 @@ Priority: optional Maintainer: Rhonda D'Vine Uploaders: Denis Briand Standards-Version: 3.9.6 -Build-Depends: libncursesw5-dev, libreadline6-dev | libreadline-dev, - po-debconf, quilt (>= 0.40), autotools-dev, dpkg-dev (>= 1.16.1~) +Build-Depends: libncursesw5-dev, libreadline6-dev | libreadline-dev, po-debconf, quilt (>= 0.40), autotools-dev, dpkg-dev (>= 1.16.1~), debhelper (>= 9 ) Homepage: http://abook.sourceforge.net/ Vcs-Browser: http://git.deb.at/w/pkg/abook.git -Vcs-Git: git://git.deb.at/g/pkg/abook.git +Vcs-Git: git://git.deb.at/pkg/abook.git Package: abook Architecture: any diff --git a/debian/rules b/debian/rules index 52414c7..3618d1f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,118 +1,9 @@ #!/usr/bin/make -f -# debian/rules for abook -# copyright 2003-2012 by Gerfried Fuchs -# Licenced under WTFPLv2 +#DH_VERBOSE = 1 -#use dpkg-buildflags -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CFLAGS_MAINT_APPEND = -g -Wall -pedantic -std=gnu89 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -PKG = abook -TMP = $(CURDIR)/debian/$(PKG) - -QUILT_STAMPFN = patch-stamp -include /usr/share/quilt/quilt.make - -CFLAGS = -g -Wall -std=gnu89 -INSTALL = install -INSTALL_FILE = $(INSTALL) -p -oroot -groot -m644 -INSTALL_PROGRAM = $(INSTALL) -p -oroot -groot -m755 -INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755 -INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755 -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s - STRIP = true -endif -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - - - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -clean: unpatch - $(checkdir) - $(checkroot) - rm -rf build-stamp $(TMP) debian/files debian/substvars \ - config.guess config.sub - [ ! -f Makefile ] || $(MAKE) distclean - - -build: build-arch -build-arch: build-stamp -build-indep: -build-stamp: patch-stamp - $(checkdir) - cp /usr/share/misc/config.guess /usr/share/misc/config.sub . - ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info - $(MAKE) CFLAGS="$(CFLAGS)" - touch build-stamp - - -install: build - $(checkdir) - $(checkroot) - -rm -rf $(TMP) - $(INSTALL_DIR) $(TMP) - cd $(TMP) && $(INSTALL_DIR) usr/share/doc/$(PKG)/examples - $(MAKE) prefix=$(TMP)/usr install INSTALL_PROGRAM="$(INSTALL_PROGRAM)" - test "$(STRIP)" != true || strip \ - --remove-section=.comment --remove-section=.note \ - $(TMP)/usr/bin/abook - $(INSTALL_FILE) ChangeLog $(TMP)/usr/share/doc/$(PKG)/changelog - $(INSTALL_FILE) ANNOUNCE AUTHORS BUGS FAQ README THANKS TODO \ - $(TMP)/usr/share/doc/$(PKG) - $(INSTALL_FILE) sample.abookrc \ - $(TMP)/usr/share/doc/$(PKG)/examples - cd $(TMP)/usr/share && gzip -9 man/man1/abook.1 man/man5/abookrc.5 \ - doc/$(PKG)/changelog - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - - -# Build architecture-dependent files here. -binary-arch: build install - $(checkdir) - $(checkroot) - $(INSTALL_DIR) $(TMP)/DEBIAN $(TMP)/usr/share/menu - $(INSTALL_FILE) debian/menu $(TMP)/usr/share/menu/$(PKG) - $(INSTALL_FILE) debian/copyright $(TMP)/usr/share/doc/$(PKG) - $(INSTALL_FILE) debian/changelog \ - $(TMP)/usr/share/doc/$(PKG)/changelog.Debian - gzip -9 $(TMP)/usr/share/doc/$(PKG)/changelog.Debian - $(INSTALL_SCRIPT) debian/config debian/postinst debian/postrm \ - $(TMP)/DEBIAN - po2debconf debian/templates > $(TMP)/DEBIAN/templates - dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP)/usr/bin/abook - dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars \ - -p$(PKG) -P$(TMP) - cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ - xargs -r0 md5sum > DEBIAN/md5sums - dpkg --build $(TMP) .. - - -binary: binary-indep binary-arch - - -define checkdir - test -f debian/rules -endef - -define checkroot - test root = "`whoami`" -endef - -.PHONY: clean build install binary-indep binary-arch binary +%: + dh $@