debian/rules: re-arrange targets and their dependencies.

diff --git a/debian/changelog b/debian/changelog
index ab6c137..4fac31d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jabref (2.3-2) UNRELEASED; urgency=low
     Debian yet but helps Ubuntu users.
   * Reformat wrapper script.
   * TODO: add dependency on icedtea-java7-jre (not yet in Debian).
+  * debian/rules: re-arrange targets and their dependencies.
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 16 Nov 2007 18:00:07 +0100
 

diff --git a/debian/rules b/debian/rules
index 05ace81..e69b2de 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,31 +12,32 @@
 include /usr/share/dpatch/dpatch.make
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
        dh_testdir
        touch configure-stamp
 
-build: build-stamp patch
+build: build-stamp
+build-stamp: configure-stamp
+       dh_testdir
        ant jars
        convert -geometry 32x32 src/images/JabRef-icon-48.png build/jabref32.xpm
        convert -geometry 16x16 src/images/JabRef-icon-48.png build/jabref16.xpm
-
-build-stamp: configure-stamp 
-       dh_testdir
        touch build-stamp
 
 clean: unpatch
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
+       rm -f *-stamp
        ant clean
        dh_clean 
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
        dh_testdir
        dh_testroot
        dh_clean 
        dh_installdirs
+       touch install-stamp
                                                         
 # Build architecture-independent files here.
 binary-indep: build install