This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libibatis-java.
commit 34507cb7b1e04417e0b07a4bfd4ba8f52418765f Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 7 16:17:17 2016 +0200 Build with debhelper instead of CDBS --- debian/ant.properties | 4 ---- debian/build.xml | 26 ++++++++++++++++---------- debian/changelog | 1 + debian/control | 3 +-- debian/libibatis-java.links | 1 + debian/libibatis-java.poms | 2 +- debian/rules | 22 +++++++--------------- 7 files changed, 27 insertions(+), 32 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index 1c9a1a6..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,4 +0,0 @@ -project.name=ibatis -class.dir=build -source.dir=src -jar=ibatis.jar diff --git a/debian/build.xml b/debian/build.xml index 8d72b07..89f58f7 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -1,23 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<project default="jar" name="${project.name}" basedir=".."> +<project default="jar" name="ibatis" basedir=".."> <target name="clean"> - <delete dir="${class.dir}" quiet="true"/> + <delete dir="target" quiet="true"/> </target> <target name="compile" description="o Compile the source files"> - <mkdir dir="${class.dir}"/> - <javac srcdir="${source.dir}" destdir="${class.dir}" - debug="true" source="1.7" target="1.7"/> - <copydir src="${source.dir}" dest="${class.dir}" includes="**/*.dtd"/> + <mkdir dir="target/classes"/> + <javac srcdir="src" destdir="target/classes" debug="true" source="1.7" target="1.7"> + <classpath> + <pathelement path="/usr/share/java/cglib.jar"/> + <pathelement path="/usr/share/java/commons-dbcp.jar"/> + <pathelement path="/usr/share/java/commons-logging.jar"/> + <pathelement path="/usr/share/java/geronimo-jta-1.2-spec.jar"/> + <pathelement path="/usr/share/java/log4j-1.2.jar"/> + <pathelement path="/usr/share/java/oscache.jar"/> + </classpath> + </javac> + <copydir src="src" dest="target/classes" includes="**/*.dtd"/> </target> <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${jar}"> - <fileset dir="${class.dir}"> - <include name="**"/> - </fileset> + <jar jarfile="target/ibatis.jar"> + <fileset dir="target/classes"/> </jar> </target> diff --git a/debian/changelog b/debian/changelog index 603cb80..3c6bdcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libibatis-java (2.3.4.726-6) UNRELEASED; urgency=medium * Build with default-jdk instead of gcj-jdk * Depend on libcglib-java instead of libcglib3-java + * Build with debhelper instead of CDBS * Moved the package to Git * Standards-Version updated to 3.9.8 diff --git a/debian/control b/debian/control index fa534cb..1f653e0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Varun Hiremath <[email protected]> Build-Depends: ant, - cdbs, debhelper (>= 9), default-jdk, libcglib-java, @@ -13,7 +12,7 @@ Build-Depends: ant, libgeronimo-jta-1.2-spec-java, liblog4j1.2-java, liboscache-java, - maven-debian-helper + maven-repo-helper Standards-Version: 3.9.8 Homepage: http://ibatis.apache.org Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libibatis-java.git diff --git a/debian/libibatis-java.links b/debian/libibatis-java.links new file mode 100644 index 0000000..4955cf3 --- /dev/null +++ b/debian/libibatis-java.links @@ -0,0 +1 @@ +/usr/share/java/ibatis-sqlmap.jar /usr/share/java/ibatis.jar diff --git a/debian/libibatis-java.poms b/debian/libibatis-java.poms index a32a5b2..7eb3f08 100644 --- a/debian/libibatis-java.poms +++ b/debian/libibatis-java.poms @@ -1 +1 @@ -debian/ibatis-sqlmap-2.3.4.726.pom +debian/ibatis-sqlmap-2.3.4.726.pom --java-lib --has-package-version --artifact=target/ibatis.jar diff --git a/debian/rules b/debian/rules index b83d80f..a57a714 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,13 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ --buildsystem=ant --with maven-repo-helper -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := cglib commons-dbcp commons-logging geronimo-jta-1.2-spec log4j-1.2 oscache +override_dh_auto_build: + dh_auto_build -- -f debian/build.xml -install/libibatis-java:: - # compatibility symlink - dh_link usr/share/java/ibatis-sqlmap.jar usr/share/java/ibatis.jar - mh_installpoms -plibibatis-java --verbose - mh_installjar -plibibatis-java debian/ibatis-sqlmap-*.pom ibatis.jar --java-lib - -clean:: - mh_clean - rm -f ibatis.jar +override_dh_auto_clean: + dh_auto_clean -- -f debian/build.xml get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --no-symlink + uscan --download-current-version --force-download --no-symlink -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libibatis-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
