This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit 922c7b4c02a06bfc6e6c3b03ce4dae6c51f1f19a Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 26 16:20:11 2014 +0100 Removed the patch disabling the Derby support (Derby is now in Debian) --- debian/patches/0004_no_derby_db.diff | 36 ------------------------------------ debian/patches/series | 1 - 2 files changed, 37 deletions(-) diff --git a/debian/patches/0004_no_derby_db.diff b/debian/patches/0004_no_derby_db.diff deleted file mode 100644 index ed29ba7..0000000 --- a/debian/patches/0004_no_derby_db.diff +++ /dev/null @@ -1,36 +0,0 @@ -Description: There is no package for Derby DB in Debian. - Don't compile EmbeddedDatabaseConfigurerFactory. -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-06-20 -Forwarded: not-needed ---- a/projects/org.springframework.jdbc/build.xml -+++ b/projects/org.springframework.jdbc/build.xml -@@ -4,4 +4,15 @@ - <property file="${basedir}/../build.versions"/> - <import file="${basedir}/../build-spring-framework/package-bundle.xml"/> - <import file="${basedir}/../spring-build/standard/default.xml"/> -+ -+ <macrodef name="pre-compile"> -+ <attribute name="classpath.id"/> -+ <attribute name="input.dir"/> -+ <attribute name="output.dir"/> -+ <attribute name="resources.dir"/> -+ <sequential> -+ <delete file="${basedir}/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java"/> -+ </sequential> -+ </macrodef> -+ - </project> ---- a/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java -+++ b/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java -@@ -36,8 +36,8 @@ - return HsqlEmbeddedDatabaseConfigurer.getInstance(); - case H2: - return H2EmbeddedDatabaseConfigurer.getInstance(); -- case DERBY: -- return DerbyEmbeddedDatabaseConfigurer.getInstance(); -+ //case DERBY: -+ // return DerbyEmbeddedDatabaseConfigurer.getInstance(); - default: - throw new UnsupportedOperationException("Other embedded database types not yet supported"); - } diff --git a/debian/patches/series b/debian/patches/series index e93dbc9..8997c92 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 0001_use_debian_asm3.diff 0002_ivy_dependencies.diff 0003_no_ibm_websphere.diff -0004_no_derby_db.diff 0005_commonj.diff 0006_aspectj_classpath.diff 0007_remove_backport_util_concurrent.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
