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 09c31f1947647c39045439b952862814fda5639e Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 29 00:40:04 2014 +0200 Refreshed the patches --- debian/changelog | 4 +- debian/patches/bundle.diff | 130 ++++++++++++++++++++--------------------- debian/patches/fix_osgi43.diff | 78 ------------------------- debian/patches/full.series | 1 - debian/patches/modules.diff | 9 +-- 5 files changed, 69 insertions(+), 153 deletions(-) diff --git a/debian/changelog b/debian/changelog index 690728c..2d44226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -libxbean-java (3.7-7) UNRELEASED; urgency=medium +libxbean-java (4.0-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches and removed fix_osgi43.diff (updated upstream) * Standards-Version updated to 3.9.6 (no changes) * Switch to debhelper level 9 * Moved the package to Git diff --git a/debian/patches/bundle.diff b/debian/patches/bundle.diff index 7dd178d..66ec9f4 100644 --- a/debian/patches/bundle.diff +++ b/debian/patches/bundle.diff @@ -6,78 +6,78 @@ Forwarded: not-needed --- a/xbean-naming/pom.xml +++ b/xbean-naming/pom.xml @@ -27,7 +27,7 @@ - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>xbean-naming</artifactId> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <name>Apache XBean :: Naming</name> - <description>xbean-naming implements a flexible non-persistent jndi provider</description> - + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>xbean-naming</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache XBean :: Naming</name> + <description>xbean-naming implements a flexible non-persistent jndi provider</description> + --- a/xbean-spring/pom.xml +++ b/xbean-spring/pom.xml @@ -30,7 +30,7 @@ - </parent> - - <artifactId>xbean-spring</artifactId> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <name>Apache XBean :: Spring</name> - - <description>xbean-spring provides a schema-driven proprietary namespace handler for spring contexts</description> + </parent> + + <artifactId>xbean-spring</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache XBean :: Spring</name> + + <description>xbean-spring provides a schema-driven proprietary namespace handler for spring contexts</description> --- a/xbean-telnet/pom.xml +++ b/xbean-telnet/pom.xml @@ -30,7 +30,7 @@ - </parent> - - <artifactId>xbean-telnet</artifactId> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <name>Apache XBean :: Telnet</name> - - <dependencies> + </parent> + + <artifactId>xbean-telnet</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache XBean :: Telnet</name> + + <dependencies> --- a/xbean-finder/pom.xml +++ b/xbean-finder/pom.xml @@ -28,7 +28,7 @@ - <version>3.7</version> - </parent> - <artifactId>xbean-finder</artifactId> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <name>Apache XBean :: Classpath Resource Finder</name> - <description>XBean Finder helps to find annotations in classes</description> - <dependencies> ---- a/xbean-asm-shaded/pom.xml -+++ b/xbean-asm-shaded/pom.xml + <version>4.0</version> + </parent> + <artifactId>xbean-finder</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache XBean :: Classpath Resource Finder</name> + <description>XBean Finder helps to find annotations in classes</description> + <dependencies> +--- a/xbean-asm5-shaded/pom.xml ++++ b/xbean-asm5-shaded/pom.xml @@ -28,7 +28,7 @@ - <version>3.7</version> + <version>4.0</version> </parent> - <artifactId>xbean-asm-shaded</artifactId> + <artifactId>xbean-asm5-shaded</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> - <name>Apache XBean :: ASM shaded (repackaged)</name> + <name>Apache XBean :: ASM 5 shaded (repackaged)</name> - <description>Repackaged and shaded asm jars</description> + <description>Repackaged and shaded asm 5.x jars</description> --- a/xbean-blueprint/pom.xml +++ b/xbean-blueprint/pom.xml @@ -30,7 +30,7 @@ - </parent> - - <artifactId>xbean-blueprint</artifactId> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <name>Apache XBean :: OSGI Blueprint Namespace Handler</name> - - <description>xbean-blueprint provides a schema-driven namespace handler for Apache Aries Blueprint</description> + </parent> + + <artifactId>xbean-blueprint</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache XBean :: OSGI Blueprint Namespace Handler</name> + + <description>xbean-blueprint provides a schema-driven namespace handler for Apache Aries Blueprint</description> --- a/xbean-bundleutils/pom.xml +++ b/xbean-bundleutils/pom.xml -@@ -24,7 +24,7 @@ - <version>3.7</version> +@@ -26,7 +26,7 @@ </parent> + <artifactId>xbean-bundleutils</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> - <name>Apache XBean OSGI Bundle Utilitiess</name> + <name>Apache XBean OSGI Bundle Utilities</name> <dependencies> --- a/xbean-classloader/pom.xml @@ -94,22 +94,22 @@ Forwarded: not-needed --- a/xbean-classpath/pom.xml +++ b/xbean-classpath/pom.xml @@ -30,7 +30,7 @@ - </parent> - - <artifactId>xbean-classpath</artifactId> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <name>Apache XBean :: ClassPath</name> - - </project> + </parent> + + <artifactId>xbean-classpath</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache XBean :: ClassPath</name> + + </project> --- a/xbean-reflect/pom.xml +++ b/xbean-reflect/pom.xml @@ -28,7 +28,7 @@ - <version>3.7</version> - </parent> - <artifactId>xbean-reflect</artifactId> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <name>Apache XBean :: Reflect</name> - <description>xbean-reflect provides very flexible ways to creat objects and graphs of objects for DI frameworks</description> - <dependencies> + <version>4.0</version> + </parent> + <artifactId>xbean-reflect</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache XBean :: Reflect</name> + <description>xbean-reflect provides very flexible ways to create objects and graphs of objects for DI frameworks</description> + <dependencies> diff --git a/debian/patches/fix_osgi43.diff b/debian/patches/fix_osgi43.diff deleted file mode 100644 index 1bf76ab..0000000 --- a/debian/patches/fix_osgi43.diff +++ /dev/null @@ -1,78 +0,0 @@ -Description: Add some delegator for OSGi R4.3 support (related to generics) -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2011-11-20 -Forwarded: no -Index: b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundle.java -=================================================================== ---- a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundle.java -+++ b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundle.java -@@ -21,6 +21,7 @@ - - import java.io.IOException; - import java.io.InputStream; -+import java.io.File; - import java.net.URL; - import java.util.ArrayList; - import java.util.Collection; -@@ -195,5 +196,19 @@ - public String toString() { - return "[DelegatingBundle: " + bundles + "]"; - } -- -+ -+ // OSGI 4.3 -+ public File getDataFile(String filename) { -+ return bundle.getDataFile(filename); -+ } -+ -+ // OSGI 4.3 -+ public <A> A adapt(Class<A> type) { -+ return bundle.<A>adapt(type); -+ } -+ -+ // OSGI 4.3 -+ public int compareTo(Bundle bundle) { -+ return bundle.compareTo(bundle); -+ } - } -Index: b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -=================================================================== ---- a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -+++ b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -@@ -22,6 +22,7 @@ - import java.io.File; - import java.io.InputStream; - import java.util.Dictionary; -+import java.util.Collection; - - import org.osgi.framework.Bundle; - import org.osgi.framework.BundleContext; -@@ -139,4 +140,28 @@ - return bundleContext.ungetService(arg0); - } - -+ // OSGI 4.3 -+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, -+ S service, -+ Dictionary<String,?> properties) { -+ return bundleContext.registerService(clazz, service, properties); -+ } -+ -+ // OSGI 4.3 -+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) { -+ return bundleContext.getServiceReference(clazz); -+ } -+ -+ // OSGI 4.3 -+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, -+ String filter) -+ throws InvalidSyntaxException { -+ return bundleContext.getServiceReferences(clazz, filter); -+ } -+ -+ // OSGI 4.3 -+ public Bundle getBundle(String location) { -+ return bundleContext.getBundle(location); -+ } -+ - } diff --git a/debian/patches/full.series b/debian/patches/full.series index 5acb48d..9ab4fca 100644 --- a/debian/patches/full.series +++ b/debian/patches/full.series @@ -1,3 +1,2 @@ bundle.diff modules.diff -fix_osgi43.diff diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff index dd7b8db..42e5e34 100644 --- a/debian/patches/modules.diff +++ b/debian/patches/modules.diff @@ -6,7 +6,7 @@ Forwarded: not-needed --- a/pom.xml +++ b/pom.xml -@@ -353,7 +353,7 @@ +@@ -416,7 +416,7 @@ <module>xbean-finder</module> <module>xbean-naming</module> <module>xbean-reflect</module> @@ -15,10 +15,3 @@ Forwarded: not-needed <module>xbean-spring</module> <module>xbean-telnet</module> <module>maven-xbean-plugin</module> -@@ -422,4 +422,4 @@ - </plugins> - </reporting> - --</project> -\ No newline at end of file -+</project> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxbean-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
