Move wrapper script in source package to debian/jabref-wrapper and

  install it from debian/rules.

diff --git a/debian/changelog b/debian/changelog
index acb65b9..ccb07d6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ jabref (2.4~beta1-1) UNRELEASED; urgency=low
   * Refresh patch 01_free_javac.
   * Add new patch 05_PrintStream_File, PrintStream(File) is undefined in
     gcj.
+  * Move wrapper script in source package to debian/jabref-wrapper and
+    install it from debian/rules.
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Sun, 16 Mar 2008 17:04:16 +0100
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Sun, 16 Mar 2008 17:23:50 +0100
 
 jabref (2.3.1-2) unstable; urgency=low
 

diff --git a/debian/install b/debian/install
index 6592fcc..cde0c70 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,3 @@
 build/lib/JabRef-2.4b.jar usr/share/java
-jabref usr/bin
 build/*.xpm usr/share/pixmaps
 debian/jabref.desktop usr/share/applications

diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
new file mode 100644 (file)
index 0000000..8f8c305
--- /dev/null
+++ b/debian/jabref-wrapper
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# jabref wrapper script
+# code for java detection borrowed from tuxguitar
+
+if [ -z "$JAVA_HOME" ] ; then
+       t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
+       t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
+       t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
+       test -n "$JAVA_HOME" && JAVA=${JAVA_HOME}/jre/bin/java
+fi
+
+export JAVA=${JAVA:=java}
+
+exec $JAVA -jar /usr/share/java/jabref.jar "$@"

diff --git a/debian/rules b/debian/rules
index f401a52..ddf2d46 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ install-stamp: build-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
+       install -m 755 debian/jabref-wrapper $(CURDIR)/debian/jabref/usr/bin/jabref
        touch install-stamp
                                                         
 # Build architecture-independent files here.

diff --git a/jabref b/jabref
deleted file mode 100644 (file)
index 8f8c305..0000000
--- a/jabref
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# jabref wrapper script
-# code for java detection borrowed from tuxguitar
-
-if [ -z "$JAVA_HOME" ] ; then
-       t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
-       t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
-       t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
-       test -n "$JAVA_HOME" && JAVA=${JAVA_HOME}/jre/bin/java
-fi
-
-export JAVA=${JAVA:=java}
-
-exec $JAVA -jar /usr/share/java/jabref.jar "$@"