[osm2pgrouting] 07/24: Use minimal dh rules instead of cdb.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Apr 29 18:47:35 UTC 2016


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

sebastic pushed a commit to branch master
in repository osm2pgrouting.

commit 5f4a3b9ef6bb48dc9889835f5fe9730c32ecbf23
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 19:30:53 2016 +0200

    Use minimal dh rules instead of cdb.
    
    Changes:
    - Enable parallel builds
    - Enable all hardening buildflags
    - Override dh_install to use --list-missing
---
 debian/changelog |  4 ++++
 debian/control   |  1 -
 debian/rules     | 21 ++++++++++-----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0bbb75..4884d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ osm2pgrouting (2.0.0-release-ppa1~trusty2) UNRELEASED; urgency=medium
   * Use optional priority to match pgrouting.
   * Use standalone license paragraph for GPL-2+ in copyright file.
   * Bump debhelper compatibility to 9.
+  * Use minimal dh rules instead of cdbs, changes:
+    - Enable parallel builds
+    - Enable all hardening buildflags
+    - Override dh_install to use --list-missing
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Apr 2016 19:14:15 +0200
 
diff --git a/debian/control b/debian/control
index c3ebb03..a5c8dca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Uploaders: Daniel Kastl <daniel at georepublic.de>
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
                cmake,
                libboost-graph-dev,
                libpq-dev,
diff --git a/debian/rules b/debian/rules
index a235bd8..fee3eeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,15 @@
 #!/usr/bin/make -f
-# ------------------------------------------------------------------------------
-# Debian/Ubuntu packaging
-# Copyright(c) pgRouting Contributors
-#
-# Build rules
-# ------------------------------------------------------------------------------
+# -*- makefile -*-
 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+%:
+	dh $@ --parallel
+
+override_dh_install:
+	dh_install --list-missing
 
-# Build CMake flags
-# ------------------------------------------------------------------------------
-#DEB_CMAKE_NORMAL_ARGS

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



More information about the Pkg-grass-devel mailing list