Author: drazzib Date: 2010-03-25 21:51:23 +0000 (Thu, 25 Mar 2010) New Revision: 11923
Added: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms trunk/libcommons-discovery-java/debian/maven.rules trunk/libcommons-discovery-java/debian/patches/series trunk/libcommons-discovery-java/debian/pom.xml trunk/libcommons-discovery-java/debian/source/ trunk/libcommons-discovery-java/debian/source/format Removed: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.docs Modified: trunk/libcommons-discovery-java/debian/ant.properties trunk/libcommons-discovery-java/debian/changelog trunk/libcommons-discovery-java/debian/control trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch trunk/libcommons-discovery-java/debian/rules Log: * Add myself to Uploaders * Remove Arnaud from Uploaders (retired from Debian) * Add Maven support: - debian/control: Build-Depends-Indep on maven-repo-helper - debian/rules: mh_installpoms and mh_installjar - debian/pom.xml: POM for commons-dicovery * Use 3.0 (quilt) source format: - debian/rules: Remove simple-patchsys.mk - Refresh all debian/patches * Updated Standards-Version 3.8.4 (no changes needed) * debian/ant.properties: Compile for Java 1.3 * Install Javadoc HTML to /usr/share/doc/libcommons-discovery-java/api/ Modified: trunk/libcommons-discovery-java/debian/ant.properties =================================================================== --- trunk/libcommons-discovery-java/debian/ant.properties 2010-03-25 21:39:58 UTC (rev 11922) +++ trunk/libcommons-discovery-java/debian/ant.properties 2010-03-25 21:51:23 UTC (rev 11923) @@ -1,3 +1,5 @@ junit.jar=/usr/share/java/junit.jar logger.jar=/usr/share/java/commons-logging.jar +ant.build.javac.source=1.3 +ant.build.javac.target=1.3 Modified: trunk/libcommons-discovery-java/debian/changelog =================================================================== --- trunk/libcommons-discovery-java/debian/changelog 2010-03-25 21:39:58 UTC (rev 11922) +++ trunk/libcommons-discovery-java/debian/changelog 2010-03-25 21:51:23 UTC (rev 11923) @@ -1,14 +1,25 @@ -libcommons-discovery-java (0.4-3.1) UNRELEASED; urgency=low +libcommons-discovery-java (0.4-4) unstable; urgency=low - * Non-maintainer upload. - [ Emmanuel Bourg ] * Update of the URLs * Rename Jakarta Commons to Apache Commons - - -- Sylvestre Ledru <sylvestre.le...@inria.fr> Wed, 17 Jun 2009 10:50:44 +0200 + [ Damien Raude-Morvan ] + * Add myself to Uploaders + * Remove Arnaud from Uploaders (retired from Debian) + * Add Maven support: + - debian/control: Build-Depends-Indep on maven-repo-helper + - debian/rules: mh_installpoms and mh_installjar + - debian/pom.xml: POM for commons-dicovery + * Use 3.0 (quilt) source format: + - debian/rules: Remove simple-patchsys.mk + - Refresh all debian/patches + * Updated Standards-Version 3.8.4 (no changes needed) + * debian/ant.properties: Compile for Java 1.3 + * Install Javadoc HTML to /usr/share/doc/libcommons-discovery-java/api/ + -- Damien Raude-Morvan <draz...@debian.org> Thu, 25 Mar 2010 22:45:40 +0100 + libcommons-discovery-java (0.4-3) unstable; urgency=low * Update the license to Apache License 2.0 (Closes: #532890) Modified: trunk/libcommons-discovery-java/debian/control =================================================================== --- trunk/libcommons-discovery-java/debian/control 2010-03-25 21:39:58 UTC (rev 11922) +++ trunk/libcommons-discovery-java/debian/control 2010-03-25 21:51:23 UTC (rev 11923) @@ -2,12 +2,13 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>, Kumar Appaiah <aku...@debian.org>, Varun Hiremath <va...@debian.org> -Build-Depends: debhelper (>= 7), cdbs -Build-Depends-Indep: libcommons-logging-java, junit, ant, ant-optional, default-jdk -Standards-Version: 3.8.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java +Uploaders: Michael Koch <konque...@gmx.de>, Damien Raude-Morvan <draz...@debian.org>, + Kumar Appaiah <aku...@debian.org>, Varun Hiremath <va...@debian.org> +Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk +Build-Depends-Indep: libcommons-logging-java, junit, ant-optional, maven-repo-helper +Standards-Version: 3.8.4 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java/ Homepage: http://commons.apache.org/discovery/ Package: libcommons-discovery-java Modified: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base =================================================================== --- trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base 2010-03-25 21:39:58 UTC (rev 11922) +++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base 2010-03-25 21:51:23 UTC (rev 11923) @@ -8,6 +8,6 @@ Section: Programming Format: HTML -Index: /usr/share/doc/libcommons-discovery-java-doc/api/index.html -Files: /usr/share/doc/libcommons-discovery-java-doc/api/*.html +Index: /usr/share/doc/libcommons-discovery-java/api/index.html +Files: /usr/share/doc/libcommons-discovery-java/api/*.html Deleted: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.docs =================================================================== --- trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.docs 2010-03-25 21:39:58 UTC (rev 11922) +++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.docs 2010-03-25 21:51:23 UTC (rev 11923) @@ -1 +0,0 @@ -dist/docs/* Copied: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install (from rev 11919, trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.docs) =================================================================== --- trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install (rev 0) +++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install 2010-03-25 21:51:23 UTC (rev 11923) @@ -0,0 +1 @@ +dist/docs/api /usr/share/doc/libcommons-discovery-java/ Added: trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms =================================================================== --- trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms (rev 0) +++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms 2010-03-25 21:51:23 UTC (rev 11923) @@ -0,0 +1 @@ +debian/pom.xml Added: trunk/libcommons-discovery-java/debian/maven.rules =================================================================== --- trunk/libcommons-discovery-java/debian/maven.rules (rev 0) +++ trunk/libcommons-discovery-java/debian/maven.rules 2010-03-25 21:51:23 UTC (rev 11923) @@ -0,0 +1,2 @@ +junit junit jar s/3\..*/3.x/ + Modified: trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch =================================================================== --- trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch 2010-03-25 21:39:58 UTC (rev 11922) +++ trunk/libcommons-discovery-java/debian/patches/01_dont_copy_license.patch 2010-03-25 21:51:23 UTC (rev 11923) @@ -1,6 +1,9 @@ -diff -Nur libcommons-discovery-java-0.4/build.xml libcommons-discovery-java-0.4.new/build.xml ---- libcommons-discovery-java-0.4/build.xml 2006-11-30 04:45:55.000000000 +0530 -+++ libcommons-discovery-java-0.4.new/build.xml 2007-09-20 22:40:04.000000000 +0530 +Description: Don't copy licences files during build +Author: Debian Java Team +Last-Update: 2010-03-25 +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml @@ -180,13 +180,9 @@ description="Create binary distribution"> <!-- TODO: top level files like LICENSE and README --> Added: trunk/libcommons-discovery-java/debian/patches/series =================================================================== --- trunk/libcommons-discovery-java/debian/patches/series (rev 0) +++ trunk/libcommons-discovery-java/debian/patches/series 2010-03-25 21:51:23 UTC (rev 11923) @@ -0,0 +1 @@ +01_dont_copy_license.patch Added: trunk/libcommons-discovery-java/debian/pom.xml =================================================================== --- trunk/libcommons-discovery-java/debian/pom.xml (rev 0) +++ trunk/libcommons-discovery-java/debian/pom.xml 2010-03-25 21:51:23 UTC (rev 11923) @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <name>Discovery</name> + <version>0.4</version> + <description>Commons Discovery</description> + <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url> + <issueManagement> + <url>http://issues.apache.org/jira/</url> + </issueManagement> + <ciManagement> + <notifiers> + <notifier> + <configuration> + <address>commons-...@jakarta.apache.org</address> + </configuration> + </notifier> + </notifiers> + </ciManagement> + <inceptionYear>2002</inceptionYear> + <mailingLists> + <mailingList> + <name>Commons Dev List</name> + <subscribe>commons-dev-subscr...@jakarta.apache.org</subscribe> + <unsubscribe>commons-dev-unsubscr...@jakarta.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive> + </mailingList> + <mailingList> + <name>Commons User List</name> + <subscribe>commons-user-subscr...@jakarta.apache.org</subscribe> + <unsubscribe>commons-user-unsubscr...@jakarta.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive> + </mailingList> + </mailingLists> + <developers> + <developer> + <id>rsitze</id> + <name>Richard Sitze</name> + <email></email> + <organization></organization> + </developer> + <developer> + <id>craigmcc</id> + <name>Craig R. McClanahan</name> + <email></email> + <organization></organization> + </developer> + <developer> + <id>costin</id> + <name>Costin Manolache</name> + <email></email> + <organization></organization> + </developer> + <developer> + <id>jstrachan</id> + <name>James Strachan</name> + <email>jstrac...@apache.org</email> + <organization>SpiritSoft, Inc.</organization> + </developer> + <developer> + <id>matth</id> + <name>Matthew Hawthorne</name> + <email>ma...@apache.org</email> + </developer> + <developer> + <id>dims</id> + <name>Davanum Srinivas</name> + <email>d...@apache.org</email> + </developer> + <developer> + <id>rwinston</id> + <name>Rory Winston</name> + <email>rwins...@eircom.net</email> + </developer> + <developer> + <id>rdonkin</id> + <name>Robert Burrell Donkin</name> + <email>rdon...@apache.org</email> + </developer> + </developers> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>/LICENSE.txt</url> + </license> + </licenses> + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection> + <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url> + </scm> + <organization> + <name>The Apache Software Foundation</name> + <url>http://jakarta.apache.org</url> + </organization> + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + <resources> + <resource> + <targetPath>META-INF</targetPath> + <directory>${basedir}</directory> + <includes> + <include>NOTICE.txt</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>${basedir}/src</directory> + <includes> + <include>**/testResource</include> + </includes> + </testResource> + <testResource> + <directory>${basedir}/src/test</directory> + <includes> + <include>**/*.properties</include> + <include>META-INF/**</include> + </includes> + </testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/TestAll.java</include> + </includes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-xdoc-plugin</artifactId> + <version>1.9.2</version> + <configuration> + <comment><strong>Site Only</strong> - v1.9.2 (minimum) + required for building the Site documentation.</comment> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.7</version> + <scope>test</scope> + </dependency> + </dependencies> + <distributionManagement> + <repository> + <id>default</id> + <name>Default Repository</name> + <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url> + </repository> + <site> + <id>default</id> + <name>Default Site</name> + <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url> + </site> + <status>converted</status> + </distributionManagement> +</project> \ No newline at end of file Modified: trunk/libcommons-discovery-java/debian/rules =================================================================== --- trunk/libcommons-discovery-java/debian/rules 2010-03-25 21:39:58 UTC (rev 11922) +++ trunk/libcommons-discovery-java/debian/rules 2010-03-25 21:51:23 UTC (rev 11923) @@ -1,9 +1,7 @@ #!/usr/bin/make -f -# debian/rules for libcommons-discovery-java include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME_DIRS := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant @@ -13,9 +11,11 @@ LIBRARY=commons-discovery install/lib${LIBRARY}-java:: - install -D -m 644 dist/${LIBRARY}.jar \ - debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar - dh_link usr/share/java/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar usr/share/java/${LIBRARY}.jar + mh_installpoms -plib${LIBRARY}-java + mh_installjar -plib${LIBRARY}-java -l debian/pom.xml dist/${LIBRARY}.jar +clean:: + -rm -rf debian/tmp + get-orig-source: -uscan --upstream-version 0 --rename Added: trunk/libcommons-discovery-java/debian/source/format =================================================================== --- trunk/libcommons-discovery-java/debian/source/format (rev 0) +++ trunk/libcommons-discovery-java/debian/source/format 2010-03-25 21:51:23 UTC (rev 11923) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
