Author: nomadium Date: 2014-02-09 01:46:34 +0000 (Sun, 09 Feb 2014) New Revision: 17739
Added: trunk/libjdo-api-java/debian/jdo2-api-2.2.pom trunk/libjdo-api-java/debian/libjdo-api-java.poms trunk/libjdo-api-java/debian/maven.rules trunk/libjdo-api-java/debian/patches/set_explicit_java_binary_target.diff Removed: trunk/libjdo-api-java/debian/install Modified: trunk/libjdo-api-java/debian/changelog trunk/libjdo-api-java/debian/control trunk/libjdo-api-java/debian/patches/series trunk/libjdo-api-java/debian/rules Log: * Team upload. * Provide Maven artifacts. (Closes: #729607). * Bump Standards-Version to 3.9.5. No changes were needed. * Set target version for Java bytecode to 1.5. * Update Vcs-* fields in d/control. Modified: trunk/libjdo-api-java/debian/changelog =================================================================== --- trunk/libjdo-api-java/debian/changelog 2014-02-07 14:30:26 UTC (rev 17738) +++ trunk/libjdo-api-java/debian/changelog 2014-02-09 01:46:34 UTC (rev 17739) @@ -1,3 +1,13 @@ +libjdo-api-java (2.2-2) unstable; urgency=low + + * Team upload. + * Provide Maven artifacts. (Closes: #729607). + * Bump Standards-Version to 3.9.5. No changes were needed. + * Set target version for Java bytecode to 1.5. + * Update Vcs-* fields in d/control. + + -- Miguel Landaeta <[email protected]> Sat, 08 Feb 2014 17:39:25 -0300 + libjdo-api-java (2.2-1) unstable; urgency=low * Team upload. Modified: trunk/libjdo-api-java/debian/control =================================================================== --- trunk/libjdo-api-java/debian/control 2014-02-07 14:30:26 UTC (rev 17738) +++ trunk/libjdo-api-java/debian/control 2014-02-09 01:46:34 UTC (rev 17739) @@ -3,10 +3,11 @@ Priority: extra Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, glassfish-javaee -Standards-Version: 3.8.4 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjdo-api-java -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjdo-api-java/ +Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, glassfish-javaee, + maven-debian-helper +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjdo-api-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjdo-api-java/ Homepage: http://db.apache.org/jdo/ Package: libjdo-api-java Deleted: trunk/libjdo-api-java/debian/install =================================================================== --- trunk/libjdo-api-java/debian/install 2014-02-07 14:30:26 UTC (rev 17738) +++ trunk/libjdo-api-java/debian/install 2014-02-09 01:46:34 UTC (rev 17739) @@ -1 +0,0 @@ -*.jar /usr/share/java/ Added: trunk/libjdo-api-java/debian/jdo2-api-2.2.pom =================================================================== --- trunk/libjdo-api-java/debian/jdo2-api-2.2.pom (rev 0) +++ trunk/libjdo-api-java/debian/jdo2-api-2.2.pom 2014-02-09 01:46:34 UTC (rev 17739) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>javax.jdo</groupId> + <artifactId>jdo2-api</artifactId> + <name>JDO2 API</name> + <version>${currentVersion}</version> + <description>The Java Data Objects 2 (JDO) API is a standard interface-based +Java model abstraction of persistence, developed as Java Specification +Request 243 under the auspices of the Java Community Process.</description> + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>test/java</testSourceDirectory> + <resources> + <resource> + <targetPath>META-INF</targetPath> + <directory>${basedir}/..</directory> + <includes> + <include>NOTICE.txt</include> + </includes> + </resource> + <resource> + <directory>${basedir}/src/java</directory> + <includes> + <include>javax/jdo/*.properties</include> + </includes> + </resource> + <resource> + <directory>${basedir}/src/schema</directory> + <includes> + <include>javax/jdo/*.dtd</include> + <include>javax/jdo/*.xsd</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>${basedir}/test/schema</directory> + <includes> + <include>**/*.jdo</include> + <include>**/*.jdoquery</include> + <include>**/*.orm</include> + <include>**/jdoconfig.xml</include> + </includes> + </testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + <excludes> + <exclude>javax/jdo/util/AbstractTest.java</exclude> + <exclude>javax/jdo/pc/*.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>transaction-api</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_3.0_spec</artifactId> + <version>1.0</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: trunk/libjdo-api-java/debian/libjdo-api-java.poms =================================================================== --- trunk/libjdo-api-java/debian/libjdo-api-java.poms (rev 0) +++ trunk/libjdo-api-java/debian/libjdo-api-java.poms 2014-02-09 01:46:34 UTC (rev 17739) @@ -0,0 +1 @@ +debian/jdo2-api-2.2.pom Added: trunk/libjdo-api-java/debian/maven.rules =================================================================== --- trunk/libjdo-api-java/debian/maven.rules (rev 0) +++ trunk/libjdo-api-java/debian/maven.rules 2014-02-09 01:46:34 UTC (rev 17739) @@ -0,0 +1,2 @@ +junit junit * s/.*/3.x/ * * +s/org\.apache\.geronimo\.specs/javax.persistence/ s/geronimo-jpa_3.0_spec/persistence-api/g * s/.*/debian/ * * Modified: trunk/libjdo-api-java/debian/patches/series =================================================================== --- trunk/libjdo-api-java/debian/patches/series 2014-02-07 14:30:26 UTC (rev 17738) +++ trunk/libjdo-api-java/debian/patches/series 2014-02-09 01:46:34 UTC (rev 17739) @@ -1 +1,2 @@ enable_build_with_ant.diff +set_explicit_java_binary_target.diff Added: trunk/libjdo-api-java/debian/patches/set_explicit_java_binary_target.diff =================================================================== --- trunk/libjdo-api-java/debian/patches/set_explicit_java_binary_target.diff (rev 0) +++ trunk/libjdo-api-java/debian/patches/set_explicit_java_binary_target.diff 2014-02-09 01:46:34 UTC (rev 17739) @@ -0,0 +1,24 @@ +Description: Set explicit minimum binary target for Java classes +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2014-02-08 + +--- libjdo-api-java-2.2.orig/build.properties ++++ libjdo-api-java-2.2/build.properties +@@ -3,3 +3,5 @@ source.dir=jdo2-api-2.2/src/java + jar.name=jdo2-api.jar + doc.dir=docs + doc.packagenames=javax.jdo.* ++target=1.5 ++source=1.5 +--- libjdo-api-java-2.2.orig/build.xml ++++ libjdo-api-java-2.2/build.xml +@@ -11,7 +11,7 @@ + <target name="compile" description="Compile the sources"> + <mkdir dir="${class.dir}"/> + <javac srcdir="${source.dir}" destdir="${class.dir}" +- deprecation="true" debug="true" optimize="false"/> ++ target="${target}" source="${source}" deprecation="true" debug="true" optimize="false"/> + </target> + + <target name="javadoc" description="Creates Javadoc documentation" Modified: trunk/libjdo-api-java/debian/rules =================================================================== --- trunk/libjdo-api-java/debian/rules 2014-02-07 14:30:26 UTC (rev 17738) +++ trunk/libjdo-api-java/debian/rules 2014-02-09 01:46:34 UTC (rev 17739) @@ -5,9 +5,15 @@ JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := glassfish-javaee +UVERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^.*: \(.*\)-.*$$/\1/') get-orig-source: uscan --force-download +install/libjdo-api-java:: + mh_installpoms -plibjdo-api-java --set-version=$(UVERSION) + mh_installjar -plibjdo-api-java debian/jdo2-api-$(UVERSION).pom jdo2-api.jar --java-lib --set-version=$(UVERSION) + clean:: -rm -rf docs + mh_clean _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
