This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libhibernate3-java.
commit 6232fdfc99ad5e270304fba4fb937c37e1522d24 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 8 00:43:22 2016 +0200 Removed the unnecessary patches --- debian/changelog | 1 + debian/libhibernate3-java.poms | 58 ++++++++++++++++------ debian/maven.properties | 2 + ...001-disable-modules-that-do-not-build-yet.patch | 31 ------------ debian/patches/0003-fix-up-jdbc4-testing.patch | 33 ------------ debian/patches/series | 2 - 6 files changed, 46 insertions(+), 81 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39903a6..1558dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libhibernate3-java (3.6.10.Final-5) UNRELEASED; urgency=medium * Added the missing libantlr-java dependency (Closes: #829388) * Depend on libcglib-java instead of libcglib3-java * Added the libh2-java build dependency and enabled the H2 tests + * Removed the unnecessary patches * Build with maven-debian-helper instead of CDBS * Standards-Version updated to 3.9.8 * Use secure Vcs-* URLs diff --git a/debian/libhibernate3-java.poms b/debian/libhibernate3-java.poms index b9d3808..5061a6e 100644 --- a/debian/libhibernate3-java.poms +++ b/debian/libhibernate3-java.poms @@ -1,15 +1,43 @@ -project/pom.xml --no-parent -project/hibernate-parent/pom.xml -project/hibernate-core/pom.xml -project/hibernate-testing/pom.xml -project/hibernate-testsuite/pom.xml -project/hibernate-ehcache/pom.xml -project/hibernate-jbosscache/pom.xml -project/hibernate-oscache/pom.xml -project/hibernate-swarmcache/pom.xml -project/hibernate-c3p0/pom.xml -project/hibernate-proxool/pom.xml -project/hibernate-entitymanager/pom.xml -project/hibernate-envers/pom.xml -project/hibernate-jdbc3-testing/pom.xml -project/hibernate-infinispan/pom.xml +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +project/pom.xml --no-parent --has-package-version +project/hibernate-parent/pom.xml --has-package-version +project/hibernate-core/pom.xml --has-package-version --java-lib +project/hibernate-testing/pom.xml --has-package-version --java-lib +project/hibernate-testsuite/pom.xml --has-package-version --java-lib +project/hibernate-ehcache/pom.xml --has-package-version --java-lib +project/hibernate-jbosscache/pom.xml --ignore +project/hibernate-oscache/pom.xml --has-package-version --java-lib +project/hibernate-swarmcache/pom.xml --has-package-version --java-lib +project/hibernate-c3p0/pom.xml --has-package-version --java-lib +project/hibernate-proxool/pom.xml --has-package-version --java-lib +project/hibernate-entitymanager/pom.xml --has-package-version --java-lib +project/hibernate-envers/pom.xml --ignore +project/hibernate-jdbc3-testing/pom.xml --has-package-version --java-lib +project/hibernate-jdbc4-testing/pom.xml --has-package-version --java-lib +project/hibernate-infinispan/pom.xml --ignore diff --git a/debian/maven.properties b/debian/maven.properties index 1b1893e..c578d52 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -3,3 +3,5 @@ maven.test.failure.ignore=true disableDistribution=true # Set encoding for compatibilty with Java 7 project.build.sourceEncoding=ISO-8859-1 + +jdk16_home=/usr/lib/jvm/default-java diff --git a/debian/patches/0001-disable-modules-that-do-not-build-yet.patch b/debian/patches/0001-disable-modules-that-do-not-build-yet.patch deleted file mode 100644 index f330303..0000000 --- a/debian/patches/0001-disable-modules-that-do-not-build-yet.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sun, 23 May 2010 12:18:25 +0200 -Subject: [PATCH] disable modules that do not build yet - ---- - pom.xml | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/project/pom.xml b/project/pom.xml -index 8977fc3..2d8a982 100644 ---- a/project/pom.xml -+++ b/project/pom.xml -@@ -28,14 +28,14 @@ - <module>hibernate-testing</module> - <module>hibernate-testsuite</module> - <module>hibernate-ehcache</module> -- <module>hibernate-jbosscache</module> -+<!-- <module>hibernate-jbosscache</module> --> - <module>hibernate-oscache</module> - <module>hibernate-swarmcache</module> - <module>hibernate-c3p0</module> - <module>hibernate-proxool</module> -- <module>hibernate-envers</module> -+<!-- <module>hibernate-envers</module> --> - <module>hibernate-jdbc3-testing</module> -- <module>hibernate-infinispan</module> -+<!-- <module>hibernate-infinispan</module> --> - <!-- - Need to scope bytecode providers first... - <module>bytecode-cglib</module> ---- diff --git a/debian/patches/0003-fix-up-jdbc4-testing.patch b/debian/patches/0003-fix-up-jdbc4-testing.patch deleted file mode 100644 index d6d0191..0000000 --- a/debian/patches/0003-fix-up-jdbc4-testing.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Tue, 15 Jun 2010 23:47:14 +0200 -Subject: [PATCH] fix up jdbc4-testing - ---- - jdbc4-testing/pom.xml | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - ---- a/project/hibernate-jdbc4-testing/pom.xml -+++ b/project/hibernate-jdbc4-testing/pom.xml -@@ -50,11 +50,14 @@ - <source>1.6</source> - <target>1.6</target> - <compilerVersion>1.6</compilerVersion> -+<!-- not needed - <executable>${jdk16_home}/bin/javac</executable> - <fork>true</fork> -+--> - <verbose>true</verbose> - </configuration> - </plugin> -+<!-- not needed - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> -@@ -62,6 +65,7 @@ - <jvm>${jdk16_home}/bin/java</jvm> - </configuration> - </plugin> -+--> - </plugins> - </build> - diff --git a/debian/patches/series b/debian/patches/series index a94ec8e..748e54b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ -0001-disable-modules-that-do-not-build-yet.patch 0002-disable-tests-for-entitymanager.patch -0003-fix-up-jdbc4-testing.patch 0004-cglib3-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libhibernate3-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
