[knopflerfish-osgi] 04/13: adapt patches for 5.1.0

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit c75defef2538630f0f3519b86d547528be476631
Author: Felix Natter <fnatter at gmx.net>
Date:   Tue Mar 3 19:33:13 2015 +0100

    adapt patches for 5.1.0
---
 debian/patches/10_build_asm.patch     | 21 ++++++++++++---------
 debian/patches/20_versioned_jar.patch | 25 ++++++++++++++-----------
 debian/patches/30_fix_jar_build.patch | 15 +++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/debian/patches/10_build_asm.patch b/debian/patches/10_build_asm.patch
index b10ed90..9249121 100644
--- a/debian/patches/10_build_asm.patch
+++ b/debian/patches/10_build_asm.patch
@@ -1,12 +1,15 @@
-diff -Nur -x '*.orig' -x '*~' knopflerfish_osgi_2.3.3/knopflerfish.org/osgi/framework/build.xml knopflerfish_osgi_2.3.3.new/knopflerfish.org/osgi/framework/build.xml
---- knopflerfish_osgi_2.3.3/knopflerfish.org/osgi/framework/build.xml	2009-09-11 14:14:08.000000000 +0200
-+++ knopflerfish_osgi_2.3.3.new/knopflerfish.org/osgi/framework/build.xml	2010-02-13 22:08:31.000000000 +0100
-@@ -23,7 +23,7 @@
+Description: Use Debian's version of asm3
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2015-02-21
+--- a/osgi/framework/build.xml
++++ b/osgi/framework/build.xml
+@@ -81,7 +81,7 @@
  
-   <path id = "compile.path">
-    <pathelement location="${topdir}/framework/resources"/>
--   <pathelement location="libs/asm-3.1.jar"/>
-+   <pathelement location="/usr/share/java/asm3.jar"/>
+   <path id="compile.path">
+     <pathelement location="${topdir}/framework/resources"/>
+-    <pathelement location="libs/asm-3.2.jar"/>
++    <pathelement location="/usr/share/java/asm3.jar"/>
    </path>
  
-   <!-- targets -->
+   <path id="empty.path">
diff --git a/debian/patches/20_versioned_jar.patch b/debian/patches/20_versioned_jar.patch
index ec6f45c..c1aa092 100644
--- a/debian/patches/20_versioned_jar.patch
+++ b/debian/patches/20_versioned_jar.patch
@@ -1,12 +1,15 @@
-diff -Nur -x '*.orig' -x '*~' knopflerfish_osgi_2.3.3//knopflerfish.org/osgi/framework/build.xml knopflerfish_osgi_2.3.3.new//knopflerfish.org/osgi/framework/build.xml
---- knopflerfish_osgi_2.3.3//knopflerfish.org/osgi/framework/build.xml	2010-02-28 17:08:37.000000000 +0100
-+++ knopflerfish_osgi_2.3.3.new//knopflerfish.org/osgi/framework/build.xml	2010-02-28 17:19:37.000000000 +0100
-@@ -12,7 +12,7 @@
-   <property name="classout"      location="${outdir}/classes"/>
-   <property name="docdir"        location="${ant.project.name}/apidoc"/>
+Description: Generate a versioned jar
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2015-02-21
+--- a/osgi/framework/build.xml
++++ b/osgi/framework/build.xml
+@@ -21,7 +21,7 @@
+   <property name="fw.impl.version"   value="7.1.2"/>
  
--  <property name="jarfile"       location="${topdir}/${ant.project.name}.jar"/>
-+  <property name="jarfile"       location="${topdir}/${ant.project.name}-2.3.3.jar"/>
- 
-   <property name = "javac.target"    value="1.1"/>
-   <property name = "javac.source"    value="1.2"/>
+   <property name="jarfile"
+-            location="${topdir}/${ant.project.name}.jar"/>
++            location="${topdir}/${ant.project.name}-5.1.0.jar"/>
+   <property name="jarfile_compact"
+             location="${topdir}/${ant.project.name}_compact.jar"/>
+   <property name="source.jarfile"
diff --git a/debian/patches/30_fix_jar_build.patch b/debian/patches/30_fix_jar_build.patch
new file mode 100644
index 0000000..405919a
--- /dev/null
+++ b/debian/patches/30_fix_jar_build.patch
@@ -0,0 +1,15 @@
+Description: Remove dependency on genexports in jar ant task
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2015-02-21
+--- a/osgi/framework/build.xml
++++ b/osgi/framework/build.xml
+@@ -159,7 +159,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="jar" depends="compile,genexports" description="build jar">
++  <target name="jar" depends="compile" description="build jar">
+     <tstamp>
+       <format property="framework.tstamp"
+               pattern="'Build' EE MMMM d yyyy, HH:mm:ss"
diff --git a/debian/patches/series b/debian/patches/series
index 5a5c621..54dfea6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_build_asm.patch
 20_versioned_jar.patch
+30_fix_jar_build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/knopflerfish-osgi.git