[knopflerfish-osgi] 06/12: Refreshed the patches

[Emmanuel Bourg]

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

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

commit 893d46d9a9d4d28166489e20a8d5e7f430f81003
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 15:38:41 2016 +0200

    Refreshed the patches
---
 debian/changelog                      | 4 +++-
 debian/patches/10_build_asm.patch     | 4 ++--
 debian/patches/20_versioned_jar.patch | 4 ++--
 debian/patches/30_fix_jar_build.patch | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d158e38..2e95a03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-knopflerfish-osgi (5.1.0+dfsg1-4) UNRELEASED; urgency=medium
+knopflerfish-osgi (5.2.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
diff --git a/debian/patches/10_build_asm.patch b/debian/patches/10_build_asm.patch
index d703652..fab981b 100644
--- a/debian/patches/10_build_asm.patch
+++ b/debian/patches/10_build_asm.patch
@@ -3,7 +3,7 @@ Author: Felix Natter <fnatter at gmx.net>
 Forwarded: not-needed
 --- a/osgi/framework/build.xml
 +++ b/osgi/framework/build.xml
-@@ -81,7 +81,7 @@
+@@ -83,7 +83,7 @@
  
    <path id="compile.path">
      <pathelement location="${topdir}/framework/resources"/>
@@ -11,4 +11,4 @@ Forwarded: not-needed
 +    <pathelement location="/usr/share/java/asm.jar"/>
    </path>
  
-   <path id="empty.path">
+   <path id="android.system.path">
diff --git a/debian/patches/20_versioned_jar.patch b/debian/patches/20_versioned_jar.patch
index c1aa092..f3cf337 100644
--- a/debian/patches/20_versioned_jar.patch
+++ b/debian/patches/20_versioned_jar.patch
@@ -5,11 +5,11 @@ 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="fw.impl.version"   value="7.2.0"/>
  
    <property name="jarfile"
 -            location="${topdir}/${ant.project.name}.jar"/>
-+            location="${topdir}/${ant.project.name}-5.1.0.jar"/>
++            location="${topdir}/${ant.project.name}-5.2.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
index 405919a..c2c6274 100644
--- a/debian/patches/30_fix_jar_build.patch
+++ b/debian/patches/30_fix_jar_build.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 Last-Update: 2015-02-21
 --- a/osgi/framework/build.xml
 +++ b/osgi/framework/build.xml
-@@ -159,7 +159,7 @@
+@@ -194,7 +194,7 @@
      </javac>
    </target>
  

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