[pkg-java] r12303 - in trunk/libloader/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2010-05-04 20:59:54 +0000 (Tue, 04 May 2010)
New Revision: 12303

Added:
   trunk/libloader/debian/patches/0001-use-unversioned-jars.patch
   trunk/libloader/debian/patches/0002-switch-to-usr-share-java.patch
   trunk/libloader/debian/patches/0003-switch-to-source-and-target-version-1.3.patch
Removed:
   trunk/libloader/debian/patches/jarnames.diff
   trunk/libloader/debian/patches/libdir.diff
   trunk/libloader/debian/patches/target-source-1.3.diff
Modified:
   trunk/libloader/debian/changelog
   trunk/libloader/debian/patches/series
Log:
Convert patches to dep3 format.

Modified: trunk/libloader/debian/changelog
===================================================================
--- trunk/libloader/debian/changelog	2010-05-04 20:52:09 UTC (rev 12302)
+++ trunk/libloader/debian/changelog	2010-05-04 20:59:54 UTC (rev 12303)
@@ -5,8 +5,9 @@
   * Switch to source format 3.0.
   * Update Standards-Version: 3.8.4.
   * Add Homepage header.
+  * Convert patches to dep3 format.
 
- -- Torsten Werner <twerner at debian.org>  Tue, 04 May 2010 22:51:18 +0200
+ -- Torsten Werner <twerner at debian.org>  Tue, 04 May 2010 22:58:28 +0200
 
 libloader (0.3.6-4) unstable; urgency=low
 

Added: trunk/libloader/debian/patches/0001-use-unversioned-jars.patch
===================================================================
--- trunk/libloader/debian/patches/0001-use-unversioned-jars.patch	                        (rev 0)
+++ trunk/libloader/debian/patches/0001-use-unversioned-jars.patch	2010-05-04 20:59:54 UTC (rev 12303)
@@ -0,0 +1,38 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 4 May 2010 22:55:30 +0200
+Subject: [PATCH] use unversioned jars
+
+---
+ build.properties |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/build.properties b/build.properties
+index 992f639..bcd056f 100644
+--- a/build.properties
++++ b/build.properties
+@@ -36,20 +36,20 @@ manifest-lib-prefix=lib/
+ #  Used libraries ...
+ 
+ # Used by: core libraries
+-jcommon-jar-file=jcommon-1.0.10.jar
++jcommon-jar-file=jcommon.jar
+ 
+ 
+ # Used by: module-cache-oscache, module-cache-ehcache
+-commons-logging-jar-file=optional/commons-logging-1.0.4.jar
++commons-logging-jar-file=commons-logging.jar
+ 
+ # Used by: module-cache-oscache
+ oscache-jar-file=optional/oscache-2.3-compat.jar
+ 
+ # Used by: module-cache-ehcache
+-ehcache-jar-file=optional/ehcache-1.2.4.jar
++ehcache-jar-file=ehcache.jar
+ 
+ # Used by: module-factory-wmf
+-pixie-jar-file=optional/pixie-0.8.9.jar
++pixie-jar-file=pixie.jar
+ 
+ ##############################################################
+ #
+-- 

Added: trunk/libloader/debian/patches/0002-switch-to-usr-share-java.patch
===================================================================
--- trunk/libloader/debian/patches/0002-switch-to-usr-share-java.patch	                        (rev 0)
+++ trunk/libloader/debian/patches/0002-switch-to-usr-share-java.patch	2010-05-04 20:59:54 UTC (rev 12303)
@@ -0,0 +1,22 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 4 May 2010 22:55:30 +0200
+Subject: [PATCH] switch to /usr/share/java
+
+---
+ build.properties |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build.properties b/build.properties
+index bcd056f..44b3b24 100644
+--- a/build.properties
++++ b/build.properties
+@@ -21,7 +21,7 @@ build.retro.jdk=/opt/jdk1.2.2
+ # All path settings are relative to the project root directory
+ # (..)
+ #
+-libdir=lib
++libdir=/usr/share/java
+ junit-dir=lib
+ 
+ #
+-- 

