Merge branch 'master' into refs/top-bases/debian/locations

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+6

diff --git a/debian/control b/debian/control
index 3fef2654711092c6cc1f18cb75a88b65f0ff2393..35f6761c3f1c919f32d4c466d9ed52400c921103 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: topgit
 Section: devel
 Priority: optional
-Maintainer: martin f. krafft <madduck@debian.org>
-Build-Depends: debhelper (>= 7), quilt
+Maintainer: Debian TopGit maintainers <pkg-topgit@teams.debian.net>
+Uploaders: martin f. krafft <madduck@debian.org>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Build-Depends: debhelper (>= 6), quilt
 Standards-Version: 3.8.0
 Homepage: http://repo.or.cz/w/topgit.git
 Vcs-Git: git://git.debian.org/git/collab-maint/topgit.git

diff --git a/debian/copyright b/debian/copyright
index aa91ee18de7320a7d805dc6d3f946b5572ab333f..38d929b017acd810777052f6c8ff5c26dae7c9b0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,7 +27,7 @@ License:
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License v2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2008, martin f. krafft <madduck@debian.org> and
-is licensed under the GPL, see above.
+The Debian packaging is (C) 2008-9, martin f. krafft <madduck@debian.org> and
+is licensed under the GPLv2, see above.

diff --git a/debian/rules b/debian/rules
index 30f025c92844faef4daf123aa61f7b7a2493d693..712fcae407d14339cd640ece3522c3879259eadf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+TG_BRANCHES="fixes/ensure-worktree debian/locations"
+
 include /usr/share/quilt/quilt.make
 include debian/tg2quilt.mk