[SCM] libnova library packaging branch, master, updated. debian/0.12.1-1-30-g6d6aa04

[Pino Toscano]

The following commit has been merged in the master branch:
commit 6d6aa048923f48705ac4efd8f303092db1fb6a60
Author: Pino Toscano <pino at debian.org>
Date:   Sat Nov 19 16:34:32 2011 +0100

    switch from cdbs to the dh sequencer
    
    - drop build dependency on cdbs
    - bump debhelper build dependency to 7.0.50~
    - run the lntest executable in a non-fatal way, as it fails and it is not run as a test by the build system
---
 debian/changelog |    7 +++++--
 debian/control   |    2 +-
 debian/rules     |   12 +++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 610d569..3b49c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,14 +15,17 @@ libnova (0.14.0-0r0) unstable; urgency=low
   * Bump debhelper compatibility level to 7.
   * Update installed files.
   * Update copyright file.
-  * Add /usr/share/cdbs/1/rules/utils.mk to debian/rules to allow us to use
-    debian/rules list-missing.
   * Don't install an uneeded *.la file. (Closes: #621545)
 
   [ Pino Toscano ]
   * Add Vcs-Browser and Vcs-Git headers in control.
   * Small description changes.
   * Bump Standards-Version to 3.9.2.
+  * Switch from cdbs to the dh sequencer:
+    - drop build dependency on cdbs
+    - bump debhelper build dependency to 7.0.50~
+    - run the lntest executable in a non-fatal way, as it fails and it is
+      not run as a test by the build system
 
   [ Sune Vuorela ]
   * Change my email address to the @debian.org one.
diff --git a/debian/control b/debian/control
index d9e3bcd..1d8e986 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libnova
 Section: libs
 Priority: optional
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cdbs, debhelper (>= 7), autotools-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev
 Standards-Version: 3.9.2
 Uploaders: Sune Vuorela <sune at debian.org>
 Homepage: http://libnova.sourceforge.net/
diff --git a/debian/rules b/debian/rules
index ebfdfd1..5a328ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@
+
+override_dh_auto_test:
+	dh_auto_test
+	-lntest/lntest
+
+override_dh_install:
+	dh_install --list-missing -X.la

-- 
libnova library packaging