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 5dacc24c1985a78100995b692a43d61faa725b64 Author: Emmanuel Bourg <[email protected]> Date: Sun Sep 14 00:51:48 2014 +0200 Transition to libcglib3-java --- debian/build-classpath | 2 +- debian/changelog | 2 +- debian/control | 8 ++++---- debian/maven.rules | 1 + debian/rules | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/build-classpath b/debian/build-classpath index 3583690..b88c058 100644 --- a/debian/build-classpath +++ b/debian/build-classpath @@ -18,7 +18,7 @@ /usr/share/java/c3p0.jar /usr/share/java/castor-core.jar /usr/share/java/castor-xml.jar -/usr/share/java/cglib.jar +/usr/share/java/cglib3.jar /usr/share/java/commons-beanutils.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-fileupload.jar diff --git a/debian/changelog b/debian/changelog index 6b4d986..0c09bce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ libspring-java (3.0.6.RELEASE-15) UNRELEASED; urgency=medium * Team upload. - * Transition to libasm4-java + * Transition to libasm4-java and libcglib3-java * debian/control: - Depend on libtomcat8-java instead of libtomcat6-java (Closes: #759635) diff --git a/debian/control b/debian/control index 7605a07..cc3fb6f 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts, libaspectj-java, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials, groovy, junit4 (>= 4.5), libaopalliance-java, libasm4-java, libatinject-jsr330-api-java, libaxis-java, libc3p0-java, libcastor-core-java, libcastor-xml-java, - libcglib-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java, + libcglib3-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-logging-java, libcommons-pool-java, libdom4j-java, libecj-java, libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java, libgeronimo-ejb-3.0-spec-java, libgeronimo-interceptor-3.0-spec-java, libgeronimo-j2ee-connector-1.5-spec-java, @@ -39,7 +39,7 @@ Description: modular Java/J2EE application framework - Core Package: libspring-beans-java Architecture: all Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libservlet2.5-java, libatinject-jsr330-api-java -Suggests: libcglib-java +Suggests: libcglib3-java Description: modular Java/J2EE application framework - Beans Spring is a layered Java/J2EE application framework offering a lot of freedom to Java developers yet providing well documented and easy-to-use solutions for @@ -51,7 +51,7 @@ Description: modular Java/J2EE application framework - Beans Package: libspring-aop-java Architecture: all Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libaopalliance-java -Suggests: libjamon-java, libcglib-java, libaspectj-java, libcommons-pool-java +Suggests: libjamon-java, libcglib3-java, libaspectj-java, libcommons-pool-java Description: modular Java/J2EE application framework - AOP Spring is a layered Java/J2EE application framework offering a lot of freedom to Java developers yet providing well documented and easy-to-use solutions for @@ -65,7 +65,7 @@ Package: libspring-context-java Architecture: all Depends: ${misc:Depends}, libspring-aop-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-core-java (= ${source:Version}), libspring-expression-java (= ${source:Version}) Recommends: libspring-instrument-java (= ${source:Version}), libtomcat8-java, libgeronimo-ejb-3.0-spec-java, libatinject-jsr330-api-java, glassfish-javaee, - libjodatime-java, libasm4-java, libaopalliance-java, libcglib-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java + libjodatime-java, libasm4-java, libaopalliance-java, libcglib3-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java Suggests: jruby, bsh, groovy Description: modular Java/J2EE application framework - Context Spring is a layered Java/J2EE application framework offering a lot of freedom diff --git a/debian/maven.rules b/debian/maven.rules index 17a7116..c34a422 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,3 +17,4 @@ s/jexcelapi/net.sourceforge.jexcelapi/ jxl jar s/.*/debian/ s/hsqldb/org.hsqldb/ hsqldb jar s/.*/debian/ s/jasperreports/net.sf.jasperreports/ jasperreports jar s/.*/debian/ org.hibernate s/com.springsource.org.hibernate.validator/hibernate-validator/ jar s/.*/debian/ +cglib * * s/.*/3.x/ * * diff --git a/debian/rules b/debian/rules index 12aaac5..8b4a675 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ') VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//') -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/java-7-openjdk-amd64 ANT_ARGS := -propertyfile debian/ant.properties BUILD_FILE := projects/build-spring-framework/build.xml CLASSPATH := $(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done) -- 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
