/[debian]/jabref/branches/2.3/debian/patches/02_libs.dpatch
ViewVC logotype

Diff of /jabref/branches/2.3/debian/patches/02_libs.dpatch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1278 by gregoa, Sat Apr 12 21:57:07 2008 UTC revision 1279 by gregoa, Sun Apr 20 12:30:10 2008 UTC
# Line 1  Line 1 
1  #! /bin/sh /usr/share/dpatch/dpatch-run  #! /bin/sh /usr/share/dpatch/dpatch-run
2  ## 02_libs.dpatch by  <gregor+debian@comodo.priv.at>  ## 02_libs.dpatch by  <gerardo@sophie.gerardo.com.ve>
3  ##  ##
4  ## All lines beginning with `## DP:' are a description of the patch.  ## All lines beginning with `## DP:' are a description of the patch.
5  ## DP: Use debian packages of libraries instead of shipped ones.  ## DP: Use debian libraries and disable unnecesary unjarlib target,
6    
7  @DPATCH@  @DPATCH@
8  diff -urNad jabref-2.3~/build.xml jabref-2.3/build.xml  diff -urNad jabref-2.3.1~/build.xml jabref-2.3.1/build.xml
9  --- jabref-2.3~/build.xml       2008-04-12 23:31:44.000000000 +0200  --- jabref-2.3.1~/build.xml     2008-04-19 04:13:24.000000000 -0430
10  +++ jabref-2.3/build.xml        2008-04-12 23:56:35.000000000 +0200  +++ jabref-2.3.1/build.xml      2008-04-19 04:16:57.000000000 -0430
11  @@ -87,6 +87,7 @@  @@ -86,7 +86,7 @@
12            <property name="layout.dir" value="${src.dir}/resource/layout" />
13    
14          <!-- Set the properties for library directories -->          <!-- Set the properties for library directories -->
15          <property name="library.directory" value="lib" />  -       <property name="library.directory" value="lib" />
16  +       <property name="library.directory.debian" value="/usr/share/java" />  +       <property name="library.directory" value="/usr/share/java" />
17    
18   <!--    <property name="nsis.executable" value="makensis.exe"/> -->   <!--    <property name="nsis.executable" value="makensis.exe"/> -->
19          <property name="nsis.executable.linux" value="makensis"/>          <property name="nsis.executable.linux" value="makensis"/>
20  @@ -112,15 +113,15 @@  @@ -105,22 +105,21 @@
21                    </and>
22            </condition>
23    
24    -       <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
25    -
26    -
27    +<!--   <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
28    +-->
29            <!-- Build classpath -->
30          <path id="classpath">          <path id="classpath">
31                  <pathelement path="${build.classes}" />                  <pathelement path="${build.classes}" />
32                  <pathelement path="${build.dir}" />                  <pathelement path="${build.dir}" />
33  -               <pathelement location="${library.directory}/antlr.jar" />                  <pathelement location="${library.directory}/antlr.jar" />
34  -               <pathelement location="${library.directory}/antlr-3.0b5.jar" />  -               <pathelement location="${library.directory}/antlr-3.0b5.jar" />
35  -               <pathelement location="${library.directory}/looks-2.0.4.jar" />  -               <pathelement location="${library.directory}/looks-2.0.4.jar" />
36  -               <pathelement location="${library.directory}/forms-1.1.0.jar" />  -               <pathelement location="${library.directory}/forms-1.1.0.jar" />
37  -               <pathelement location="${library.directory}/spin.jar" />  +               <pathelement location="${library.directory}/antlr3.jar" />
38    +               <pathelement location="${library.directory}/looks.jar" />
39    +               <pathelement location="${library.directory}/forms.jar" />
40                    <pathelement location="${library.directory}/spin.jar" />
41  -               <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />  -               <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
42  -               <pathelement location="${library.directory}/microba.jar" />  +               <pathelement location="${library.directory}/glazedlists.jar" />
43                    <pathelement location="${library.directory}/microba.jar" />
44  -               <pathelement location="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" />  -               <pathelement location="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" />
45  -               <pathelement location="${library.directory}/JempBox-0.1.0-dev.jar" />  -               <pathelement location="${library.directory}/JempBox-0.1.0-dev.jar" />
46  +               <pathelement location="${library.directory.debian}/antlr.jar" />  +               <pathelement location="${library.directory}/pdfbox.jar" />
47  +               <pathelement location="${library.directory.debian}/antlr3.jar" />  +               <pathelement location="${library.directory}/jempbox.jar" />
 +               <pathelement location="${library.directory.debian}/looks.jar" />  
 +               <pathelement location="${library.directory.debian}/forms.jar" />  
 +               <pathelement location="${library.directory.debian}/spin.jar" />  
 +               <pathelement location="${library.directory.debian}/glazedlists.jar" />  
 +               <pathelement location="${library.directory.debian}/microba.jar" />  
 +               <pathelement location="${library.directory.debian}/pdfbox.jar" />  
 +               <pathelement location="${library.directory.debian}/jempbox.jar" />  
48          </path>          </path>
49    
50          <target name="run" depends="build">          <target name="run" depends="build">
51  @@ -363,15 +364,15 @@  @@ -194,7 +193,8 @@
52          <!-- Unpacks jar needed jar files from lib directory into temp directory. -->          </target>
53          <target name="unjarlib" description="Unpacks jars from library">  
54            <!-- Jars up project -->
55    -       <target name="jars" depends="build, unjarlib">
56    +       <!-- The unjarlib target is not needed, we'll use the jars in the classpath -->
57    +       <target name="jars" depends="build">
58                    <mkdir dir="${build.lib}" />
59                  <mkdir dir="${build.tmp}" />                  <mkdir dir="${build.tmp}" />
60  -               <unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />                  <jar destfile="${build.lib}/${build.jar}">
 -               <unjar src="${library.directory}/antlr-3.0b5.jar" dest="${build.tmp}" />  
 -               <unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" />  
 -               <unjar src="${library.directory}/forms-1.1.0.jar" dest="${build.tmp}" />  
 -               <unjar src="${library.directory}/spin.jar" dest="${build.tmp}" />  
 -               <unjar src="${library.directory}/glazedlists-1.7.0_java15.jar" dest="${build.tmp}" />  
 -               <unjar src="${library.directory}/microba.jar" dest="${build.tmp}" />  
 -               <unjar src="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" dest="${build.tmp}" />  
 -               <unjar src="${library.directory}/JempBox-0.1.0-dev.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/antlr.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/antlr3.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/looks.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/forms.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/spin.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/glazedlists.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/microba.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/pdfbox.jar" dest="${build.tmp}" />  
 +               <unjar src="${library.directory.debian}/jempbox.jar" dest="${build.tmp}" />  
                 <delete dir="${build.tmp}/META-INF" />  
                 <!-- rename the microba license file -->  
                 <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt" />  

Legend:
Removed from v.1278  
changed lines
  Added in v.1279

  ViewVC Help
Powered by ViewVC 1.1.26