Merge remote-tracking branch 'origin/pr/157'

diff --git a/debian/changelog b/debian/changelog
index 3b8b099..81cd810 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1347,4 +1347,3 @@ grml-debootstrap (0.1) unstable; urgency=low
   * Initial release.
 
  -- Michael Prokop <mika@grml.org>  Fri,  3 Nov 2006 01:10:52 +0100
-

diff --git a/debian/control b/debian/control
index 2909fb1..c03ac61 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,19 @@ Maintainer: Grml Team <team@grml.org>
 Uploaders:
  Michael Prokop <mika@debian.org>,
  Alexander Wirt <formorer@debian.org>,
- Christian Hofstaedtler <zeha@debian.org>,
+ Chris Hofstaedtler <zeha@debian.org>,
  Ulrich Dangel <mru@spamt.net>,
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
 Build-Depends-Indep:
  asciidoc,
  docbook-xsl,
  shunit2,
  xsltproc,
 Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Homepage: https://grml.org/grml-debootstrap/
-Vcs-git: git://git.grml.org/grml-debootstrap.git
+Vcs-Git: git://git.grml.org/grml-debootstrap.git
 Vcs-Browser: https://git.grml.org/?p=grml-debootstrap.git
 
 Package: grml-debootstrap

diff --git a/debian/rules b/debian/rules
index 17ee334..a282136 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1