[libxbean-java] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 10 08:18:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxbean-java.
commit 6c527a7513b102dd7528010d1cd8c77a2596e875
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Nov 28 22:52:40 2015 +0100
Refreshed the patches
---
debian/changelog | 8 ++++++++
debian/patches/bootstrap.diff | 31 +++++++++++++------------------
debian/patches/bundle.diff | 6 +++---
3 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 27e7254..694575d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxbean-java (4.5-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 28 Nov 2015 22:42:06 +0100
+
libxbean-java (4.4-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/bootstrap.diff b/debian/patches/bootstrap.diff
index e376cb3..21cc069 100644
--- a/debian/patches/bootstrap.diff
+++ b/debian/patches/bootstrap.diff
@@ -5,27 +5,22 @@ Last-Update: 2011-07-19
Forwarded: not-needed
--- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
+++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
-@@ -30,11 +30,11 @@
- import java.util.WeakHashMap;
- import java.util.Arrays;
+@@ -17,12 +17,12 @@
+ */
+ package org.apache.xbean.recipe;
--import org.apache.xbean.asm.ClassReader;
--import org.apache.xbean.asm.Label;
--import org.apache.xbean.asm.MethodVisitor;
--import org.apache.xbean.asm.Type;
--import org.apache.xbean.asm.commons.EmptyVisitor;
+-import org.apache.xbean.asm5.ClassReader;
+-import org.apache.xbean.asm5.ClassVisitor;
+-import org.apache.xbean.asm5.Label;
+-import org.apache.xbean.asm5.MethodVisitor;
+-import org.apache.xbean.asm5.Opcodes;
+-import org.apache.xbean.asm5.Type;
+import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- /**
- * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the
-@@ -302,4 +302,4 @@
- return null;
- }
- }
--}
-\ No newline at end of file
-+}
+ import java.io.IOException;
+ import java.io.InputStream;
diff --git a/debian/patches/bundle.diff b/debian/patches/bundle.diff
index 66ec9f4..a9e5fa7 100644
--- a/debian/patches/bundle.diff
+++ b/debian/patches/bundle.diff
@@ -39,7 +39,7 @@ Forwarded: not-needed
--- a/xbean-finder/pom.xml
+++ b/xbean-finder/pom.xml
@@ -28,7 +28,7 @@
- <version>4.0</version>
+ <version>4.5</version>
</parent>
<artifactId>xbean-finder</artifactId>
- <packaging>bundle</packaging>
@@ -50,7 +50,7 @@ Forwarded: not-needed
--- a/xbean-asm5-shaded/pom.xml
+++ b/xbean-asm5-shaded/pom.xml
@@ -28,7 +28,7 @@
- <version>4.0</version>
+ <version>4.5</version>
</parent>
<artifactId>xbean-asm5-shaded</artifactId>
- <packaging>bundle</packaging>
@@ -105,7 +105,7 @@ Forwarded: not-needed
--- a/xbean-reflect/pom.xml
+++ b/xbean-reflect/pom.xml
@@ -28,7 +28,7 @@
- <version>4.0</version>
+ <version>4.5</version>
</parent>
<artifactId>xbean-reflect</artifactId>
- <packaging>bundle</packaging>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxbean-java.git
More information about the pkg-java-commits
mailing list