[SCM] milkytracker/master: Update changelog and control file.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4f411e4b88cdebe5145b04fa3e6d81e18706f6a8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 8 16:28:39 2011 +0100

    Update changelog and control file.

diff --git a/debian/changelog b/debian/changelog
index 7e2616f..9b8538e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,21 @@ milkytracker (0.90.85~dfsg-1) UNRELEASED; urgency=low
   [ Jonas Smedegaard ]
   * Include CDBS upstream-tarball.mk for get-orig-source target.
   * Add myself as uploader.
-
- -- Jonas Smedegaard <dr at jones.dk>  Sat, 01 Jan 2011 03:37:14 +0100
+  * Relax debhelper compat level to 6: We use no newer features
+    explicitly so this eases backportability.
+    Relax build-dependency on debhelper correspondingly.
+  * Include CDBS utils.mk, for licensing and copyright tracking and
+    inclusion of build-info with binary packages.
+    Build-depend on dh-buildinfo.
+  * Ease building with git-buildpackage:
+    + Git-ignore quilt .pc dir.
+    + Add dpkg-source local-options hints.
+  * Rewrite copyright file using Subversion rev. 153 draft of DEP5.
+
+  [ Alessandro Ghedini ]
+  * Fix *.desktop file installation
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 08 Jan 2011 16:21:47 +0100
 
 milkytracker (0.90.80+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 979ed23..1d97c4b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,9 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Gürkan Sengün <gurkan at phys.ethz.ch>,
  Alessandro Ghedini <al3xbio at gmail.com>,
  Jonas Smedegaard <dr at jones.dk>
-Build-Depends: debhelper (>= 7), 
- cdbs,
+Build-Depends: cdbs,
+ debhelper (>= 6),
+ dh-buildinfo,
  autotools-dev,
  libsdl1.2-dev,
  libjack-dev,

-- 
milkytracker packaging