rearrange the debian/rules file

diff --git a/debian/changelog b/debian/changelog
index ae77331bec9e0cbed42dca75fe2b008454b42d26..658b7669a01868fa8ac7c84d275613f2eea2e3ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ midori (0.1.6-2) UNRELEASED; urgency=low
 
   * adopt package: set myself as maintainer, remove uploaders, remove dm
     flag (Closes: #528731)
+  * rearrange the debian/rules file
 
- -- Ryan Niebur <ryanryan52@gmail.com>  Thu, 14 May 2009 21:24:27 -0700
+ -- Ryan Niebur <ryanryan52@gmail.com>  Thu, 14 May 2009 22:14:14 -0700
 
 midori (0.1.6-1) experimental; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 7cda46c8f3a4b70e79f4baa32a2ec8c75251d0ae..6b4388e321f8abb522d00f958e95c554543c4d4f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,30 @@
 #!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
 %:
        dh $@
 
-# http://bugs.debian.org/499225
+clean: unpatch
+
+build binary-arch: patch
+
 override_dh_auto_clean:
        ./waf --nocache distclean
-# Upstream doesn't clean up after "./waf check".
        rm -rf _build_
+
 override_dh_auto_configure:
        ./waf --nocache configure --prefix /usr
+
 override_dh_auto_build:
        ./waf --nocache build --debug full
+
 override_dh_auto_test:
        ./waf --nocache check
+
 override_dh_auto_install:
        ./waf --nocache install --destdir debian/tmp
-# By deleting these two unnecessary files here, midori.install can
-# just say "install everything from /usr" instead of having to list
-# all the other files.
-       rm -f debian/tmp/usr/share/doc/midori/COPYING
-       rm -f debian/tmp/usr/share/doc/midori/TRANSLATE
+       rm -f debian/tmp/usr/share/doc/midori/COPYING debian/tmp/usr/share/doc/midori/TRANSLATE
 
-override_dh_strip:              # http://bugs.debian.org/510772
+override_dh_strip:
        dh_strip --dbg-package=midori-dbg
-
-## While we wait for the Debian archive to support 3.0 (quilt).
-ifeq (,$(wildcard debian/source/format))
-include /usr/share/quilt/quilt.make
-clean: unpatch
-build binary-arch: patch
-endif