Author: drazzib
Date: 2009-11-24 00:12:38 +0000 (Tue, 24 Nov 2009)
New Revision: 11109
Added:
trunk/libcommons-attributes-java/debian/README.source
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.doc-base
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.install
trunk/libcommons-attributes-java/debian/libcommons-attributes-java.poms
trunk/libcommons-attributes-java/debian/maven.rules
trunk/libcommons-attributes-java/debian/poms/
trunk/libcommons-attributes-java/debian/poms/api.xml
trunk/libcommons-attributes-java/debian/poms/compiler.xml
trunk/libcommons-attributes-java/debian/poms/plugin.xml
Removed:
trunk/libcommons-attributes-java/debian/doc-base
Modified:
trunk/libcommons-attributes-java/debian/changelog
trunk/libcommons-attributes-java/debian/compat
trunk/libcommons-attributes-java/debian/control
trunk/libcommons-attributes-java/debian/docs
trunk/libcommons-attributes-java/debian/rules
Log:
* New libcommons-attributes-java-doc package:
- Install API Javadoc to /usr/share/doc/libcommons-attributes-java/api/
* Bump debhelper version to >= 7
* Remove unneeded ${shlibs:Depends} from Depends
* Bump Standards-Version to 3.8.3:
- Add debian/README.source to describe patch system
* Maven POMs:
- debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
- debian/rules: use mh_installpoms and mh_installjar
to install the POM and the jar to the Maven repository
- debian/poms/*.xml: Debian pom.xml files as upstream doesn't provide any
- debian/rules: new get-orig-pom to update debian/poms/*.xml at new upstream
release.
Added: trunk/libcommons-attributes-java/debian/README.source
===================================================================
--- trunk/libcommons-attributes-java/debian/README.source
(rev 0)
+++ trunk/libcommons-attributes-java/debian/README.source 2009-11-24
00:12:38 UTC (rev 11109)
@@ -0,0 +1,9 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
Modified: trunk/libcommons-attributes-java/debian/changelog
===================================================================
--- trunk/libcommons-attributes-java/debian/changelog 2009-11-23 23:36:32 UTC
(rev 11108)
+++ trunk/libcommons-attributes-java/debian/changelog 2009-11-24 00:12:38 UTC
(rev 11109)
@@ -1,8 +1,21 @@
-libcommons-attributes-java (2.2-7) UNRELEASED; urgency=low
+libcommons-attributes-java (2.2-7) unstable; urgency=low
+ * New libcommons-attributes-java-doc package:
+ - Install API Javadoc to /usr/share/doc/libcommons-attributes-java/api/
* Update my email address
+ * Bump debhelper version to >= 7
+ * Remove unneeded ${shlibs:Depends} from Depends
+ * Bump Standards-Version to 3.8.3:
+ - Add debian/README.source to describe patch system
+ * Maven POMs:
+ - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
+ - debian/rules: use mh_installpoms and mh_installjar
+ to install the POM and the jar to the Maven repository
+ - debian/poms/*.xml: Debian pom.xml files as upstream doesn't provide any
+ - debian/rules: new get-orig-pom to update debian/poms/*.xml at new
upstream
+ release.
- -- Damien Raude-Morvan <[email protected]> Sat, 24 Oct 2009 21:03:06 +0200
+ -- Damien Raude-Morvan <[email protected]> Tue, 24 Nov 2009 01:04:03 +0100
libcommons-attributes-java (2.2-6) unstable; urgency=low
Modified: trunk/libcommons-attributes-java/debian/compat
===================================================================
--- trunk/libcommons-attributes-java/debian/compat 2009-11-23 23:36:32 UTC
(rev 11108)
+++ trunk/libcommons-attributes-java/debian/compat 2009-11-24 00:12:38 UTC
(rev 11109)
@@ -1 +1 @@
-5
+7
Modified: trunk/libcommons-attributes-java/debian/control
===================================================================
--- trunk/libcommons-attributes-java/debian/control 2009-11-23 23:36:32 UTC
(rev 11108)
+++ trunk/libcommons-attributes-java/debian/control 2009-11-24 00:12:38 UTC
(rev 11109)
@@ -3,16 +3,28 @@
Priority: extra
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Torsten Werner <[email protected]>, Damien Raude-Morvan
<[email protected]>
-Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, libqdox-java,
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libqdox-java,
quilt
-Standards-Version: 3.8.2
+Build-Depends-Indep: maven-repo-helper
+Standards-Version: 3.8.3
Homepage: http://commons.apache.org/attributes/
Vcs-Svn: https://bollin.googlecode.com/svn/libcommons-attributes-java/trunk
Vcs-Browser: http://bollin.googlecode.com/svn/libcommons-attributes-java/trunk
Package: libcommons-attributes-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless |
java1-runtime | java2-runtime
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime | java2-runtime
Description: adds C#/.Net-style attributes to Java code
The Apache Jakarta Commons Attributes library enables Java programmers
to use C#/.Net-style attributes in their code.
+
+Package: libcommons-attributes-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libcommons-attributes-java
+Description: adds C#/.Net-style attributes to Java code - documentation
+ The Apache Jakarta Commons Attributes library enables Java programmers
+ to use C#/.Net-style attributes in their code.
+ .
+ This package contains API documentation (Javadoc) of Commons Attributes.
Deleted: trunk/libcommons-attributes-java/debian/doc-base
===================================================================
--- trunk/libcommons-attributes-java/debian/doc-base 2009-11-23 23:36:32 UTC
(rev 11108)
+++ trunk/libcommons-attributes-java/debian/doc-base 2009-11-24 00:12:38 UTC
(rev 11109)
@@ -1,8 +0,0 @@
-Document: libcommons-attributes-java
-Title: adds C#/.Net-style attributes to Java code
-Author: The Apache Software Foundation
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libcommons-attributes-java/index.html
-Files: /usr/share/doc/libcommons-attributes-java/*.html
Modified: trunk/libcommons-attributes-java/debian/docs
===================================================================
--- trunk/libcommons-attributes-java/debian/docs 2009-11-23 23:36:32 UTC
(rev 11108)
+++ trunk/libcommons-attributes-java/debian/docs 2009-11-24 00:12:38 UTC
(rev 11109)
@@ -1,2 +1 @@
-dist/docs/api/*
README.html
Copied:
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.doc-base
(from rev 11105, trunk/libcommons-attributes-java/debian/doc-base)
===================================================================
---
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.doc-base
(rev 0)
+++
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.doc-base
2009-11-24 00:12:38 UTC (rev 11109)
@@ -0,0 +1,8 @@
+Document: libcommons-attributes-java
+Title: adds C#/.Net-style attributes to Java code
+Author: The Apache Software Foundation
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-attributes-java/api/index.html
+Files: /usr/share/doc/libcommons-attributes-java/api/*.html
Copied:
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.install
(from rev 11105, trunk/libcommons-attributes-java/debian/docs)
===================================================================
---
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.install
(rev 0)
+++
trunk/libcommons-attributes-java/debian/libcommons-attributes-java-doc.install
2009-11-24 00:12:38 UTC (rev 11109)
@@ -0,0 +1 @@
+dist/docs/api/* /usr/share/doc/libcommons-attributes-java/api/
Added: trunk/libcommons-attributes-java/debian/libcommons-attributes-java.poms
===================================================================
--- trunk/libcommons-attributes-java/debian/libcommons-attributes-java.poms
(rev 0)
+++ trunk/libcommons-attributes-java/debian/libcommons-attributes-java.poms
2009-11-24 00:12:38 UTC (rev 11109)
@@ -0,0 +1,3 @@
+debian/poms/api.xml
+debian/poms/compiler.xml
+debian/poms/plugin.xml
Added: trunk/libcommons-attributes-java/debian/maven.rules
===================================================================
--- trunk/libcommons-attributes-java/debian/maven.rules
(rev 0)
+++ trunk/libcommons-attributes-java/debian/maven.rules 2009-11-24 00:12:38 UTC
(rev 11109)
@@ -0,0 +1,3 @@
+s/ant/org.apache.ant/ * * s/.*/debian/
+s/qdox/com.thoughtworks.qdox/ qdox jar s/.*/debian/
+
Added: trunk/libcommons-attributes-java/debian/poms/api.xml
===================================================================
--- trunk/libcommons-attributes-java/debian/poms/api.xml
(rev 0)
+++ trunk/libcommons-attributes-java/debian/poms/api.xml 2009-11-24
00:12:38 UTC (rev 11109)
@@ -0,0 +1,18 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-api</artifactId>
+ <version>2.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/libcommons-attributes-java/debian/poms/compiler.xml
===================================================================
--- trunk/libcommons-attributes-java/debian/poms/compiler.xml
(rev 0)
+++ trunk/libcommons-attributes-java/debian/poms/compiler.xml 2009-11-24
00:12:38 UTC (rev 11109)
@@ -0,0 +1,34 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-compiler</artifactId>
+ <version>2.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <!-- NOTE: This will not be activated on OS X, since classes.jar already
has the tools in it. -->
+ <id>default-tools.jar</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.4.2</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+</project>
Added: trunk/libcommons-attributes-java/debian/poms/plugin.xml
===================================================================
--- trunk/libcommons-attributes-java/debian/poms/plugin.xml
(rev 0)
+++ trunk/libcommons-attributes-java/debian/poms/plugin.xml 2009-11-24
00:12:38 UTC (rev 11109)
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-plugin</artifactId>
+ <version>2.2</version>
+</project>
\ No newline at end of file
Modified: trunk/libcommons-attributes-java/debian/rules
===================================================================
--- trunk/libcommons-attributes-java/debian/rules 2009-11-23 23:36:32 UTC
(rev 11108)
+++ trunk/libcommons-attributes-java/debian/rules 2009-11-24 00:12:38 UTC
(rev 11109)
@@ -4,16 +4,27 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+POM_VERSION := 2.1
+MAVEN_REPO :=
http://repository.sonatype.org/service/local/repositories/central/content
+
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILD_TARGET := javadoc
DEB_JARS := qdox
-BASE := /usr/share/java/commons-attributes-
install/libcommons-attributes-java::
- dh_link $(BASE)api-$(DEB_UPSTREAM_VERSION).jar $(BASE)api.jar
- dh_link $(BASE)compiler-$(DEB_UPSTREAM_VERSION).jar $(BASE)compiler.jar
- dh_link $(BASE)plugin-$(DEB_UPSTREAM_VERSION).jar $(BASE)plugin.jar
+ mh_installpoms -plibcommons-attributes-java
+ mh_installjar -plibcommons-attributes-java -l debian/poms/api.xml
target/commons-attributes-api-$(DEB_UPSTREAM_VERSION).jar
+ mh_installjar -plibcommons-attributes-java -l debian/poms/compiler.xml
target/commons-attributes-compiler-$(DEB_UPSTREAM_VERSION).jar
+ mh_installjar -plibcommons-attributes-java -l debian/poms/plugin.xml
target/commons-attributes-plugin-$(DEB_UPSTREAM_VERSION).jar
+clean::
+ -rm -rf debian/tmp
+
get-orig-source:
-uscan --upstream-version 0
+get-orig-pom:
+ wget -O debian/poms/api.xml
$(MAVEN_REPO)/commons-attributes/commons-attributes-api/$(POM_VERSION)/commons-attributes-api-$(POM_VERSION).pom
+ wget -O debian/poms/compiler.xml
$(MAVEN_REPO)/commons-attributes/commons-attributes-compiler/$(POM_VERSION)/commons-attributes-compiler-$(POM_VERSION).pom
+ wget -O debian/poms/plugin.xml
$(MAVEN_REPO)/commons-attributes/commons-attributes-plugin/$(POM_VERSION)/commons-attributes-plugin-$(POM_VERSION).pom
+ perl -p -i -e
's/<version>$(POM_VERSION)/<version>$(DEB_UPSTREAM_VERSION)/' debian/poms/*.xml
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
