* Changed order of Build-Depend-Indep.
authorgregor herrmann <gregoa@debian.org>
Wed, 7 Jun 2006 16:02:09 +0000 (16:02 -0000)
committergregor herrmann <gregoa@debian.org>
Wed, 7 Jun 2006 16:02:09 +0000 (16:02 -0000)
* Cleaned up debian/rules.
* Move dh_ calls in debian/rules to binary-indep target.
* Add lintian override (upstream tarball has .cvsignore stuff).

debian/changelog
debian/control
debian/rules
debian/source.lintian-overrides [new file with mode: 0644]

index 7c45901..be1ab1e 100644 (file)
@@ -1,3 +1,12 @@
+jabref (2.0.1+2.1b-3) unstable; urgency=low
+
+  * Changed order of Build-Depend-Indep.
+  * Cleaned up debian/rules.
+  * Move dh_ calls in debian/rules to binary-indep target.
+  * Add lintian override (upstream tarball has .cvsignore stuff).
+
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Wed,  7 Jun 2006 18:01:06 +0200
+
 jabref (2.0.1+2.1b-2) unstable; urgency=low
 
   * Change dependencies to include several versions of the Sun JRE/JDK.
 jabref (2.0.1+2.1b-2) unstable; urgency=low
 
   * Change dependencies to include several versions of the Sun JRE/JDK.
index 65d3272..5b75a93 100644 (file)
@@ -3,7 +3,7 @@ Section: contrib/tex
 Priority: optional
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Build-Depends: debhelper (>= 5.0.0)
 Priority: optional
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: ant, sun-java5-jdk | j2sdk1.4 | j2sdk1.5 | sun-j2sdk1.5
+Build-Depends-Indep: sun-java5-jdk | j2sdk1.4 | j2sdk1.5 | sun-j2sdk1.5, ant
 Standards-Version: 3.7.2
 
 Package: jabref
 Standards-Version: 3.7.2
 
 Package: jabref
index a6343b2..9a9a226 100755 (executable)
@@ -12,8 +12,6 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # Add here commands to configure the package.
-
        touch configure-stamp
 
 
        touch configure-stamp
 
 
@@ -21,9 +19,6 @@ build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
 
 build-stamp: configure-stamp 
        dh_testdir
-
-       # Add here commands to compile the package.
-       #$(MAKE)
        ant compile unjarlib jars
 
        touch build-stamp
        ant compile unjarlib jars
 
        touch build-stamp
@@ -32,11 +27,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-
-       # Add here commands to clean up after the build process.
-       #-$(MAKE) clean
-       -rm -r build
-
+       if [ -d build ] ; then rm -r build; fi
        dh_clean 
 
 install: build
        dh_clean 
 
 install: build
@@ -45,16 +36,8 @@ install: build
        dh_clean -k 
        dh_installdirs
 
        dh_clean -k 
        dh_installdirs
 
-       # Add here commands to install the package into debian/jabref.
-       #$(MAKE) install DESTDIR=$(CURDIR)/debian/jabref
-
-
 # Build architecture-independent files here.
 binary-indep: build install
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs 
        dh_testdir
        dh_testroot
        dh_installchangelogs 
@@ -84,5 +67,9 @@ binary-arch: build install
        dh_md5sums
        dh_builddeb
 
        dh_md5sums
        dh_builddeb
 
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do.
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644 (file)
index 0000000..845a090
--- /dev/null
@@ -0,0 +1 @@
+jabref source: cvsignore-file-in-source