Added: trunk/libloader/debian/patches/0003-switch-to-source-and-target-version-1.3.patch
===================================================================
--- trunk/libloader/debian/patches/0003-switch-to-source-and-target-version-1.3.patch	                        (rev 0)
+++ trunk/libloader/debian/patches/0003-switch-to-source-and-target-version-1.3.patch	2010-05-04 20:59:54 UTC (rev 12303)
@@ -0,0 +1,24 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 4 May 2010 22:55:31 +0200
+Subject: [PATCH] switch to source and target version 1.3
+
+---
+ build.properties |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build.properties b/build.properties
+index 44b3b24..9aac1a8 100644
+--- a/build.properties
++++ b/build.properties
+@@ -14,8 +14,8 @@ build.deprecation=true
+ 
+ #
+ # Make sure that JDK 1.2 compatible class files are generated
+-build.target=1.4
+-build.source=1.2
++build.target=1.3
++build.source=1.3
+ build.retro.jdk=/opt/jdk1.2.2
+ #
+ # All path settings are relative to the project root directory
+-- 

Deleted: trunk/libloader/debian/patches/jarnames.diff
===================================================================
--- trunk/libloader/debian/patches/jarnames.diff	2010-05-04 20:52:09 UTC (rev 12302)
+++ trunk/libloader/debian/patches/jarnames.diff	2010-05-04 20:59:54 UTC (rev 12303)
@@ -1,27 +0,0 @@
---- a/build.properties-old	2007-12-29 19:45:31.000000000 +0100
-+++ a/build.properties	2007-12-29 19:45:58.000000000 +0100
-@@ -36,20 +36,20 @@
- #  Used libraries ...
- 
- # Used by: core libraries
--jcommon-jar-file=jcommon-1.0.10.jar
-+jcommon-jar-file=jcommon.jar
- 
- 
- # Used by: module-cache-oscache, module-cache-ehcache
--commons-logging-jar-file=optional/commons-logging-1.0.4.jar
-+commons-logging-jar-file=commons-logging.jar
- 
- # Used by: module-cache-oscache
- oscache-jar-file=optional/oscache-2.3-compat.jar
- 
- # Used by: module-cache-ehcache
--ehcache-jar-file=optional/ehcache-1.2.4.jar
-+ehcache-jar-file=ehcache.jar
- 
- # Used by: module-factory-wmf
--pixie-jar-file=optional/pixie-0.8.9.jar
-+pixie-jar-file=pixie.jar
- 
- ##############################################################
- #

Deleted: trunk/libloader/debian/patches/libdir.diff
===================================================================
--- trunk/libloader/debian/patches/libdir.diff	2010-05-04 20:52:09 UTC (rev 12302)
+++ trunk/libloader/debian/patches/libdir.diff	2010-05-04 20:59:54 UTC (rev 12303)
@@ -1,11 +0,0 @@
---- ant/uild.properties-old	2007-08-21 00:46:55.000000000 +0200
-+++ ant/build.properties	2007-08-21 00:47:10.000000000 +0200
-@@ -21,7 +21,7 @@
- # All path settings are relative to the project root directory
- # (..)
- #
--libdir=lib
-+libdir=/usr/share/java
- junit-dir=lib
- 
- #

Modified: trunk/libloader/debian/patches/series
===================================================================
--- trunk/libloader/debian/patches/series	2010-05-04 20:52:09 UTC (rev 12302)
+++ trunk/libloader/debian/patches/series	2010-05-04 20:59:54 UTC (rev 12303)
@@ -1,3 +1,3 @@
-jarnames.diff
-libdir.diff
-target-source-1.3.diff
+0001-use-unversioned-jars.patch
+0002-switch-to-usr-share-java.patch
+0003-switch-to-source-and-target-version-1.3.patch

Deleted: trunk/libloader/debian/patches/target-source-1.3.diff
===================================================================
--- trunk/libloader/debian/patches/target-source-1.3.diff	2010-05-04 20:52:09 UTC (rev 12302)
+++ trunk/libloader/debian/patches/target-source-1.3.diff	2010-05-04 20:59:54 UTC (rev 12303)
@@ -1,13 +0,0 @@
---- a/build.properties-old	2007-12-29 19:48:40.000000000 +0100
-+++ a/build.properties	2007-12-29 19:48:49.000000000 +0100
-@@ -14,8 +14,8 @@
- 
- #
- # Make sure that JDK 1.2 compatible class files are generated
--build.target=1.4
--build.source=1.2
-+build.target=1.3
-+build.source=1.3
- build.retro.jdk=/opt/jdk1.2.2
- #
- # All path settings are relative to the project root directory