This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository h2database.
commit 243b921afaa87494c39c452e56e362698b2edcc1 Author: Emmanuel Bourg <[email protected]> Date: Mon Feb 16 13:03:45 2015 +0100 Do not copy the pom in debian/ and reuse the template instead --- debian/libh2-java.jlibs | 1 - debian/libh2-java.links | 2 -- debian/libh2-java.poms | 1 - debian/pom.xml | 22 ---------------------- debian/rules | 12 ++++++++++-- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/debian/libh2-java.jlibs b/debian/libh2-java.jlibs deleted file mode 100644 index eb0db7f..0000000 --- a/debian/libh2-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -bin/h2-1.3.157.jar diff --git a/debian/libh2-java.links b/debian/libh2-java.links deleted file mode 100644 index 3e6e618..0000000 --- a/debian/libh2-java.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/maven-repo/com/h2database/h2/1.3.157/h2-1.3.157.jar /usr/share/java/h2-1.3.157.jar -/usr/share/maven-repo/com/h2database/h2/debian/h2-debian.jar /usr/share/java/h2.jar diff --git a/debian/libh2-java.poms b/debian/libh2-java.poms deleted file mode 100644 index 1a7e280..0000000 --- a/debian/libh2-java.poms +++ /dev/null @@ -1 +0,0 @@ -debian/pom.xml diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index f46c81a..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version></version> - <packaging>jar</packaging> - <name>H2 Database Engine</name> - <url>http://www.h2database.com</url> - <description>H2 Database Engine</description> - <licenses> - <license> - <name>The H2 License, Version 1.0</name> - <url>http://h2database.com/html/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <url>http://h2database.googlecode.com/svn/trunk</url> - </scm> - <dependencies> - </dependencies> -</project> diff --git a/debian/rules b/debian/rules index 8010a0f..cbe85c4 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,23 @@ #!/usr/bin/make -f + JAVA_HOME=/usr/lib/jvm/default-java -JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 + +VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') %: - dh $@ --with javahelper --with maven_repo_helper + dh $@ --with javahelper override_dh_auto_build: mkdir -p temp bin JAVA_HOME=${JAVA_HOME} "${JAVA_HOME}/bin/javac" -sourcepath src/tools -d bin src/tools/org/h2/build/*.java JAVA_HOME=${JAVA_HOME} "${JAVA_HOME}/bin/java" -Xmx256m -cp "bin:${JAVA_HOME}/lib/tools.jar:temp" org.h2.build.Build -Dlucene=2 jar javadoc +override_dh_auto_install: + dh_auto_install + mh_installpom -plibh2-java --set-version=$(VERSION) --has-package-version src/installer/pom-template.xml + mh_installjar -plibh2-java --set-version=$(VERSION) --java-lib src/installer/pom-template.xml bin/h2-$(VERSION).jar + override_dh_auto_clean: rm -rf temp bin docs/javadoc + mh_clean dh_auto_clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/h2database.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
