debhelper knows about qmake; bump required version in debian/control,

adjust debian/rules.

diff --git a/debian/changelog b/debian/changelog
index bed22a609ecabf6ff3a77781eac8d4fd7911465c..6a884f04bf49ea73bd874587c89eb870d5d593b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ fosdem-schedule (0.4.1+ds-1) UNRELEASED; urgency=low
   * debian/copyright: add third party files.
   * Switch to source format 3.0 (quilt).
   * Set Standards-Version to 3.9.1 (no changes).
+  * debhelper knows about qmake; bump required version in debian/control,
+    adjust debian/rules.
 
  -- gregor herrmann <gregoa@debian.org>  Fri, 05 Mar 2010 01:06:29 +0100
 

diff --git a/debian/control b/debian/control
index 4ff5ff2c03de550e969d11c3792e6e56e7b29037..e40d1150d74113bb79cbcc6b93b2cf1ff0d91330 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fosdem-schedule
 Section: utils
 Priority: extra
 Maintainer: gregor herrmann <gregoa@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), imagemagick,
+Build-Depends: debhelper (>= 7.4.12~), imagemagick,
  libqt4-dev (>= 4:4.5), libqt4-sql-sqlite (>= 4:4.5)
 Standards-Version: 3.9.1
 Homepage: http://sourceforge.net/projects/fosdem-maemo/

diff --git a/debian/rules b/debian/rules
index 060a7666ed82f205e081bb8e284144dde964b9c9..f50515751ee136c12422db59e8111fbffea1bc43 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,13 @@ SQLITE  = $(shell dpkg-query --show --showformat='$${Version}\n' libqt4-sql-sqli
 %:
        dh $@
 
-override_dh_auto_configure:
-       qmake
+override_dh_auto_build:
+       dh_auto_build
        pod2man debian/$(PACKAGE).pod > debian/$(PACKAGE).1
        convert -geometry 32x32 ./data/64x64/fosdem.png debian/fosdem-schedule.xpm
 
-override_dh_auto_install:
-       INSTALL_ROOT=$(TMP) dh_auto_install
+override_dh_auto_test:
+       # broken in data, does nothing in src
 
 override_dh_installchangelogs:
        dh_installchangelogs NEWS