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

Contents of /jabref/branches/2.5/debian/patches/02_libs.dpatch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1698 - (show annotations)
Fri Apr 24 16:17:40 2009 UTC (12 years, 3 months ago) by gregoa
File size: 4341 byte(s)
rename 2.4 branch to 2.5
1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 02_libs.dpatch by <gregor+debian@comodo.priv.at>
3 ##
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Use debian packages of libraries instead of shipped ones.
6
7 @DPATCH@
8 diff -urNad jabref~/build.xml jabref/build.xml
9 --- jabref~/build.xml 2007-10-01 00:34:10.000000000 +0200
10 +++ jabref/build.xml 2007-10-01 22:10:26.000000000 +0200
11 @@ -87,6 +87,7 @@
12
13 <!-- Set the properties for library directories -->
14 <property name="library.directory" value="lib" />
15 + <property name="library.directory.debian" value="/usr/share/java" />
16
17 <!-- <property name="nsis.executable" value="makensis.exe"/> -->
18
19 @@ -111,15 +112,14 @@
20 <path id="classpath">
21 <pathelement path="${build.classes}" />
22 <pathelement path="${build.dir}" />
23 - <pathelement location="${library.directory}/antlr.jar" />
24 - <pathelement location="${library.directory}/antlr-3.0b5.jar" />
25 - <pathelement location="${library.directory}/looks-2.0.4.jar" />
26 - <pathelement location="${library.directory}/forms-1.0.4.jar" />
27 - <pathelement location="${library.directory}/spin.jar" />
28 - <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
29 - <pathelement location="${library.directory}/microba.jar" />
30 - <pathelement location="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" />
31 - <pathelement location="${library.directory}/JempBox-0.1.0-dev.jar" />
32 + <pathelement location="${library.directory.debian}/antlr.jar" />
33 + <pathelement location="${library.directory.debian}/looks.jar" />
34 + <pathelement location="${library.directory.debian}/forms.jar" />
35 + <pathelement location="${library.directory.debian}/spin.jar" />
36 + <pathelement location="${library.directory.debian}/glazedlists.jar" />
37 + <pathelement location="${library.directory.debian}/microba.jar" />
38 + <pathelement location="${library.directory.debian}/pdfbox.jar" />
39 + <pathelement location="${library.directory.debian}/jempbox.jar" />
40 </path>
41
42 <target name="run" depends="build">
43 @@ -356,15 +356,14 @@
44 <!-- Unpacks jar needed jar files from lib directory into temp directory. -->
45 <target name="unjarlib" description="Unpacks jars from library">
46 <mkdir dir="${build.tmp}" />
47 - <unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
48 - <unjar src="${library.directory}/antlr-3.0b5.jar" dest="${build.tmp}" />
49 - <unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" />
50 - <unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" />
51 - <unjar src="${library.directory}/spin.jar" dest="${build.tmp}" />
52 - <unjar src="${library.directory}/glazedlists-1.7.0_java15.jar" dest="${build.tmp}" />
53 - <unjar src="${library.directory}/microba.jar" dest="${build.tmp}" />
54 - <unjar src="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" dest="${build.tmp}" />
55 - <unjar src="${library.directory}/JempBox-0.1.0-dev.jar" dest="${build.tmp}" />
56 + <unjar src="${library.directory.debian}/antlr.jar" dest="${build.tmp}" />
57 + <unjar src="${library.directory.debian}/looks" dest="${build.tmp}" />
58 + <unjar src="${library.directory.debian}/forms" dest="${build.tmp}" />
59 + <unjar src="${library.directory.debian}/spin.jar" dest="${build.tmp}" />
60 + <unjar src="${library.directory.debian}/glazedlists.jar" dest="${build.tmp}" />
61 + <unjar src="${library.directory.debian}/microba.jar" dest="${build.tmp}" />
62 + <unjar src="${library.directory.debian}/pdfbox.jar" dest="${build.tmp}" />
63 + <unjar src="${library.directory.debian}/jempbox.jar" dest="${build.tmp}" />
64 <delete dir="${build.tmp}/META-INF" />
65 <!-- rename the microba license file -->
66 <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt" />
67 diff -urNad jabref~/src/java/net/sf/jabref/EntryEditorTab.java jabref/src/java/net/sf/jabref/EntryEditorTab.java
68 --- jabref~/src/java/net/sf/jabref/EntryEditorTab.java 2007-08-29 22:33:52.000000000 +0200
69 +++ jabref/src/java/net/sf/jabref/EntryEditorTab.java 2007-10-01 22:10:47.000000000 +0200
70 @@ -133,7 +133,7 @@
71 String rowSpec = sb.toString();
72
73 DefaultFormBuilder builder = new DefaultFormBuilder
74 - (panel, new FormLayout(colSpec, rowSpec));
75 + (new FormLayout(colSpec, rowSpec), panel);
76
77 for (int i = 0; i < fields.length; i++) {
78 // Create the text area:

Properties

Name Value
svn:executable *

  ViewVC Help
Powered by ViewVC 1.1.26