[Pkg-mongodb-maintainers] [pkg-mongodb] 289/394: rework packaging for short debhelper format

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit e0fd8f4f9d4bdc5658a224ebc3aaa780125b07ab
Author: Laszlo Boszormenyi (GCS) <gcs at debian.org>
Date:   Fri Oct 18 10:39:06 2013 +0200

    rework packaging for short debhelper format
---
 debian/changelog |  1 +
 debian/control   |  4 +---
 debian/rules     | 66 +++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45a6598..abee062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mongodb (1:2.4.6-1) UNRELEASED; urgency=low
     (closes: #701324), thanks to James Page <james.page at ubuntu.com>
   * Fix integer comparision FTBFS with 0010-fix-integer-signs.patch
     (closes: #724100).
+  * Rework packaging with short debhelper format instead of cdbs.
 
  -- Laszlo Boszormenyi (GCS) <gcs at debian.org>  Tue, 24 Sep 2013 12:31:11 +0000
 
diff --git a/debian/control b/debian/control
index ee7d29c..1fbb887 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Antonin Kral <A.Kral at sh.cvut.cz>
 Uploaders: Jérémy Lal <kapouer at melix.org>
 Build-Depends:
- cdbs (>= 0.4.73~),
  debhelper (>= 9),
  libboost-date-time-dev,
  libboost-dev,
@@ -19,8 +18,7 @@ Build-Depends:
  libstemmer-dev,
  libv8-dev,
  python-pymongo,
- scons,
- g++-4.7
+ scons
 Standards-Version: 3.9.4
 Vcs-Git: git://github.com/bobek/mongo-debian.git
 Vcs-Browser: https://github.com/bobek/mongo-debian
diff --git a/debian/rules b/debian/rules
index cbab807..d8f0a70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/scons.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-DEB_DH_INSTALLINIT_ARGS = --name=mongodb
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 DEB_SCONS_OPTIONS :=
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -18,22 +16,42 @@ ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
        DEB_SCONS_OPTIONS += -j$(PROCS)
 endif
 
-
-CC=gcc-4.7
-CXX=g++-4.7
-
-#COMMON_OPTIONS = --use-system-all --cc=gcc-4.7 --cxx=g++-4.7
-COMMON_OPTIONS = --use-system-snappy --use-system-tcmalloc --use-system-pcre --use-system-boost --cc=gcc-4.7 --cxx=g++-4.7
-
-DEB_SCONS_BUILD_TARGET = all
-DEB_SCONS_BUILD_OPTIONS = $(COMMON_OPTIONS)
-DEB_SCONS_INSTALL_OPTIONS += --prefix=$(CURDIR)/debian/tmp/usr --full $(COMMON_OPTIONS)
-DEB_SCONS_CHECK_TARGET = --smokedbprefix=$(CURDIR)/debian/tmp-test smoke $(COMMON_OPTIONS)
-
-clean::
-	find . -name "*.pyc" -delete
-	rm -f buildinfo.cpp
-	rm -rf debian/tmp-test
-	rm -rf .scons
-	rm -rf build
-
+HARDENING_OPTIONS = CC="$(CC)" CFLAGS="$(CFLAGS)" \
+  CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"
+COMMON_OPTIONS = --use-system-snappy --use-system-tcmalloc --use-system-pcre \
+  --use-system-boost --use-system-v8 $(DEB_SCONS_OPTIONS)
+
+DEB_SCONS_CLEAN = --directory="." $(HARDENING_OPTIONS) . --keep-going --clean \
+  $(COMMON_OPTIONS)
+DEB_SCONS_BUILD = --directory="." $(HARDENING_OPTIONS) all $(COMMON_OPTIONS)
+DEB_SCONS_CHECK = --smokedbprefix=$(CURDIR)/debian/tmp-test smoke \
+  $(COMMON_OPTIONS)
+DEB_SCONS_INSTALL = --directory="." $(HARDENING_OPTIONS) \
+  --prefix=$(CURDIR)/debian/tmp/usr install --full $(COMMON_OPTIONS)
+
+override_dh_clean:
+	scons $(DEB_SCONS_CLEAN)
+	find $(CURDIR)/ -name "*.pyc" -delete
+	rm -rf $(CURDIR)/debian/tmp-test/
+	rm -rf $(CURDIR)/.scons/
+	rm -rf $(CURDIR)/build/
+	rm -f $(CURDIR)/failfile.smoke $(CURDIR)/smoke-last.json
+	dh_clean
+
+override_dh_auto_build:
+	scons $(DEB_SCONS_BUILD)
+
+override_dh_auto_test:
+	scons $(DEB_SCONS_CHECK)
+
+override_dh_auto_install:
+	scons $(DEB_SCONS_INSTALL)
+
+override_dh_installinit:
+	dh_installinit -pmongodb-server --name=mongodb
+
+%:
+	dh $@ --parallel
+
+.PHONY: override_dh_clean override_dh_auto_build override_dh_auto_test \
+	override_dh_auto_install override_dh_installinit

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git