Switch to debhelper

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..bc1c7ad
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+build:
+
+install:
+       install -d -m 755 $(DESTDIR)/usr/sbin
+       install -m755 upgrade-porter-chroots $(DESTDIR)/usr/sbin
+       install -m755 apache2-vhost-update $(DESTDIR)/usr/sbin

diff --git a/debian/changelog b/debian/changelog
index cef6164bdecf34770c1b51edaea1cd181a5ef40d..f881ea09859689f66174b177780bc824c1b149f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ debian.org (14) stable; urgency=low
   * upgrade-porter-chroots: Print which chroot we're working on.
   * Add debian.org-recommended meta package.
   * Remove neuro from Uploaders.
+  * Switch to debhelper.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 21 Jun 2009 14:14:24 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sun, 21 Jun 2009 14:33:01 +0200
 
 debian.org (13) stable; urgency=low
 

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

diff --git a/debian/control b/debian/control
index d00135ad4a277e5be9158dbd73b6e5ed6516eb4e..2aa8efb356a48542059cbdd57d903571159dc755 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
 Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
+Build-Depends: debhelper (>= 7)
 Standards-Version: 3.7.2
 
 Package: debian.org

diff --git a/debian/debian.org.install b/debian/debian.org.install
new file mode 100644 (file)
index 0000000..73752c9
--- /dev/null
+++ b/debian/debian.org.install
@@ -0,0 +1 @@
+usr

diff --git a/debian/rules b/debian/rules
index 8c27fe3949ce60a346ef4428389bba6052d48156..cbe925d7587131c8ec8761915930894c60c096fd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,3 @@
 #!/usr/bin/make -f
-
-build:
-
-clean:
-       rm -rf debian/tmp
-       rm -f debian/files
-
-binary-indep:
-       $(RM) -r debian/tmp
-
-       install -d debian/tmp/DEBIAN debian/tmp/usr/sbin
-       install -d debian/tmp/DEBIAN debian/tmp/usr/share/doc/debian.org
-       chown -R root.root debian/tmp
-       chmod -R g-ws debian/tmp
-       install -m755 upgrade-porter-chroots debian/tmp/usr/sbin
-       install -m755 apache2-vhost-update debian/tmp/usr/sbin
-       install -m644 debian/copyright debian/tmp/usr/share/doc/debian.org/
-       install -m644 debian/changelog debian/tmp/usr/share/doc/debian.org/changelog
-       gzip -9f debian/tmp/usr/share/doc/debian.org/changelog
-
-       (cd debian/tmp && find etc -type f | sed -e 's#^#/#') > debian/tmp/DEBIAN/conffiles
-
-       dpkg-gencontrol -isp -pdebian.org
-       dpkg --build debian/tmp ..
-
-binary-arch:
-
-binary: binary-indep
+%:
+       dh $@