Merge changelog, packaging changes

4 files changed, 20 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index f92f845..46f394a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
 lfhex (0.42-1) UNRELEASED; urgency=low
 
-  * New upstream release.
   * Acknowledge NMU.
+  * New upstream release.
+  * Replaced obsolete dh_clean -k with dh_prep in rules.
+  * Added Vcs-Git and Vcs-Browser fields to control.
+  * Updated debhelper compatibility level from 6 to 7.
+  * Updated maintainer email address.
+
+ -- Tobias Klauser <tklauser@distanz.ch>  Sat, 03 Jan 2009 11:34:04 +0100
+
+lfhex (0.4-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules:
+    Call qmake-qt4, not qmake (Closes: #500380)
 
- -- Tobias Klauser <tklauser@access.unizh.ch>  Wed, 08 Oct 2008 19:27:26 +0200
+ -- Evgeni Golov <sargentd@die-welt.net>  Sat, 04 Oct 2008 12:29:05 +0200
 
 lfhex (0.4-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index b314829..14a38e0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,12 @@
 Source: lfhex
 Section: editors
 Priority: optional
-Maintainer: Tobias Klauser <tklauser@access.unizh.ch>
-Build-Depends: debhelper (>= 6), dpatch, libqt4-dev, flex, bison
+Maintainer: Tobias Klauser <tklauser@distanz.ch>
+Build-Depends: debhelper (>= 7), dpatch, libqt4-dev, flex, bison
 Standards-Version: 3.8.0
 Homepage: http://stoopidsimple.com/lfhex
+Vcs-Git: http://git.distanz.ch/scm/debian/pkg-lfhex.git
+Vcs-Browser: http://git.distanz.ch/?p=debian/pkg-lfhex.git
 
 Package: lfhex
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 0a474b9..9893545 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Do a manual install, qmake does not correctly generate an install