Move wrapper script in source package to debian/jabref-wrapper and
authorgregor herrmann <gregoa@debian.org>
Mon, 7 Apr 2008 19:39:42 +0000 (19:39 -0000)
committergregor herrmann <gregoa@debian.org>
Mon, 7 Apr 2008 19:39:42 +0000 (19:39 -0000)
install it from debian/rules.

debian/changelog
debian/install
debian/jabref-wrapper [new file with mode: 0644]
debian/rules
jabref [deleted file]

index 3ac941e..925c445 100644 (file)
@@ -4,6 +4,8 @@ jabref (2.3.1-3) UNRELEASED; urgency=low
     (closes: #389068). Adapt and reactivate patch 02_libs.dpatch, add
     necessary packages to Build-Depends-Indep.
   * debian/watch: add uversionmangle to cope with upstream b(eta) releases.
+  * Move wrapper script in source package to debian/jabref-wrapper and
+    install it from debian/rules.
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 07 Apr 2008 21:37:59 +0200
 
index 1dd0b66..7b7f1ef 100644 (file)
@@ -1,4 +1,3 @@
 build/lib/JabRef-2.3.1.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
@@ -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 "$@"
index 1675913..853a7b8 100755 (executable)
@@ -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 "$@"