[cb2bib] 02/02: changes in the packaging, mainly to transform the debian/rules according to Barak Pearlmutter suggestions.

[Filippo Rusconi]

This is an automated email from the git hooks/post-receive script.

lopippo pushed a commit to branch master
in repository cb2bib.

commit 3512d8fbed1d9194a39fbb42831b63a5389a96ba
Author: Filippo Rusconi (Uploading Debian Developer) <lopippo at debian.org>
Date:   Thu Aug 14 15:46:56 2014 +0200

    changes in the packaging, mainly to transform the debian/rules according to Barak Pearlmutter suggestions.
---
 debian/changelog |  12 ++++++
 debian/control   |   2 +-
 debian/rules     | 112 +++++++------------------------------------------------
 3 files changed, 26 insertions(+), 100 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87d5894..24159ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+cb2bib (1.4.9-3) unstable; urgency=medium
+
+  * Bump up debhelper version required for building to >= 9 in Build-Depends;
+  
+  * Remove dpkg-dev (>= 1.16.1~) from Build-Depends;
+
+  * Got the new recent-debhelper-based rules file from the personal git
+    repos of Barak Pearlmutter (<barak at cs.nuim.ie>) and implemented his
+    version in this package (Bug#633876) closed with the previous upload.
+  
+ -- Filippo Rusconi <lopippo at debian.org>  Thu, 14 Aug 2014 15:45:18 +0200
+
 cb2bib (1.4.9-2) unstable; urgency=low
 
   * Canonicalize the Vcs-Git and Vcs-Browser urls.
diff --git a/debian/control b/debian/control
index d06b83e..63a2863 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: text
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Filippo Rusconi <lopippo at debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1~), libx11-dev, x11proto-core-dev, libqt4-dev (>=4.4), libqtwebkit-dev (>=2.1.0~2011week09), cmake (>=2.6.0), imagemagick
+Build-Depends: debhelper (>= 9), libx11-dev, x11proto-core-dev, libqt4-dev (>=4.4), libqtwebkit-dev (>=2.1.0~2011week09), cmake (>=2.6.0), imagemagick
 Standards-Version: 3.9.5
 Homepage: http://www.molspaces.com/cb2bib/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/cb2bib.git
diff --git a/debian/rules b/debian/rules
index acb91f7..5bb2d92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,113 +1,27 @@
 #!/usr/bin/make -f
-# Based on the initial work of Joey Hess and Craig Small.
 
-# Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-CMAKE=/usr/bin/cmake
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
-
-PACKAGE=cb2bib
-
 BUILDDIR=$(CURDIR)/debian/build
 
+%:
+	dh $@ --parallel
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-         NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-         MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-$(info "---------------------------------------")
-$(info NUMJOBS: $(NUMJOBS))
-$(info MAKEFLAGS: $(MAKEFLAGS))
-$(info DEB_BUILD_OPTIONS: $(DEB_BUILD_OPTIONS))
-$(info "---------------------------------------")
-
-
-.PHONY: clean
-clean: 
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-	rm -rf $(BUILDDIR)
-	rm -f debian/cb2bib.xpm
-
-
-configure-stamp: 
-	dh_testdir
-
+override_dh_auto_configure:
 	mkdir -p $(BUILDDIR)
+	cd $(BUILDDIR) && cmake \
+		-D C2B_USE_LZO=0 \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		../../
 
-	cd $(BUILDDIR)  && $(CMAKE) -DC2B_USE_LZO=0 \
-	-D CMAKE_INSTALL_PREFIX=/usr ../../
-
-	$(MAKE) -C $(BUILDDIR)
-
-	touch configure-stamp
-
-
-build-arch-stamp: configure-stamp 
-	dh_testdir
-	dh_prep -a
-
-	$(MAKE) -C $(BUILDDIR)
+debian/cb2bib.xpm: src/icons/cb2bib.png
 	convert src/icons/cb2bib.png -resize 32x32 debian/cb2bib.xpm
 
-	touch build-arch-stamp
-
-
-.PHONY: build-indep
-build-indep:
-
-
-.PHONY: build-arch
-build-arch: build-arch-stamp
-
-
-.PHONY: build
-build: build-indep build-arch
-
-
-# Build architecture-independent files here.
-.PHONY: binary-indep
-binary-indep: 
-
-
-# Build architecture-dependent files here.
-.PHONY: binary-arch
-binary-arch: build-arch-stamp
-	dh_testdir -a
-	dh_testroot -a
-	dh_lintian -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_install -a
-	dh_installmenu -a cb2bib.menu
-	dh_installman -a
-	dh_link -a usr/share/man/man1/cb2bib.1 usr/share/man/man1/c2bimport.1
-	dh_link -a usr/share/man/man1/cb2bib.1 usr/share/man/man1/c2bciter.1
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-
-.PHONY: binary
-binary: binary-indep binary-arch
+override_dh_auto_build: debian/cb2bib.xpm
+	$(MAKE) -C $(BUILDDIR)
 
+override_dh_clean:
+	dh_clean
+	-rm -r $(BUILDDIR)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cb2bib.git