Re: libhibernate-validator-java debdiff

[Ludovic Claude]

Yes, please add the --java-lib option to hibernate-validator, this will
install hibernate-validator.jar to /usr/share/java

Ludovic

On 28/05/2012 13:55, Steffen Möller wrote:
 Hi Charles,
 
 On 05/28/2012 01:23 PM, Charles Plessy wrote:
 Le Sat, May 26, 2012 at 06:45:06PM +0200, Steffen Möller a écrit :

 It is Californian weather these days over Germany. And we have a holiday on 
 Monday, which basically brings the country to a
 standstill. I am still without my key, so I cannot do a team upload and 
 thought about helping just by putting Brian's
 changes into the pkg-java repository ... paired with the suggestion for 
 Brian not to be shy and commit his stuff.

 Just, while I was at it, I learned the hard way that Brian's patch was 
 against version 4.0.2.GA-6 (as in unstable) but the
 changelog in pkg-java only features 4.0.2.GA-3. Brian's patch does not 
 apply for that reason.

 @Thorsten, is it OK to overwrite the git repository with what we get 
 through apt-get source and then apply Brian's diff?
 Charles had already offered to help out with sponsoring, so, hoping for 
 some rain over Japan where Charles is living,
 please tell us if you appreciate some extra hands.

 Hi all,

 I could not find Brian's version in his PPAs.
 
 I have forwarded Brian's original email to Charles in a separate email.
 
 By the way, the Ubuntu version has this small change:

 --- 
 libhibernate-validator-java-4.0.2.GA/debian/libhibernate-validator-java.poms 
 2012-01-16 02:11:14.0 + +++
 libhibernate-validator-java-4.0.2.GA/debian/libhibernate-validator-java.poms 
 2012-04-18 17:41:47.0 + @@ -1,5 +1,5
 @@ pom.xml -hibernate-validator/pom.xml +hibernate-validator/pom.xml 
 --java-lib hibernate-validator-archetype/pom.xml
 --ignore hibernate-validator-legacy/pom.xml --ignore 
 hibernate-validator-tck-runner/pom.xml --ignore

 Should it be applied to Debian as well ?
 
 I admit not to know the answer. Brian is good at all this and can tell, I 
 presume. It is not in his patch from what I saw. Thank
 you for spotting that. We should find a way to integrate the person behind 
 the Ubuntu work with pkg-java, I presume.
 
 libhibernate-validator-java (4.0.2.GA-6ubuntu1) precise; urgency=low
 
   * Fix missing jar file from /usr/share/java.
  -- Onkar Shinde email address hidden   Wed, 18 Apr 2012 22:56:21 +0530
 
 
 It sounds a bit like Onkar (CCed) was addressing a bit of the same that Brian 
 addressed. So, let us hope for Torsten not to have
 the typical vacation, @Brian: please consider updating your patch with the 
 hindsight of the Ubuntu patch, so we can possibly
 coordinate our eyeballs' attention a bit in future releases, and just some 
 friendly hello to everyone.
 
 Steffen
 
 
 
 __
 This is the maintainer address of Debian's Java team
 http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
  Please use
 debian-j...@lists.debian.org for discussions and questions.
 

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[SCM] Sun multi-schema XML validator branch, master, updated. debian/2009.1+dfsg1-3-4-g84717ee

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 8fc3c89d0803e2a6f255ef11dc3e3ca5a0047937
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon May 7 22:40:34 2012 +0200

Add --no-parent option to the parent POM

diff --git a/debian/changelog b/debian/changelog
index b8cfd92..c3c719c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 msv (2009.1+dfsg1-4) UNRELEASED; urgency=low
 
+  [Tony Mancill]
   * Team upload.
   * Update Vcs-Git URL in d/control.
 
+  [Ludovic Claude]
+  * Add --no-parent option to the parent POM
+
  -- tony mancill tmanc...@debian.org  Wed, 02 May 2012 22:56:58 -0700
 
 msv (2009.1+dfsg1-3) unstable; urgency=low
diff --git a/debian/libmsv-java.poms b/debian/libmsv-java.poms
index 2f62a16..b5ac893 100644
--- a/debian/libmsv-java.poms
+++ b/debian/libmsv-java.poms
@@ -23,10 +23,11 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To 
use with POM files that are created
 # temporarily for certain artifacts such as Javadoc jars.
 #
-pom.xml --java-lib
+pom.xml --java-lib --no-parent
 parent/pom.xml --java-lib
 xsdlib/pom.xml --java-lib
 testharness/pom.xml --java-lib
 msv/pom.xml --java-lib
 rngconverter/pom.xml --java-lib
 relames/pom.xml --java-lib
+

-- 
Sun multi-schema XML validator

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Sun multi-schema XML validator branch, master, updated. debian/2009.1+dfsg1-3-4-g84717ee

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 84717ee01361aa9bfad0a6f58e65cdf534a7d178
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Wed May 9 00:02:15 2012 +0200

Ignore relames subproject

diff --git a/debian/changelog b/debian/changelog
index 391c37e..4bcb359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ msv (2009.1+dfsg1-4) UNRELEASED; urgency=low
   [Ludovic Claude]
   * Add --no-parent option to the parent POM,
   * Add --has-package-version to all POM files.
-  * Add patch to fix the version in relnames/pom.xml
+  * Ignore relames subproject
 
  -- tony mancill tmanc...@debian.org  Wed, 02 May 2012 22:56:58 -0700
 
diff --git a/debian/libmsv-java.poms b/debian/libmsv-java.poms
index 9db345d..4f12ce2 100644
--- a/debian/libmsv-java.poms
+++ b/debian/libmsv-java.poms
@@ -29,5 +29,6 @@ xsdlib/pom.xml --java-lib --has-package-version
 testharness/pom.xml --java-lib --has-package-version
 msv/pom.xml --java-lib --has-package-version
 rngconverter/pom.xml --java-lib --has-package-version
-relames/pom.xml --java-lib --has-package-version
+relames/pom.xml --ignore
+
 

-- 
Sun multi-schema XML validator

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Sun multi-schema XML validator branch, master, updated. debian/2009.1+dfsg1-3-4-g84717ee

[Ludovic Claude]

The following commit has been merged in the master branch:
commit f031ff5e7d2260772339746ba0d853f40cd7c3f1
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon May 7 22:50:44 2012 +0200

Add --has-package-version to all POM files

diff --git a/debian/changelog b/debian/changelog
index c3c719c..391c37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ msv (2009.1+dfsg1-4) UNRELEASED; urgency=low
   * Update Vcs-Git URL in d/control.
 
   [Ludovic Claude]
-  * Add --no-parent option to the parent POM
+  * Add --no-parent option to the parent POM,
+  * Add --has-package-version to all POM files.
+  * Add patch to fix the version in relnames/pom.xml
 
  -- tony mancill tmanc...@debian.org  Wed, 02 May 2012 22:56:58 -0700
 
diff --git a/debian/libmsv-java.poms b/debian/libmsv-java.poms
index b5ac893..9db345d 100644
--- a/debian/libmsv-java.poms
+++ b/debian/libmsv-java.poms
@@ -23,11 +23,11 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To 
use with POM files that are created
 # temporarily for certain artifacts such as Javadoc jars.
 #
-pom.xml --java-lib --no-parent
-parent/pom.xml --java-lib
-xsdlib/pom.xml --java-lib
-testharness/pom.xml --java-lib
-msv/pom.xml --java-lib
-rngconverter/pom.xml --java-lib
-relames/pom.xml --java-lib
+pom.xml --java-lib --no-parent --has-package-version
+parent/pom.xml --java-lib --has-package-version
+xsdlib/pom.xml --java-lib --has-package-version
+testharness/pom.xml --java-lib --has-package-version
+msv/pom.xml --java-lib --has-package-version
+rngconverter/pom.xml --java-lib --has-package-version
+relames/pom.xml --java-lib --has-package-version
 

-- 
Sun multi-schema XML validator

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. 1db8c22b7a5c5933447e1b41c6308177ca70045c

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 1db8c22b7a5c5933447e1b41c6308177ca70045c
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun May 6 22:58:56 2012 +0200

Update list of packages on 06/05/2012

diff --git a/.gitignore b/.gitignore
index acaeb15..eb0568b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -221,9 +221,11 @@ maven
 maven-ant-tasks
 maven-antrun-extended-plugin
 maven-bundle-plugin
+maven-debian-helper
 maven-enforcer
 maven-hpi-plugin
 maven-project-info-reports-plugin
+maven-repo-helper
 maven-shared-jar
 maven-stapler-plugin
 metainf-services
@@ -298,7 +300,6 @@ xhtmlrenderer
 xmlbeans-maven-plugin
 yecht
 yydebug
-zkclient
 zookeeper
 .mrconfig~
 *.log
diff --git a/.mrconfig b/.mrconfig
index 1f41fe0..7aedaa9 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -687,6 +687,9 @@ checkout = git_checkout maven-antrun-extended-plugin
 [maven-bundle-plugin]
 checkout = git_checkout maven-bundle-plugin
 
+[maven-debian-helper]
+checkout = git_checkout maven-debian-helper
+
 [maven-enforcer]
 checkout = git_checkout maven-enforcer
 
@@ -696,6 +699,9 @@ checkout = git_checkout maven-hpi-plugin
 [maven-project-info-reports-plugin]
 checkout = git_checkout maven-project-info-reports-plugin
 
+[maven-repo-helper]
+checkout = git_checkout maven-repo-helper
+
 [maven-shared-jar]
 checkout = git_checkout maven-shared-jar
 
@@ -918,9 +924,6 @@ checkout = git_checkout yecht
 [yydebug]
 checkout = git_checkout yydebug
 
-[zkclient]
-checkout = git_checkout zkclient
-
 [zookeeper]
 checkout = git_checkout zookeeper
 

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#644259: Please switch to Git maven-repo-helper and maven-debian-helper

[Ludovic Claude]

Thanks a lot Thomas, I was about to do the switch myself but the bad
way, ignoring all previous history...

Ludovic

On 06/05/2012 14:47, Thomas Koch wrote:
 Hi Ludovic,
 
 happy election day! :-)
 
 I had to write my bachelor thesis, so this task slept for a while. The repos 
 are now converted:
 
 http://anonscm.debian.org/gitweb/?p=pkg-java/maven-repo-helper.git
 http://anonscm.debian.org/gitweb/?p=pkg-java/maven-debian-helper.git
 
 I also added some svn-git conversion hints to:
 http://wiki.debian.org/Java/JavaGit
 
 I propose you close this bug with the next upload when you also switched the 
 VCS-* fields in debian/control. You might also want to remove them from SVN.
 
 Regards,
 
 Thomas Koch, http://www.koch.ro
 



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r16042 - trunk/maven-repo-helper

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-05-06 21:49:30 + (Sun, 06 May 2012)
New Revision: 16042

Added:
   trunk/maven-repo-helper/MOVED-TO-GIT
Removed:
   trunk/maven-repo-helper/debian/
   trunk/maven-repo-helper/doc/
   trunk/maven-repo-helper/pom.xml
   trunk/maven-repo-helper/src/
Log:
Move maven-repo-helper to Git repository

Added: trunk/maven-repo-helper/MOVED-TO-GIT
===
--- trunk/maven-repo-helper/MOVED-TO-GIT(rev 0)
+++ trunk/maven-repo-helper/MOVED-TO-GIT2012-05-06 21:49:30 UTC (rev 
16042)
@@ -0,0 +1 @@
+Moved to Git repository at git.debian.org/git/pkg-java/maven-repo-helper.git

Deleted: trunk/maven-repo-helper/pom.xml
===
--- trunk/maven-repo-helper/pom.xml 2012-05-05 10:18:33 UTC (rev 16041)
+++ trunk/maven-repo-helper/pom.xml 2012-05-06 21:49:30 UTC (rev 16042)
@@ -1,82 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
-modelVersion4.0.0/modelVersion
-groupIdorg.debian.maven/groupId
-artifactIdmaven-repo-helper/artifactId
-nameMaven Repo helper/name
-packagingjar/packaging
-version1.7.1/version
-descriptionProvides support for managing the Maven repository in a 
Debian distribution./description
-
-inceptionYear2009/inceptionYear
-urlhttps://code.launchpad.net/maven-packaging-support//url
-licenses
-license
-nameBSD/name
-urlhttp://opensource.org/licenses/bsd-license.php/url
-distributionrepo/distribution
-/license
-/licenses
-developers
-developer
-nameLudovic Claude/name
-emailludovic.cla...@laposte.net/email
-roles
-roleDeveloper/role
-/roles
-timezone+0/timezone
-/developer
-/developers
-
-issueManagement
-systemlaunchpad/system
-urlhttps://bugs.launchpad.net/maven-packaging-support/url
-/issueManagement
-scm
-
connectionscm:bzr:lp:~ludovicc/maven-packaging-support/maven-repo-helper/connection
-
developerConnectionscm:bzr:lp:~ludovicc/maven-packaging-support/maven-repo-helper/developerConnection
-
urlhttp://bazaar.launchpad.net/~ludovicc/maven-packaging-support/maven-repo-helper/files/url
-/scm
-
-build
-plugins
-plugin
-artifactIdmaven-compiler-plugin/artifactId
-configuration
-source1.5/source
-target1.5/target
-/configuration
-/plugin
-plugin
-artifactIdmaven-surefire-plugin/artifactId
-configuration
-  includes
-include**/*Test.java/include
-  /includes
-/configuration
-/plugin
-/plugins
-/build
-
-dependencies
-dependency
-groupIdjunit/groupId
-artifactIdjunit/artifactId
-version3.8.2/version
-scopetest/scope
-/dependency
-dependency
-groupIdxmlunit/groupId
-artifactIdxmlunit/artifactId
-version1.2/version
-scopetest/scope
-/dependency
-dependency
-groupIdcommons-io/groupId
-artifactIdcommons-io/artifactId
-version1.4/version
-scopetest/scope
-/dependency
-/dependencies
-
-/project


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. 28f065a1a7cc14255795723daa0e64d3ce0e8d59

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 28f065a1a7cc14255795723daa0e64d3ce0e8d59
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Thu May 3 23:02:35 2012 +0200

Update list of packages on 03/05/2012

diff --git a/.gitignore b/.gitignore
index daf863b..acaeb15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,7 +159,9 @@ libbytelist-java
 libclucy-clojure
 libcommons-lang3-java
 libconcurrentlinkedhashmap-java
+libfontbox-java
 libgettext-commons-java
+libglazedlists-java
 libgoogle-gson-java
 libgpars-groovy-java
 libhibernate-commons-annotations-java
@@ -171,23 +173,35 @@ libisnativec-java
 libjackson-json-java
 libjava-jdbc-clojure
 libjbcrypt-java
+libjempbox-java
 libjenkins-svnkit-java
+libjgoodies-common-java
+libjgoodies-looks-java
+libjgraph-java
 libjna-java
+libjpf-java
+libjpfcodegen-java
 libjsr166y-java
 libjsr305-java
 libjsr311-api-java
 libjsyntaxpane-java
 libjtype-java
+libjxp-java
 libmatthew-java
+libmicroba-java
 libnb-javaparser-java
 libnb-platform-java
 libnb-svnclientadapter-java
+libonemind-commons-invoke-java
+libonemind-commons-java-java
 libpam4j
+libpdfbox-java
 libpjl-comp-filter-java
 librelaxng-datatype-java
 librobert-hooke-clojure
 libsequence-library-java
 libsmack-java
+libspin-java
 libspring-ldap-java
 libspring-security-2.0-java
 libspring-security-java
@@ -260,6 +274,7 @@ sweethome3d
 swt-gtk
 swt-paperclips
 swtcalendar
+swtchart
 testng
 tiger-types
 tomcat6
diff --git a/.mrconfig b/.mrconfig
index d588765..1f41fe0 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -500,9 +500,15 @@ checkout = git_checkout libcommons-lang3-java
 [libconcurrentlinkedhashmap-java]
 checkout = git_checkout libconcurrentlinkedhashmap-java
 
+[libfontbox-java]
+checkout = git_checkout libfontbox-java
+
 [libgettext-commons-java]
 checkout = git_checkout libgettext-commons-java
 
+[libglazedlists-java]
+checkout = git_checkout libglazedlists-java
+
 [libgoogle-gson-java]
 checkout = git_checkout libgoogle-gson-java
 
@@ -536,13 +542,31 @@ checkout = git_checkout libjava-jdbc-clojure
 [libjbcrypt-java]
 checkout = git_checkout libjbcrypt-java
 
+[libjempbox-java]
+checkout = git_checkout libjempbox-java
+
 [libjenkins-svnkit-java]
 svn_test = false
 checkout = git_checkout libjenkins-svnkit-java
 
+[libjgoodies-common-java]
+checkout = git_checkout libjgoodies-common-java
+
+[libjgoodies-looks-java]
+checkout = git_checkout libjgoodies-looks-java
+
+[libjgraph-java]
+checkout = git_checkout libjgraph-java
+
 [libjna-java]
 checkout = git_checkout libjna-java
 
+[libjpf-java]
+checkout = git_checkout libjpf-java
+
+[libjpfcodegen-java]
+checkout = git_checkout libjpfcodegen-java
+
 [libjsr166y-java]
 checkout = git_checkout libjsr166y-java
 
@@ -558,9 +582,15 @@ checkout = git_checkout libjsyntaxpane-java
 [libjtype-java]
 checkout = git_checkout libjtype-java
 
+[libjxp-java]
+checkout = git_checkout libjxp-java
+
 [libmatthew-java]
 checkout = git_checkout libmatthew-java
 
+[libmicroba-java]
+checkout = git_checkout libmicroba-java
+
 [libnb-javaparser-java]
 checkout = git_checkout libnb-javaparser-java
 
@@ -570,9 +600,18 @@ checkout = git_checkout libnb-platform-java
 [libnb-svnclientadapter-java]
 checkout = git_checkout libnb-svnclientadapter-java
 
+[libonemind-commons-invoke-java]
+checkout = git_checkout libonemind-commons-invoke-java
+
+[libonemind-commons-java-java]
+checkout = git_checkout libonemind-commons-java-java
+
 [libpam4j]
 checkout = git_checkout libpam4j
 
+[libpdfbox-java]
+checkout = git_checkout libpdfbox-java
+
 [libpjl-comp-filter-java]
 checkout = git_checkout libpjl-comp-filter-java
 
@@ -588,6 +627,9 @@ checkout = git_checkout libsequence-library-java
 [libsmack-java]
 checkout = git_checkout libsmack-java
 
+[libspin-java]
+checkout = git_checkout libspin-java
+
 [libspring-ldap-java]
 checkout = git_checkout libspring-ldap-java
 
@@ -804,6 +846,9 @@ checkout = git_checkout swt-paperclips
 [swtcalendar]
 checkout = git_checkout swtcalendar
 
+[swtchart]
+checkout = git_checkout swtchart
+
 [testng]
 checkout = git_checkout testng
 

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r16039 - trunk/maven-debian-helper/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-05-03 22:51:35 + (Thu, 03 May 2012)
New Revision: 16039

Modified:
   trunk/maven-debian-helper/debian/changelog
Log:
releasing version 1.5.1

Modified: trunk/maven-debian-helper/debian/changelog
===
--- trunk/maven-debian-helper/debian/changelog  2012-05-03 18:16:15 UTC (rev 
16038)
+++ trunk/maven-debian-helper/debian/changelog  2012-05-03 22:51:35 UTC (rev 
16039)
@@ -1,4 +1,4 @@
-maven-debian-helper (1.5.1) UNRELEASED; urgency=low
+maven-debian-helper (1.5.1) unstable; urgency=low
 
   * d/control: update version constraint on maven-repo-helper
 (Closes: #657889)
@@ -15,7 +15,7 @@
   * Rename plugin maven-debian-plugin as debian-maven-plugin to adhere to
 Maven naming conventions.
 
- -- Ludovic Claude ludovic.cla...@laposte.net  Mon, 30 Jan 2012 23:46:27 
+0100
+ -- Ludovic Claude ludovic.cla...@laposte.net  Fri, 04 May 2012 00:51:14 
+0200
 
 maven-debian-helper (1.5) unstable; urgency=low
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. 6bb625d6e1c91c19943d6486963117302ec9b012

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 6bb625d6e1c91c19943d6486963117302ec9b012
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sat Apr 21 00:10:15 2012 +0200

Update list of packages on 21/04/2012

diff --git a/.gitignore b/.gitignore
index a024d75..daf863b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,6 +132,7 @@ jenkins-winstone
 jenkins-xstream
 jesd
 jets3t
+jetty8
 jffi
 jfugue
 jigsaw
diff --git a/.mrconfig b/.mrconfig
index e05d079..d588765 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -418,6 +418,9 @@ checkout = git_checkout jesd
 [jets3t]
 checkout = git_checkout jets3t
 
+[jetty8]
+checkout = git_checkout jetty8
+
 [jffi]
 checkout = git_checkout jffi
 

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15966 - trunk/libquartz-java/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-04-19 21:33:07 + (Thu, 19 Apr 2012)
New Revision: 15966

Removed:
   trunk/libquartz-java/debian/patches/
Modified:
   trunk/libquartz-java/debian/changelog
   trunk/libquartz-java/debian/maven.ignoreRules
   trunk/libquartz-java/debian/maven.rules
Log:
* maven.rules: update junit rule to rename artifact junit-dep into junit
* maven.ignoreRules: add org.apache.derby:derby to the list of ignored
  dependencies
* remove debian/patches as the Maven rules have the same effect.

Modified: trunk/libquartz-java/debian/changelog
===
--- trunk/libquartz-java/debian/changelog   2012-04-18 20:16:27 UTC (rev 
15965)
+++ trunk/libquartz-java/debian/changelog   2012-04-19 21:33:07 UTC (rev 
15966)
@@ -1,3 +1,12 @@
+libquartz-java (2.1.3-2) UNRELEASED; urgency=low
+
+  * maven.rules: update junit rule to rename artifact junit-dep into junit
+  * maven.ignoreRules: add org.apache.derby:derby to the list of ignored
+dependencies
+  * remove debian/patches as the Maven rules have the same effect.
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Wed, 18 Apr 2012 01:17:01 
+0200
+
 libquartz-java (2.1.3-1) unstable; urgency=low
 
   * New upstream. Closes: #667598

Modified: trunk/libquartz-java/debian/maven.ignoreRules
===
--- trunk/libquartz-java/debian/maven.ignoreRules   2012-04-18 20:16:27 UTC 
(rev 15965)
+++ trunk/libquartz-java/debian/maven.ignoreRules   2012-04-19 21:33:07 UTC 
(rev 15966)
@@ -19,3 +19,5 @@
 org.apache.maven.plugins maven-source-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
 org.codehaus.mojo rmic-maven-plugin * * * *
+org.apache.derby derby * * * *
+

Modified: trunk/libquartz-java/debian/maven.rules
===
--- trunk/libquartz-java/debian/maven.rules 2012-04-18 20:16:27 UTC (rev 
15965)
+++ trunk/libquartz-java/debian/maven.rules 2012-04-19 21:33:07 UTC (rev 
15966)
@@ -18,7 +18,7 @@
 
 asm asm jar s/3\..*/3.x/ * *
 junit junit jar s/3\..*/3.x/ * *
-junit junit jar s/4\..*/4.x/ * *
+junit s/junit-dep/junit jar s/4\..*/4.x/ * *
 log4j log4j jar s/1\.2.*/1.2.x/ * *
 org.quartz-scheduler quartz-backward-compat jar s/.*/debian/ * *
 org.quartz-scheduler quartz-parent pom s/.*/debian/ * *


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#667598:

[Ludovic Claude]

2.1.4 has appeared on the Maven repository.

On 09/04/2012 15:11, Mathieu Malaterre wrote:
 maven cannot find 2.1.4, so I'll be packaging 2.1.3 instead:
 
 http://repo1.maven.org/maven2/org/quartz-scheduler/quartz/
 



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r15958 - trunk/jtidy/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-04-17 22:10:52 + (Tue, 17 Apr 2012)
New Revision: 15958

Modified:
   trunk/jtidy/debian/changelog
   trunk/jtidy/debian/control
   trunk/jtidy/debian/libjtidy-java.poms
Log:
* fix RC critical bug on jtidy


Modified: trunk/jtidy/debian/changelog
===
--- trunk/jtidy/debian/changelog2012-04-17 04:13:59 UTC (rev 15957)
+++ trunk/jtidy/debian/changelog2012-04-17 22:10:52 UTC (rev 15958)
@@ -1,3 +1,15 @@
+jtidy (7+svn20110807-4) unstable; urgency=low
+
+  * Team upload
+  * Add --java-lib option to install jtidy jar in
+/usr/share/java (closes: #667016)
+  * d/control:
+- update Standard-Version to 3.9.3, no changes
+- remove Michael Koch from the list of uploaders
+  (closes: #654040)
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Wed, 18 Apr 2012 00:04:05 
+0200
+
 jtidy (7+svn20110807-3) unstable; urgency=low
 
   [ Miguel Landaeta ]

Modified: trunk/jtidy/debian/control
===
--- trunk/jtidy/debian/control  2012-04-17 04:13:59 UTC (rev 15957)
+++ trunk/jtidy/debian/control  2012-04-17 22:10:52 UTC (rev 15958)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (= 
1.4)
 Build-Depends-Indep: libmaven-javadoc-plugin-java, junit4, liblog4j1.2-java, 
libslf4j-java,  
  default-jdk-doc, ant, ant-doc 
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jtidy
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jtidy
 Homepage: http://jtidy.sourceforge.net/

Modified: trunk/jtidy/debian/libjtidy-java.poms
===
--- trunk/jtidy/debian/libjtidy-java.poms   2012-04-17 04:13:59 UTC (rev 
15957)
+++ trunk/jtidy/debian/libjtidy-java.poms   2012-04-17 22:10:52 UTC (rev 
15958)
@@ -23,4 +23,4 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To 
use with POM files that are created
 # temporarily for certain artifacts such as Javadoc jars.
 #
-pom.xml
+pom.xml --java-lib


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15959 - trunk/jtidy/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-04-17 22:34:17 + (Tue, 17 Apr 2012)
New Revision: 15959

Removed:
   trunk/jtidy/debian/patches/
Modified:
   trunk/jtidy/debian/changelog
   trunk/jtidy/debian/rules
Log:
remove patch to force version in POM as it did not
apply cleanly and use option in maven.mk instead

Modified: trunk/jtidy/debian/changelog
===
--- trunk/jtidy/debian/changelog2012-04-17 22:10:52 UTC (rev 15958)
+++ trunk/jtidy/debian/changelog2012-04-17 22:34:17 UTC (rev 15959)
@@ -7,6 +7,8 @@
 - update Standard-Version to 3.9.3, no changes
 - remove Michael Koch from the list of uploaders
   (closes: #654040)
+  * remove patch to force version in POM as it did not
+apply cleanly and use option in maven.mk instead
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Wed, 18 Apr 2012 00:04:05 
+0200
 

Modified: trunk/jtidy/debian/rules
===
--- trunk/jtidy/debian/rules2012-04-17 22:10:52 UTC (rev 15958)
+++ trunk/jtidy/debian/rules2012-04-17 22:34:17 UTC (rev 15959)
@@ -4,4 +4,4 @@
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-
+DEB_PATCHPOMS_ARGS := --set-version=$(DEB_UPSTREAM_VERSION)


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15960 - trunk/jtidy/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-04-17 22:39:37 + (Tue, 17 Apr 2012)
New Revision: 15960

Modified:
   trunk/jtidy/debian/changelog
Log:
releasing version 7+svn20110807-4

Modified: trunk/jtidy/debian/changelog
===
--- trunk/jtidy/debian/changelog2012-04-17 22:34:17 UTC (rev 15959)
+++ trunk/jtidy/debian/changelog2012-04-17 22:39:37 UTC (rev 15960)
@@ -10,7 +10,7 @@
   * remove patch to force version in POM as it did not
 apply cleanly and use option in maven.mk instead
 
- -- Ludovic Claude ludovic.cla...@laposte.net  Wed, 18 Apr 2012 00:04:05 
+0200
+ -- Ludovic Claude ludovic.cla...@laposte.net  Wed, 18 Apr 2012 00:38:44 
+0200
 
 jtidy (7+svn20110807-3) unstable; urgency=low
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] objenesis - Java library to instantiate a new object of a particular class branch, master, updated. debian/1.2+full-1-4-g17412a8

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 5725bdc06bd8d21de1d2e0c1937f01f98decc713
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Apr 10 01:08:16 2012 +0200

remove patch to ignore tck module, as d/libobjenensis-java.poms 
configuration takes care of this issue already.

diff --git a/debian/changelog b/debian/changelog
index 7f8b0f7..b240a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ objenesis (1.2+full-2) unstable; urgency=low
 to install objenesis jar in /usr/share/java (Closes: #667000)
   * d/libobjenensis-java.poms: ignore tck module
   * d/copyright: update to spec 1.0, fix Source to indicate correct location
+  * remove patch to ignore tck module, as d/libobjenensis-java.poms
+configuration takes care of this issue already.
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Sat, 07 Apr 2012 00:43:35 
+0200
 
diff --git a/debian/patches/0001-do-not-build-the-tck-module.patch 
b/debian/patches/0001-do-not-build-the-tck-module.patch
deleted file mode 100644
index c0da11a..000
--- a/debian/patches/0001-do-not-build-the-tck-module.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Torsten Werner twer...@debian.org
-Date: Sun, 18 Sep 2011 21:36:17 +0200
-Subject: do not build the tck module
-

- pom.xml |1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index e438dce..0985c25 100644
 a/pom.xml
-+++ b/pom.xml
-@@ -27,7 +27,6 @@ limitations under the License.
- 
-   modules
- modulemain/module
--moduletck/module
-   /modules
- 
-   licenses
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 990e67c..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-do-not-build-the-tck-module.patch

-- 
objenesis - Java library to instantiate a new object of a particular class

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] objenesis - Java library to instantiate a new object of a particular class branch, master, updated. debian/1.2+full-1-4-g17412a8

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 17412a8dd399b4c7215b0695d44ed17ee60c3607
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Apr 10 01:11:56 2012 +0200

d/control: update Standards-Version: 3.9.3, no change.

diff --git a/debian/changelog b/debian/changelog
index b240a8a..372f183 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ objenesis (1.2+full-2) unstable; urgency=low
   * d/copyright: update to spec 1.0, fix Source to indicate correct location
   * remove patch to ignore tck module, as d/libobjenensis-java.poms
 configuration takes care of this issue already.
+  * d/control: update Standards-Version: 3.9.3, no change.
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Sat, 07 Apr 2012 00:43:35 
+0200
 
diff --git a/debian/control b/debian/control
index 3cf1007..0ec0d34 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers 
pkg-java-maintain...@lists.alioth.debian.or
 Uploaders: Gabriele Giacone 1o5g4...@gmail.com
 Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (= 
1.4)
 Build-Depends-Indep: libmaven-javadoc-plugin-java, junit (= 3.8.2), 
default-jdk-doc 
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-java/objenesis.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/objenesis.git
 Homepage: http://www.objenesis.org/

-- 
objenesis - Java library to instantiate a new object of a particular class

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] objenesis - Java library to instantiate a new object of a particular class branch, master, updated. debian/1.2+full-1-2-g3d2c0d8

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 3d2c0d82b514a5ef059f5b30b8a75c41a557e044
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Apr 10 00:49:12 2012 +0200

Release

diff --git a/debian/changelog b/debian/changelog
index aa7c69b..7f8b0f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-objenesis (1.2+full-2) UNRELEASED; urgency=low
+objenesis (1.2+full-2) unstable; urgency=low
 
   * Team upload
   * Apply patch from Moritz Mühlenhoff muehlenh...@univention.de

-- 
objenesis - Java library to instantiate a new object of a particular class

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] objenesis - Java library to instantiate a new object of a particular class annotated tag, debian/1.2+full-2, created. debian/1.2+full-2

[Ludovic Claude]

The annotated tag, debian/1.2+full-2 has been created
at  2b5abf15e72a9adbbb4cca224c95a0986084c078 (tag)
   tagging  17412a8dd399b4c7215b0695d44ed17ee60c3607 (commit)
  replaces  debian/1.2+full-1
 tagged by  Ludovic Claude
on  Tue Apr 10 01:21:19 2012 +0200

- Shortlog 
Debian release 1.2+full-2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAABCAAGBQJPg27vAAoJEPaAYIVIMh14xwMIAIFib1qSN5eZao3cgY05lMHv
dt7vNDGLklHjeJBTkxbmwwgkK6tsw586lQDGrzEhG09eyTGSddZBX2OwFxhGNJtJ
CQ/Kd9QJU66P9nAJPMh2jXc7B8NIq0t3MUixQSvNSLqSv3CiWvP6oJ92OVTIDuep
yf2NsWq0w7MQw0D50aBxruCm2Y7BsEPkuuJYDxLiSgkBd3Gle1FETsq6v3aGKeOQ
fccsCyzqfBi3xSaogJyN2vjSBF1FVCIgAwQyBVGyzB+yF8OJRzw1sgLoNUVFuD09
sVkcMQM+3wGae5q2IVUc4O3TsBU7HTs9mGrOmGE0jaUrcQBjfLrPjykGNl2C5Hs=
=6/4y
-END PGP SIGNATURE-

Ludovic Claude (4):
  * Apply patch from Moritz Mühlenhoff muehlenh...@univention.de
  Release
  remove patch to ignore tck module, as d/libobjenensis-java.poms 
configuration takes care of this issue already.
  d/control: update Standards-Version: 3.9.3, no change.

---

-- 
objenesis - Java library to instantiate a new object of a particular class

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. 28bdeaecfd5753bd93c330aeae85f86b0cdd5b22

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 656187ed7b96bcd5765dcd2025d11196ea20cd47
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Mar 6 00:21:58 2012 +0100

Fix update for libjenkins-svnkit-java

diff --git a/.mrconfig b/.mrconfig
index 5fab3d7..b899e19 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -534,6 +534,7 @@ checkout = git_checkout libjava-jdbc-clojure
 checkout = git_checkout libjbcrypt-java
 
 [libjenkins-svnkit-java]
+svn_test = false
 checkout = git_checkout libjenkins-svnkit-java
 
 [libjna-java]
diff --git a/make-mrconfig b/make-mrconfig
index 70275e7..b11b3a0 100755
--- a/make-mrconfig
+++ b/make-mrconfig
@@ -58,11 +58,16 @@ lib=
 
 # Sections for Git repositories
 for i in $GIT_PKGS; do
-  if [ $i == jigsaw ]; then
+  if [[ $i == jigsaw ]]; then
 output [$i]
 hg_test = false
 checkout = git_checkout $i
 
+  elif [[ $i == libjenkins-svnkit-java ]]; then
+output [$i]
+svn_test = false
+checkout = git_checkout $i
+
   else
 output [$i]
 checkout = git_checkout $i

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. 28bdeaecfd5753bd93c330aeae85f86b0cdd5b22

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 28bdeaecfd5753bd93c330aeae85f86b0cdd5b22
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Fri Apr 6 23:58:06 2012 +0200

Update list of packages on 06/04/2012

diff --git a/.gitignore b/.gitignore
index f04ec28..a024d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -229,6 +229,7 @@ openjpa
 osgi-compendium
 osgi-core
 osgi-foundation-ee
+owasp-java-html-sanitizer
 pauker
 pescetti
 plexus-classworlds2
@@ -268,6 +269,7 @@ triplea
 tuxguitar
 twitter4j
 txw2
+uddi4j
 uima-addons
 uima-as
 uimaj
diff --git a/.mrconfig b/.mrconfig
index b899e19..e05d079 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -711,6 +711,9 @@ checkout = git_checkout osgi-core
 [osgi-foundation-ee]
 checkout = git_checkout osgi-foundation-ee
 
+[owasp-java-html-sanitizer]
+checkout = git_checkout owasp-java-html-sanitizer
+
 [pauker]
 checkout = git_checkout pauker
 
@@ -828,6 +831,9 @@ checkout = git_checkout twitter4j
 [txw2]
 checkout = git_checkout txw2
 
+[uddi4j]
+checkout = git_checkout uddi4j
+
 [uima-addons]
 checkout = git_checkout uima-addons
 

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] objenesis - Java library to instantiate a new object of a particular class branch, master, updated. debian/1.2+full-1-1-g3c80b29

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 3c80b2945368c41309a5b4365a39f813c403a86d
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sat Apr 7 00:49:48 2012 +0200

* Apply patch from Moritz Mühlenhoff muehlenh...@univention.de
  to install objenesis jar in /usr/share/java (Closes: #667000)
* d/libobjenensis-java.poms: ignore tck module

diff --git a/debian/changelog b/debian/changelog
index b0fb144..aa7c69b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+objenesis (1.2+full-2) UNRELEASED; urgency=low
+
+  * Team upload
+  * Apply patch from Moritz Mühlenhoff muehlenh...@univention.de
+to install objenesis jar in /usr/share/java (Closes: #667000)
+  * d/libobjenensis-java.poms: ignore tck module
+  * d/copyright: update to spec 1.0, fix Source to indicate correct location
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Sat, 07 Apr 2012 00:43:35 
+0200
+
 objenesis (1.2+full-1) unstable; urgency=low
 
   * Team upload
diff --git a/debian/copyright b/debian/copyright
index 376266e..14f5ac3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Objenesis - Java library to instantiate a new object of a particular 
class
-Maintainer: Objenesis Team http://groups.google.com/group/objenesis-dev
-Source: http://svn.codehaus.org/jmock/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Objenesis - Java library to instantiate a new object of a 
particular class
+Upstream-Contact: Objenesis Team http://groups.google.com/group/objenesis-dev
+Source: http://objenesis.googlecode.com/svn/
 
 Copyright: 2006-2009 Joe Walnes, Henri Tremblay, Leonardo Mesquita
 License: ASL-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache Software License version 2.0 in 
'/usr/share/common-licenses/Apache-2.0'
 
-Files: org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java,
- org/objenesis/instantiator/jrockit/JRockit131Instantiator.java
+Files: org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java
+   org/objenesis/instantiator/jrockit/JRockit131Instantiator.java
 Copyright: 2006, BEA Systems, inc.
 License: ASL-2.0
   On Debian GNU/Linux system you can find the complete text of the
diff --git a/debian/libobjenesis-java.poms b/debian/libobjenesis-java.poms
index 37e90a8..fd2b086 100644
--- a/debian/libobjenesis-java.poms
+++ b/debian/libobjenesis-java.poms
@@ -24,4 +24,5 @@
 # temporarily for certain artifacts such as Javadoc jars.
 #
 pom.xml --has-package-version
-main/pom.xml --has-package-version
+main/pom.xml --has-package-version --java-lib
+tck/pom.xml --ignore

-- 
objenesis - Java library to instantiate a new object of a particular class

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#667000: Rebuilding objenesis from source makes mockito FTBFS

[Ludovic Claude]

Hello Moritz,

Thanks for your patch, I have improved it and applied it on objenesis.

Ludovic

On 03/04/2012 13:43, Moritz Mühlenhoff wrote:
 On Dienstag, 3. April 2012 12:06:38 Moritz Muehlenhoff wrote:
 Package: objenesis
 Version: 1.2+full-1
 Severity: serious


 Diffing the file lists between the version in the archive and the
 rebuilt version shows that these files are missing after the rebuild:

 /usr/share/java/objenesis-1.2.jar
 /usr/share/java/objenesis.jar
 
 Attached patch fixes this, I'd appreciate some review from someone with more 
 Java packaging foo, though.
 
 Cheers,
 Moritz
 
 
 
 __
 This is the maintainer address of Debian's Java team
 http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
  Please use
 debian-j...@lists.debian.org for discussions and questions.



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#660757: tomcat7-common depends on java6, but what about java7?

[Ludovic Claude]

openjdk-7-jre-headless provides java-5-runtime and java-6-runtime, both
of which are alternative choices for tomcat7-common dependencies, so you
can install openjdk-7-jre-headless, then tomcat7-common, and no
additional JRE should be installed.

Ludovic

On 21/02/2012 17:29, Rohde Fischer wrote:
 Package: tomcat7-common
 Severity: normal
 
 Dear Maintainer,
 Tomcat7-common depends on default-jre-headless which in turn depends on 
 openjdk-6-jre-headless. But what about openjdk-7-jre-headless? This should 
 satisfy Tomcat perfectly.
 
 
 -- System Information:
 Debian Release: wheezy/sid
   APT prefers testing
   APT policy: (500, 'testing')
 Architecture: amd64 (x86_64)
 
 Kernel: Linux 2.6.32-5-amd64 (SMP w/1 CPU core)
 Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
 Shell: /bin/sh linked to /bin/dash
 
 
 
 __
 This is the maintainer address of Debian's Java team
 http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
  Please use
 debian-j...@lists.debian.org for discussions and questions.
 



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[SCM] pkg-java packaging branch, master, updated. d1a75b6cbcf4cbd2a4cb647755e221d58f522f79

[Ludovic Claude]

The following commit has been merged in the master branch:
commit d1a75b6cbcf4cbd2a4cb647755e221d58f522f79
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sat Feb 18 00:48:18 2012 +0100

Update list of packages on 18/02/2012

diff --git a/.gitignore b/.gitignore
index 5913128..f04ec28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,13 +114,19 @@ jenkins-commons-jexl
 jenkins-crypto-util
 jenkins-dom4j
 jenkins-executable-war
+jenkins-git-plugin
 jenkins-htmlunit
 jenkins-htmlunit-core-js
+jenkins-instance-identity
 jenkins-json
 jenkins-memory-monitor
+jenkins-parameterized-trigger-plugin
 jenkins-remoting
+jenkins-ssh-cli-auth
+jenkins-subversion-plugin
 jenkins-task-reactor
 jenkins-test-annotations
+jenkins-token-macro-plugin
 jenkins-trilead-ssh2
 jenkins-winstone
 jenkins-xstream
@@ -164,6 +170,7 @@ libisnativec-java
 libjackson-json-java
 libjava-jdbc-clojure
 libjbcrypt-java
+libjenkins-svnkit-java
 libjna-java
 libjsr166y-java
 libjsr305-java
@@ -178,6 +185,7 @@ libpam4j
 libpjl-comp-filter-java
 librelaxng-datatype-java
 librobert-hooke-clojure
+libsequence-library-java
 libsmack-java
 libspring-ldap-java
 libspring-security-2.0-java
diff --git a/.mrconfig b/.mrconfig
index 8e2d3b7..5fab3d7 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -364,27 +364,45 @@ checkout = git_checkout jenkins-dom4j
 [jenkins-executable-war]
 checkout = git_checkout jenkins-executable-war
 
+[jenkins-git-plugin]
+checkout = git_checkout jenkins-git-plugin
+
 [jenkins-htmlunit]
 checkout = git_checkout jenkins-htmlunit
 
 [jenkins-htmlunit-core-js]
 checkout = git_checkout jenkins-htmlunit-core-js
 
+[jenkins-instance-identity]
+checkout = git_checkout jenkins-instance-identity
+
 [jenkins-json]
 checkout = git_checkout jenkins-json
 
 [jenkins-memory-monitor]
 checkout = git_checkout jenkins-memory-monitor
 
+[jenkins-parameterized-trigger-plugin]
+checkout = git_checkout jenkins-parameterized-trigger-plugin
+
 [jenkins-remoting]
 checkout = git_checkout jenkins-remoting
 
+[jenkins-ssh-cli-auth]
+checkout = git_checkout jenkins-ssh-cli-auth
+
+[jenkins-subversion-plugin]
+checkout = git_checkout jenkins-subversion-plugin
+
 [jenkins-task-reactor]
 checkout = git_checkout jenkins-task-reactor
 
 [jenkins-test-annotations]
 checkout = git_checkout jenkins-test-annotations
 
+[jenkins-token-macro-plugin]
+checkout = git_checkout jenkins-token-macro-plugin
+
 [jenkins-trilead-ssh2]
 checkout = git_checkout jenkins-trilead-ssh2
 
@@ -515,6 +533,9 @@ checkout = git_checkout libjava-jdbc-clojure
 [libjbcrypt-java]
 checkout = git_checkout libjbcrypt-java
 
+[libjenkins-svnkit-java]
+checkout = git_checkout libjenkins-svnkit-java
+
 [libjna-java]
 checkout = git_checkout libjna-java
 
@@ -557,6 +578,9 @@ checkout = git_checkout librelaxng-datatype-java
 [librobert-hooke-clojure]
 checkout = git_checkout librobert-hooke-clojure
 
+[libsequence-library-java]
+checkout = git_checkout libsequence-library-java
+
 [libsmack-java]
 checkout = git_checkout libsmack-java
 

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15775 - trunk/ant/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-02-13 23:07:48 + (Mon, 13 Feb 2012)
New Revision: 15775

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
Log:
Add version constraint on libxml-commons-resolver1.1-java to
secure backport of Ant on Squeeze.

Modified: trunk/ant/debian/changelog
===
--- trunk/ant/debian/changelog  2012-02-13 22:59:38 UTC (rev 15774)
+++ trunk/ant/debian/changelog  2012-02-13 23:07:48 UTC (rev 15775)
@@ -1,9 +1,14 @@
 ant (1.8.2-5) UNRELEASED; urgency=low
 
+  [Ludovic Claude]
+  * Add version constraint on libxml-commons-resolver1.1-java to
+secure backport of Ant on Squeeze.
+
+  [Tony Mancill]
   * Team upload.
   * Remove Michael Koch Uploaders (Closes: #653982)
 
- -- tony mancill tmanc...@debian.org  Sun, 01 Jan 2012 16:05:02 -0800
+ -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 14 Feb 2012 00:06:57 
+0100
 
 ant (1.8.2-4) unstable; urgency=low
 

Modified: trunk/ant/debian/control
===
--- trunk/ant/debian/control2012-02-13 22:59:38 UTC (rev 15774)
+++ trunk/ant/debian/control2012-02-13 23:07:48 UTC (rev 15775)
@@ -9,7 +9,7 @@
 Build-Depends: cdbs (= 0.4.8), debhelper (= 7), default-jdk, 
maven-repo-helper ( 1.0),
  libxerces2-java, libbsf-java (= 2.3.0rc1), liboro-java, libxalan2-java (= 
2.4.0), junit, junit4, antlr,
  liblog4j1.2-java, libregexp-java, libbcel-java (= 5.0), 
libcommons-logging-java, libjdepend-java,
- libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, 
libjsch-java, libjaxp1.3-java,
+ libgnumail-java, libxml-commons-resolver1.1-java (= 1.2-7~), 
libcommons-net-java, libjsch-java, libjaxp1.3-java,
  gcj-native-helper
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Re: Backport of ant?

[Ludovic Claude]

Hello Joachim,

It looks like either src/main/org/apache/tools/ant/types/resolver/ is
missing from your source tarball (are you using the correct tarball for
ant 1.8.2?) or - more likely - libxml-commons-resolver1.1-java does not
provide /usr/share/java/xml-resolver-1.2.jar. If that is the case, then
you can work around this issue by removing the mh_installjar line(s)
which fail, as I don't think that fop uses the xmlcatalog task
provided by ant-apache-resolver in its build.

Ludovic

On 10/02/2012 22:32, Joachim Breitner wrote:
 Hi ant maintainers,
 
 I’m trying to backport fop to squeeze, and it needs a newer ant (and
 xmlgraphics-commons). The build dependencies of ant-1.8.2-4 are
 fulfillable in squeeze, but it fails to build correctly:
 
 mh_installjar -pant-optional -l src/etc/poms/ant-apache-resolver/pom.xml
 build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
 Cannot find the jar to install: build/lib/ant-apache-resolver.jar
 make: *** [install/ant-optional] Error 2
 dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit
 status 2
 
 Full build log is attached.
 
 Should I just not install the ant-apache-resolver.jar file, i.e. remove
 that line from debian/rules, or what is going on here?
 
 Oh, and if someone else feels like backporting this, I’d be very
 grateful :-)
 
 Thanks,
 Joachim
 
 

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#644259: Please switch to Git maven-repo-helper and maven-debian-helper

[Ludovic Claude]

Hello Thomas,

Can you help me do the migration to Git for those packages. I have tried
to do it, but Git apparently did not manage to complete.

I ran this command, the authors file is attached to this mail.

 git svn clone --stdlayout --branches=branches/upstream --no-metadata -A
/home/ludo/Projects/onAlioth/pkg-java.svn/maven-debian-helper/authors
svn+ssh://ludovicc-gu...@svn.debian.org/svn/pkg-java/trunk/maven-debian-helper

Thanks,
Ludovic
drazzib = Damien Raude-Morvan draz...@debian.org
gg0-guest = gg0 g...@unknown.com
ludovicc-guest = Ludovic Claude ludovic.cla...@laposte.net
mkoch = Michael Koch konque...@gmx.de
twerner = Torsten Werner twer...@debian.org
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r15735 - trunk/maven-repo-helper/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-24 22:27:07 + (Tue, 24 Jan 2012)
New Revision: 15735

Modified:
   trunk/maven-repo-helper/debian/changelog
Log:
* Release

Modified: trunk/maven-repo-helper/debian/changelog
===
--- trunk/maven-repo-helper/debian/changelog2012-01-23 23:42:28 UTC (rev 
15734)
+++ trunk/maven-repo-helper/debian/changelog2012-01-24 22:27:07 UTC (rev 
15735)
@@ -1,4 +1,4 @@
-maven-repo-helper (1.7.1) UNRELEASED; urgency=low
+maven-repo-helper (1.7.1) unstable; urgency=low
 
   * Build with Java 5, use generics. (Closes: #644260)
   * Fix resolution of versions from dependency management


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15736 - in tags/maven-repo-helper: . 1.7.1/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-24 22:30:13 + (Tue, 24 Jan 2012)
New Revision: 15736

Added:
   tags/maven-repo-helper/1.7.1/
   tags/maven-repo-helper/1.7.1/debian/changelog
Removed:
   tags/maven-repo-helper/1.7.1/debian/changelog
Log:
[svn-buildpackage] Tagging maven-repo-helper 1.7.1

Deleted: tags/maven-repo-helper/1.7.1/debian/changelog
===
--- trunk/maven-repo-helper/debian/changelog2012-01-23 00:37:30 UTC (rev 
15733)
+++ tags/maven-repo-helper/1.7.1/debian/changelog   2012-01-24 22:30:13 UTC 
(rev 15736)
@@ -1,298 +0,0 @@
-maven-repo-helper (1.7.1) UNRELEASED; urgency=low
-
-  * Build with Java 5, use generics. (Closes: #644260)
-  * Fix resolution of versions from dependency management
-  * Fix ignore modules in a POM transformation
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Mon, 02 Jan 2012 20:27:26 
+0100
-
-maven-repo-helper (1.7) unstable; urgency=low
-
-  * add --site-xml=location option to mh_install and in the
-package.poms file to explicitly define the location for site.xml.
-Warning: this forces existing packages to add this option if they
-need to install site.xml
-  * update the version in the POM and in the documentation
-(Closes: #644258)
-  * run the unit tests when building the package, fix broken tests after the
-introduction of relativePath on the parent element of cleaned POM files. 
-  * d/control: add ant-optional, junit, libxmlunit-java, libcommons-io-java to
-Build-Depend-Indep
-  * d/copyright: update fields to match latest DEP5 spec.
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 01 Nov 2011 16:32:39 
+0200
-
-maven-repo-helper (1.6) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Add tutorial, reference and repository specification in documentation
-  * Update options on mh_installpom and mh_installpoms, to use the new 
arguments
-added to mh_cleanpom
-  * Add Build-Depend on markdown to build the doc
-  * Add support for packages built with dh 7 and javahelper: use
-the following line in your rules file:
- dh $@ --with javahelper --with jh_maven_repo_helper
-This will build the package with javahelper, and the resulting
-jar will be installed in the Maven repository (you need of course the
-package.poms file and the POM files in your package).
-  * Add mh_linkjars to link the jars listed in the .poms file, this is used by
-the jh_maven_repo_helper plugin for dh 7.
-  * Deprecate mh_installjar -i option and replace it with -j to avoid conflicts
-with -i/--ignore-rules option used elsewhere.
-  * Review all options passed to the mh_* scripts, in particular --set-version
-for mh_installjar (Closes: #640730)
-
-  [ Damien Raude-Morvan ]
-  * mh_checkrepo: Fix error when launching without any param.
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Mon, 26 Sep 2011 22:55:09 
+0100
-
-maven-repo-helper (1.5.2) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Match jar with bundle as they are equivalent
-
-  [ Damien Raude-Morvan ]
-  * Keep relativePath attribute on parent pom.
-  * d/control: Fix typo in package description (Closes: #617438).
-  * src/main/java/org/debian/maven/repo/RepositoryReportWriter.java: Add
-a hack to change output of Maven repository checker.
-  * Bump Standards-Version to 3.9.2 (no changes needed).
-
- -- Damien Raude-Morvan draz...@debian.org  Tue, 16 Aug 2011 19:28:03 +0200
-
-maven-repo-helper (1.5.1) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner twer...@debian.org  Wed, 09 Feb 2011 21:39:12 +0100
-
-maven-repo-helper (1.5) experimental; urgency=low
-
-  * Create mh_installsite to install site.xml into the Maven repository,
-and integrate it with mh_install
-  * Avoid duplication between rules in maven.rules and maven.publishedRules,
-as well as between maven.ignoreRules and maven.cleanIgnoreRules
-  * Fix ignore modules, make it work in more cases.
-  * mh_clean: clean also files listed in .mh_clean, similar to what jh_clean
-does.
-  * add support for dh 7 and ant builds: use the following line in your
-rules file:
- dh $@ --with ant --with maven_repo_helper
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Thu, 11 Nov 2010 18:49:49 
+0100
-
-maven-repo-helper (1.4) experimental; urgency=low
-
-  * Better support for inserting properties in the transformed or cleaned
-POM files. Avoid duplicate properties and allow definition of new
-properties.
-  * add support for --has-package-version and --keep-elements in the
-package.poms file, for mh_install add --artifact, --java-lib,
---usj-name, --usj-version, --no-usj-versionless, --dest-jar
-  * update README.Debian and document the new options.
-  * change license from BSD to Apache 2.0, there's no need to have so many
-different licenses in this package, MIT and Apache2.0 are already used.
-  * Keep comments in the POM files as much as possible (Closes: #574045

[pkg-java] r15737 - trunk/maven-ant-helper/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-24 22:43:43 + (Tue, 24 Jan 2012)
New Revision: 15737

Modified:
   trunk/maven-ant-helper/debian/changelog
Log:
* Release

Modified: trunk/maven-ant-helper/debian/changelog
===
--- trunk/maven-ant-helper/debian/changelog 2012-01-24 22:30:13 UTC (rev 
15736)
+++ trunk/maven-ant-helper/debian/changelog 2012-01-24 22:43:43 UTC (rev 
15737)
@@ -1,8 +1,8 @@
-maven-ant-helper (7.7) UNRELEASED; urgency=low
+maven-ant-helper (7.7) unstable; urgency=low
 
   * Add target local-install-doc to maven-build.xml
 
- -- Ludovic Claude ludovic.cla...@laposte.net  Sun, 08 Jan 2012 14:45:49 
+0100
+ -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 24 Jan 2012 23:43:23 
+0100
 
 maven-ant-helper (7.6) unstable; urgency=low
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15738 - in tags/maven-ant-helper: . 7.7/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-24 22:44:55 + (Tue, 24 Jan 2012)
New Revision: 15738

Added:
   tags/maven-ant-helper/7.7/
   tags/maven-ant-helper/7.7/debian/changelog
Removed:
   tags/maven-ant-helper/7.7/debian/changelog
Log:
[svn-buildpackage] Tagging maven-ant-helper 7.7

Deleted: tags/maven-ant-helper/7.7/debian/changelog
===
--- trunk/maven-ant-helper/debian/changelog 2012-01-23 00:37:30 UTC (rev 
15733)
+++ tags/maven-ant-helper/7.7/debian/changelog  2012-01-24 22:44:55 UTC (rev 
15738)
@@ -1,211 +0,0 @@
-maven-ant-helper (7.7) UNRELEASED; urgency=low
-
-  * Add target local-install-doc to maven-build.xml
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Sun, 08 Jan 2012 14:45:49 
+0100
-
-maven-ant-helper (7.6) unstable; urgency=low
-
-  * Better handling of install in local-repo during build (Closes: #652804).
-
- -- Damien Raude-Morvan draz...@debian.org  Thu, 29 Dec 2011 01:32:56 +0100
-
-maven-ant-helper (7.5) unstable; urgency=low
-
-  * Use Java 1.5 for compiling and source level compatibility
-by default (Closes: #644941)
-  * Fix issue when test sources are missing and maven.test.skip is not set
-to true
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Sun, 30 Oct 2011 19:56:27 
+0100
-
-maven-ant-helper (7.4) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * process-test-resources now ignores Java files when copying
-
-  [ Torsten Werner ]
-  * Remove Trydge and Paul from Uploaders list.
-
- -- Torsten Werner twer...@debian.org  Tue, 27 Sep 2011 17:38:59 +0200
-
-maven-ant-helper (7.3) unstable; urgency=low
-
-  * maven-build.xml: Fix read of properties in *.poms files by changing
-regexp and set cleaner.options only if not already defined.
-(Closes: #629894).
-  * debian/rules: Remove ant-trax from classpath (doesn't exist anymore since
-Ant 1.8).
-
- -- Damien Raude-Morvan draz...@debian.org  Sun, 26 Jun 2011 19:14:05 +0200
-
-maven-ant-helper (7.2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner twer...@debian.org  Wed, 09 Feb 2011 21:34:32 +0100
-
-maven-ant-helper (7.1) experimental; urgency=low
-
-  [ Ludovic Claude ]
-  * Add a javadoc-jar target which generates a jar file containing the javadoc
-  * Add a default build-all target which can run the build and optionally
-generate javadoc and its jar if generate.javadoc property is set
-
-  [ Damien Raude-Morvan ]
-  * d/rules: Remove simple-patchsys.mk since d/source/format is 3.0 (native).
-  * d/control, d/compat: Bump debhelper compat level to 7.
-  * d/control: Add myself as Uploaders.
-
- -- Damien Raude-Morvan draz...@debian.org  Sun, 05 Dec 2010 20:01:13 +0100
-
-maven-ant-helper (7.0) experimental; urgency=low
-
-  * Update Standards-Version to 3.9.1, use source format 3.0 (native)  
-  * Use default-jdk-doc instead of openjdk-6-doc when linking
-Javadoc files (Closes: #587361)
-  * d/control: add Suggests: default-jdk-doc, move all Recommends: to Suggest
-as they are not needed except when Maven is called within the Ant build,
-add maven-repo-helper to Depends as it's now always used from the jar task
-  * maven-build.xml: add -N option to Maven to avoid recursive actions,
-reorder actions in mvn-package and give to the POMCleaner the location
-of the local Maven repository which can be used when deciding when to
-replace a parent version by a its symbolic version (fixes
-maven-debian-helper build),
-add local-install and package-and-local-install target to deal with
-composite projects which need to install some of their build elements in
-the local repository, for consuption by other parts of the build,
-deprecate passing the 'version' variable to Ant as it's read from the POM 
file,
-remove macro prepare-package-list, update paths to the JDK docs.
- 
- -- Ludovic Claude ludovic.cla...@laposte.net  Thu, 14 Oct 2010 00:08:38 
+0200
-
-maven-ant-helper (6.8) unstable; urgency=low
-
-  * Use default-jdk-doc instead of openjdk-6-doc when linking
-Javadoc files
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Sun, 28 Mar 2010 21:55:57 
+0200
-
-maven-ant-helper (6.7) unstable; urgency=low
-
-  * Do no longer gunzip/ the package-list file from openjdk-6-doc.
-(Closes: #573660)
-
- -- Torsten Werner twer...@debian.org  Sat, 13 Mar 2010 10:24:35 +0100
-
-maven-ant-helper (6.6) unstable; urgency=low
-
-  * Revert previous change as openjdk6-doc is not required
-for most builds. Update the affected packages in a
-separate update.
-  * Bump up Standards-Version to 3.8.3, no changes
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Wed, 02 Sep 2009 21:22:49 
+0100
-
-maven-ant-helper (6.5) unstable; urgency=low
-
-  * Add Build-Depends: openjdk-6-doc to fix build errors. (Closes: #543106,
-#543112, #543115, #543116)
-
- -- Torsten Werner twer...@debian.org  Sun, 23 Aug 2009 10:13:54 +0200
-
-maven-ant-helper (6.4) unstable; urgency=low

[pkg-java] r15739 - in trunk/maven-debian-helper: debian maven-debian-plugin/src/main/java/org/debian/maven/plugin

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-24 22:55:57 + (Tue, 24 Jan 2012)
New Revision: 15739

Modified:
   trunk/maven-debian-helper/debian/changelog
   
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
Log:
Fix installation of artifacts using a classifier

Modified: trunk/maven-debian-helper/debian/changelog
===
--- trunk/maven-debian-helper/debian/changelog  2012-01-24 22:44:55 UTC (rev 
15738)
+++ trunk/maven-debian-helper/debian/changelog  2012-01-24 22:55:57 UTC (rev 
15739)
@@ -1,4 +1,4 @@
-maven-debian-helper (1.5) UNRELEASED; urgency=low
+maven-debian-helper (1.5) unstable; urgency=low
 
   [ Ludovic Claude ]
   * Install jars in /usr/share/java (Closes: #636660)
@@ -20,6 +20,7 @@
   * mh_make: Don't include document packages in the dependency search
 (Closes: #656235)
   * Fix installation of javadoc jar (Closes: #656311)
+  * Fix installation of artifacts using a classifier
 
   [ Damien Raude-Morvan ]
   * maven-packager-utils/src/main/resources/build.xml.vm: package-module ant
@@ -27,7 +28,7 @@
   * Follow-up for #589635: avoid creating a file called mvn-build during
 the build.
 
- -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 10 Jan 2012 00:20:32 
+0100
+ -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 24 Jan 2012 23:55:22 
+0100
 
 maven-debian-helper (1.4.5) unstable; urgency=low
 

Modified: 
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
===
--- 
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
 2012-01-24 22:44:55 UTC (rev 15738)
+++ 
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
 2012-01-24 22:55:57 UTC (rev 15739)
@@ -318,12 +318,11 @@
 if (finalName != null  finalName.length()  0) {
 jarName = finalName;
 } else {
-if (classifier != null) {
-jarName = artifactId + - + version + - + classifier;
-} else {
-jarName = artifactId + - + version;
-}
+jarName = artifactId + - + version;
 }
+if (classifier != null) {
+jarName += - + classifier;
+}
 return jarName + .jar;
 }
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15734 - in trunk/maven-debian-helper: debian maven-debian-plugin/src/main/java/org/debian/maven/plugin maven-packager-utils/src/main/java/org/debian/maven/packager maven-packager-utils/src

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-23 23:42:28 + (Mon, 23 Jan 2012)
New Revision: 15734

Added:
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.doc-base.api.multi.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/java-doc.install.multi.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-compiler-java.result.poms
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-compiler-java.rules
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-compiler-java.substvars
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-components/
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-components/1.1.18/
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-components/1.x/
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-components/1.x/plexus-components-1.x.pom
Modified:
   trunk/maven-debian-helper/debian/changelog
   
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
   
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
   
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
   
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build-classpath.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.properties.ant.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.xml.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm
   trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-compiler-java.poms
Log:
* mh_make: add support to generate and install Javadoc on multi projects
  during an Ant build.
* mh_make: fix resolution of versionless dependencies and missing
  parent POMs (Closes: #639316)
* mh_make: Don't include document packages in the dependency search
  (Closes: #656235)
* Fix installation of javadoc jar (Closes: #656311)

Modified: trunk/maven-debian-helper/debian/changelog
===
--- trunk/maven-debian-helper/debian/changelog  2012-01-23 00:37:30 UTC (rev 
15733)
+++ trunk/maven-debian-helper/debian/changelog  2012-01-23 23:42:28 UTC (rev 
15734)
@@ -9,10 +9,17 @@
   * mh_make: clean up Debian emails of the form My Namemy.n...@provider.com
 (Closes: #638788)
   * mh_make: fix description in generated maven.rules (Closes: #639637)
+  * mh_make: add support to generate and install Javadoc on multi projects
+during an Ant build.
   * Fix failing tests in DependenciesSolverTest
   * Run unit tests during the build,
   * d/control: add B-D on libcommons-io-java as it's used by the junit tests.
   * Generate package-doc.poms for Ant builds
+  * mh_make: fix resolution of versionless dependencies and missing
+parent POMs (Closes: #639316)
+  * mh_make: Don't include document packages in the dependency search
+(Closes: #656235)
+  * Fix installation of javadoc jar (Closes: #656311)
 
   [ Damien Raude-Morvan ]
   * maven-packager-utils/src/main/resources/build.xml.vm: package-module ant
@@ -20,7 +27,7 @@
   * Follow-up for #589635: avoid creating a file called mvn-build during
 the build.
 
- -- Damien Raude-Morvan draz...@debian.org  Sun, 08 Jan 2012 14:26:21 +0100
+ -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 10 Jan 2012 00:20:32 
+0100
 
 maven-debian-helper (1.4.5) unstable; urgency=low
 

Modified: 
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
===
--- 
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
  2012-01-23 00:37:30 UTC (rev 15733)
+++ 
trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
  2012-01-23 23:42:28 UTC (rev 15734)
@@ -30,6 +30,10 @@
 setClassifier(javadoc);
 }
 
+protected String jarName() {
+return getArtifactId() + - + getVersion() + -javadoc.jar

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-28-gdd7fceb

[Ludovic Claude]

The following commit has been merged in the master branch:
commit dd7fceb3cf634955a8ce248ed35cbdc57298da98
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 10 00:35:57 2012 +0100

Improve installation of Javadoc

diff --git a/debian/build-classpath b/debian/build-classpath
index 5bfa9ce..efe0e66 100644
--- a/debian/build-classpath
+++ b/debian/build-classpath
@@ -1 +1,2 @@
 /usr/share/java/ant-nodeps.jar
+/usr/share/java/ant-junit.jar
diff --git a/debian/libplexus-compiler-java-doc.doc-base.api 
b/debian/libplexus-compiler-java-doc.doc-base.api
index 62419c4..2777b12 100644
--- a/debian/libplexus-compiler-java-doc.doc-base.api
+++ b/debian/libplexus-compiler-java-doc.doc-base.api
@@ -2,9 +2,16 @@ Document: libplexus-compiler-java
 Title: API Javadoc for Plexus Compiler
 Author: Plexus Compiler developers
 Abstract: This is the API Javadoc provided for the
- libplexus-compiler-java library.
+ libplexus-compiler-java libraries.
 Section: Programming
 
 Format: HTML
 Index: /usr/share/doc/libplexus-compiler-java/api/index.html
 Files: /usr/share/doc/libplexus-compiler-java/api/*
+   /usr/share/doc/libplexus-compiler-java/plexus-compiler-test/*
+   /usr/share/doc/libplexus-compiler-java/plexus-compiler-manager/*
+   
/usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-csharp/*
+   
/usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-eclipse/*
+   
/usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-jikes/*
+   
/usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-javac/*
+
diff --git a/debian/libplexus-compiler-java-doc.poms 
b/debian/libplexus-compiler-java-doc.poms
index a8074c9..1a680c5 100644
--- a/debian/libplexus-compiler-java-doc.poms
+++ b/debian/libplexus-compiler-java-doc.poms
@@ -25,10 +25,10 @@
 #   --site-xml=location: Optional, the location for site.xml if it needs to 
be installed.
 # Empty by default. [mh_install]
 #
-plexus-compiler-api/pom.xml --has-package-version 
--artifact=plexus-compiler-api/target/plexus-compiler-api.javadoc.jar 
--classifier=javadoc --ignore-pom
-plexus-compiler-test/pom.xml --has-package-version 
--artifact=plexus-compiler-test/target/plexus-compiler-test.javadoc.jar 
--classifier=javadoc --ignore-pom
-plexus-compiler-manager/pom.xml --has-package-version 
--artifact=plexus-compiler-manager/target/plexus-compiler-manager.javadoc.jar 
--classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version 
--artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.jar
 --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version 
--artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.jar
 --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version 
--artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.jar
 --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version 
--artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.jar
 --classifier=javadoc --ignore-pom
+plexus-compiler-api/target/plexus-compiler-api.javadoc.pom 
--has-package-version 
--artifact=plexus-compiler-api/target/plexus-compiler-api.javadoc.jar 
--classifier=javadoc --ignore-pom
+plexus-compiler-test/target/plexus-compiler-test.javadoc.pom 
--has-package-version 
--artifact=plexus-compiler-test/target/plexus-compiler-test.javadoc.jar 
--classifier=javadoc --ignore-pom
+plexus-compiler-manager/target/plexus-compiler-manager.javadoc.pom 
--has-package-version 
--artifact=plexus-compiler-manager/target/plexus-compiler-manager.javadoc.jar 
--classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.jar
 --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.jar
 --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.jar
 --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.jar
 --classifier=javadoc --ignore-pom

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 85c21a6c868d34753d40f9db6df6d4048bd78866
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Fri Jan 6 00:20:32 2012 +0100

Create again the libplexus-compiler-java-doc package.

diff --git a/debian/changelog b/debian/changelog
index 287a908..43db18a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
   * Remove dependency on libaspectj-java, as plexus-aspectj-compiler
 cannot compile with AspectJ 1.6
   * Update description
+  * Create again the libplexus-compiler-java-doc package.
   * d/maven.rules: use version 1.x for the artifacts in this package instead
 of 'debian'
   * d/watch: update to new location on Github
diff --git a/debian/control b/debian/control
index 9d7854f..fdef005 100644
--- a/debian/control
+++ b/debian/control
@@ -34,22 +34,22 @@ Description: Plexus compiler system
  This package provides the Plexus Compiler API and its implementation modules
  supporting javac, jikes, eclipse, aspectj and csharp compilers.
 
-# DISABLED because javadoc fails:
-#Package: libplexus-compiler-java-doc
-#Architecture: all
-#Section: doc
-#Depends: ${misc:Depends}, ${maven:DocDepends}
-#Recommends: ${maven:DocOptionalDepends}
-#Suggests: libplexus-compiler-java
-#Description: Documentation for The API for the Plexus compiler system
-# The Plexus project provides a full software stack for creating and executing
-# software projects. Based on the Plexus container, the applications can
-# utilise component-oriented programming to build modular, reusable components
-# that can easily be assembled and reused.
-# .
-# This package provides the Plexus Compiler API.
-# .
-# This package contains the API documentation of libplexus-compiler-java.
+Package: libplexus-compiler-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libplexus-compiler-java
+Description: Documentation for The API for the Plexus compiler system
+ The Plexus project provides a full software stack for creating and executing
+ software projects. Based on the Plexus container, the applications can
+ utilise component-oriented programming to build modular, reusable components
+ that can easily be assembled and reused.
+ .
+ libplexus-compiler-java provides the Plexus Compiler API and its 
implementation
+ modules supporting javac, jikes, eclipse, aspectj and csharp compilers.
+ .
+ This package contains the API documentation of libplexus-compiler-java.
 
 Package: libplexus-compiler-api-java
 Architecture: all

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 2ac735aba66d999e3a6d05f0c3609342e33fbea5
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Jan 8 14:01:02 2012 +0100

Fix generation of javadoc

diff --git a/debian/build.xml b/debian/build.xml
index df96d87..158e97a 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -27,6 +27,17 @@
 /sequential
 /macrodef
 
+macrodef name=package-module-doc
+attribute name=dir/
+sequential
+  ant target=package-doc-and-local-install antfile=${maven.build} 
dir=@{dir}
+property name=debian.dir location=debian /
+property name=project.dir value=@{dir} /
+property name=keep-cleaned-pom value=true /
+  /ant
+/sequential
+/macrodef
+
 target name=clean
 clean-module dir=/
 clean-module dir=plexus-compiler-api//
@@ -52,17 +63,15 @@
 /target
 
 target name=javadoc
-javadoc destdir=${javadoc.dir}
-packageset dir=plexus-compiler-api/src/main/java//
-packageset dir=plexus-compiler-test/src/main/java//
-packageset dir=plexus-compiler-manager/src/main/java//
-packageset 
dir=plexus-compilers/plexus-compiler-csharp/src/main/java//
-packageset 
dir=plexus-compilers/plexus-compiler-eclipse/src/main/java//
-packageset 
dir=plexus-compilers/plexus-compiler-jikes/src/main/java//
-packageset 
dir=plexus-compilers/plexus-compiler-javac/src/main/java//
-/javadoc
+package-module-doc dir=plexus-compiler-api//
+package-module-doc dir=plexus-compiler-test//
+package-module-doc dir=plexus-compiler-manager//
+package-module-doc dir=plexus-compilers/plexus-compiler-csharp//
+package-module-doc dir=plexus-compilers/plexus-compiler-eclipse//
+package-module-doc dir=plexus-compilers/plexus-compiler-jikes//
+package-module-doc dir=plexus-compilers/plexus-compiler-javac//
 /target
 
 target name=build-all depends=package, javadoc /
 
-/project
\ No newline at end of file
+/project
diff --git a/debian/libplexus-compiler-java-doc.poms 
b/debian/libplexus-compiler-java-doc.poms
index 1a680c5..a8074c9 100644
--- a/debian/libplexus-compiler-java-doc.poms
+++ b/debian/libplexus-compiler-java-doc.poms
@@ -25,10 +25,10 @@
 #   --site-xml=location: Optional, the location for site.xml if it needs to 
be installed.
 # Empty by default. [mh_install]
 #
-plexus-compiler-api/target/plexus-compiler-api.javadoc.pom 
--has-package-version 
--artifact=plexus-compiler-api/target/plexus-compiler-api.javadoc.jar 
--classifier=javadoc --ignore-pom
-plexus-compiler-test/target/plexus-compiler-test.javadoc.pom 
--has-package-version 
--artifact=plexus-compiler-test/target/plexus-compiler-test.javadoc.jar 
--classifier=javadoc --ignore-pom
-plexus-compiler-manager/target/plexus-compiler-manager.javadoc.pom 
--has-package-version 
--artifact=plexus-compiler-manager/target/plexus-compiler-manager.javadoc.jar 
--classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.jar
 --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.jar
 --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.jar
 --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.pom
 --has-package-version 
--artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.jar
 --classifier=javadoc --ignore-pom
+plexus-compiler-api/pom.xml --has-package-version 
--artifact=plexus-compiler-api/target/plexus-compiler-api.javadoc.jar 
--classifier=javadoc --ignore-pom
+plexus-compiler-test/pom.xml --has-package-version 
--artifact=plexus-compiler-test/target/plexus-compiler-test.javadoc.jar 
--classifier=javadoc --ignore-pom
+plexus-compiler-manager/pom.xml --has-package-version 
--artifact=plexus-compiler-manager/target/plexus-compiler-manager.javadoc.jar 
--classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version 
--artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.jar
 --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version 
--artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.jar
 --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit b93fdc7cb3ae4873a6f2328ea36ce91605b0c3df
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Jan 8 18:27:37 2012 +0100

Remove old install for documentation

diff --git a/debian/libplexus-compiler-java-doc.install 
b/debian/libplexus-compiler-java-doc.install
deleted file mode 100644
index 435edd7..000
--- a/debian/libplexus-compiler-java-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-target/apidocs/* usr/share/doc/libplexus-compiler-java/api
-

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit f387307a9df68d4a45164c86e352ead184899abd
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Jan 8 23:56:02 2012 +0100

Deploy Javadoc for each modules

diff --git a/debian/libplexus-compiler-java-doc.install 
b/debian/libplexus-compiler-java-doc.install
new file mode 100644
index 000..96cda28
--- /dev/null
+++ b/debian/libplexus-compiler-java-doc.install
@@ -0,0 +1,8 @@
+plexus-compiler-api/target/apidocs/* usr/share/doc/libplexus-compiler-java/api/
+plexus-compiler-test/target/apidocs/* 
usr/share/doc/libplexus-compiler-java/plexus-compiler-test/
+plexus-compiler-manager/target/apidocs/* 
usr/share/doc/libplexus-compiler-java/plexus-compiler-manager/
+plexus-compilers/plexus-compiler-csharp/target/apidocs/* 
usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-csharp/
+plexus-compilers/plexus-compiler-eclipse/target/apidocs/* 
usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-eclipse/
+plexus-compilers/plexus-compiler-jikes/target/apidocs/* 
usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-jikes/
+plexus-compilers/plexus-compiler-javac/target/apidocs/* 
usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-javac/
+

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 26ae0185c7d1b2a9af07d7d5bc9fc09b0105324a
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 9 00:13:32 2012 +0100

* d/libplexus-compiler-java-doc.install: install Javadoc for each module

diff --git a/debian/changelog b/debian/changelog
index 43db18a..4f44040 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,10 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
 of 'debian'
   * d/watch: update to new location on Github
   * d/orig-tar.sh: remove as it's not needed anymore
-  * p/patches: remove old patches, not needed anymore as the parent POM
+  * d/patches: remove old patches, not needed anymore as the parent POM
 is now packaged and contains the same information,
 add a patch to fix the failing unit tests
+  * d/libplexus-compiler-java-doc.install: install Javadoc for each module
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 03 Jan 2012 00:27:31 
+0100
 

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 7484fe83685f994400bac67bd6f94d12bc1934f3
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Jan 8 15:53:05 2012 +0100

Update name of the javadoc install target

diff --git a/debian/build.xml b/debian/build.xml
index 158e97a..cb72e92 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -30,7 +30,7 @@
 macrodef name=package-module-doc
 attribute name=dir/
 sequential
-  ant target=package-doc-and-local-install antfile=${maven.build} 
dir=@{dir}
+  ant target=local-install-doc antfile=${maven.build} 
dir=@{dir}
 property name=debian.dir location=debian /
 property name=project.dir value=@{dir} /
 property name=keep-cleaned-pom value=true /

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, master, updated. aaa7953b10ffe29b188fdcb1f0fcd2acb5c63795

[Ludovic Claude]

The following commit has been merged in the master branch:
commit aaa7953b10ffe29b188fdcb1f0fcd2acb5c63795
Merge: 3d39037540593ea07e2b8f6d8ae8c9bfab65d8e0 
ad2d938e99d5c167e2268a9e9725de745d07e385
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 9 00:18:57 2012 +0100

Merge commit 'upstream/1.1.18+dfsg'


-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, pristine-tar, updated. a46e075566d13e9035498373d2ea8e86bfc02498

[Ludovic Claude]

The following commit has been merged in the pristine-tar branch:
commit a46e075566d13e9035498373d2ea8e86bfc02498
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 9 00:18:57 2012 +0100

pristine-tar data for plexus-components_1.1.18+dfsg.orig.tar.gz

diff --git a/plexus-components_1.1.18+dfsg.orig.tar.gz.delta 
b/plexus-components_1.1.18+dfsg.orig.tar.gz.delta
new file mode 100644
index 000..eec0fbd
Binary files /dev/null and b/plexus-components_1.1.18+dfsg.orig.tar.gz.delta 
differ
diff --git a/plexus-components_1.1.18+dfsg.orig.tar.gz.id 
b/plexus-components_1.1.18+dfsg.orig.tar.gz.id
new file mode 100644
index 000..013be22
--- /dev/null
+++ b/plexus-components_1.1.18+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+ad2d938e99d5c167e2268a9e9725de745d07e385

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, master, updated. aaa7953b10ffe29b188fdcb1f0fcd2acb5c63795

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 3d39037540593ea07e2b8f6d8ae8c9bfab65d8e0
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 9 00:18:11 2012 +0100

Update version to 1.1.18 used by plexus-compiler 1.8.3

diff --git a/debian/changelog b/debian/changelog
index 918b09b..09433cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-plexus-components (1.1.16+dfsg-1) unstable; urgency=low
+plexus-components (1.1.18+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #654269)
 

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15667 - in trunk/maven-ant-helper: . debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-08 23:31:44 + (Sun, 08 Jan 2012)
New Revision: 15667

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/maven-build.xml
Log:
Add target local-install-doc to maven-build.xml

Modified: trunk/maven-ant-helper/debian/changelog
===
--- trunk/maven-ant-helper/debian/changelog 2012-01-08 13:26:33 UTC (rev 
15666)
+++ trunk/maven-ant-helper/debian/changelog 2012-01-08 23:31:44 UTC (rev 
15667)
@@ -1,3 +1,9 @@
+maven-ant-helper (7.7) UNRELEASED; urgency=low
+
+  * Add target local-install-doc to maven-build.xml
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Sun, 08 Jan 2012 14:45:49 
+0100
+
 maven-ant-helper (7.6) unstable; urgency=low
 
   * Better handling of install in local-repo during build (Closes: #652804).

Modified: trunk/maven-ant-helper/maven-build.xml
===
--- trunk/maven-ant-helper/maven-build.xml  2012-01-08 13:26:33 UTC (rev 
15666)
+++ trunk/maven-ant-helper/maven-build.xml  2012-01-08 23:31:44 UTC (rev 
15667)
@@ -480,4 +480,18 @@
 basedir=${javadoc.dir} /
 /target
 
+target name=local-install-doc depends=javadoc-jar
+mkdir 
dir=${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${debianVersion} 
/
+c:if
+  or
+equals arg1=${type} arg2=jar /
+equals arg1=${type} arg2=bundle /
+  /or
+  then
+  copy 
tofile=${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}.javadoc.jar
+file=${build.directory}/${artifactId}.javadoc.jar/
+  /then
+/c:if
+/target
+
 /project


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Re: How to bootstrap Maven

[Ludovic Claude]

Hello Daniel,

You have done an excellent job here to bootstrap the build of Maven 3. I
cannot think of anothwe way of doing it. It's a pity that Maven 3
requires so much bootstrapping, I have packaged Maven 2.2.2 and was very
careful to avoid such bootstrapping. But it's a long exercise to convert
a Maven build into an Ant build, even with the help of maven-ant-helper.

I have started to remove the need to use Maven for building some of
those packages (currently plexus-compiler builds without Maven in the
latest commit in Git). I'm also improving mh_make --ant (from
maven-debian-helper) to assist the generation of all packaging files
required to build and package a Maven project with Ant. It should be
ready in a few days, then we can run this tool on the packages that you
have bootstrapped and remove this circular build dependency on Maven.

Your problem with maven-scm should also be fixed by fully converting the
build of maven-scm to Ant, as there seem to be some internal build
dependency that is not met by your simple build script.

Ludovic

On 07/01/2012 23:14, Daniel Schepler wrote:
 In my overall pbuildd project, the idea is to bootstrap the Debian archive 
 from the package sources and a minimal starting chroot, using cycle breaker 
 scripts where necessary.  As part of that project, I'm trying to figure out 
 how 
 one would bootstrap the Maven packages (and those of their dependencies which 
 use maven-debian-helper).  So far I have a big long pseudocode script which 
 has gotten me a significant part of the way towards that goal.  The idea is 
 to 
 make heavy use of maven-ant-helper, plus building just selected parts of 
 large 
 compound packages like wagon, doxia, etc.
 
 The questions I have right now are:
 
 1. Is there some much simpler way to do this that I'm missing?
 2. When I get to maven-scm, I run into this build error -- this is a log 
 where 
 I tried adding maven.test.skip=true to debian/maven.properties in order to 
 verify that it's not a test skipping ahead in the dependency chain that's 
 causing this.
 
 ...
 [INFO] 
 
 [INFO] Building Maven SCM TFS Provider
 [INFO]task-segment: [package]
 [INFO] 
 
 [INFO] [resources:resources {execution: default-resources}]
 [WARNING] Using platform encoding (ANSI_X3.4-1968 actually) to copy filtered 
 resources, i.e. build is platform dependent!
 [INFO] skip non existing resourceDirectory /tmp/maven-scm/maven-scm-1.3/maven-
 scm-providers/maven-scm-provider-tfs/src/main/resources
 [INFO] [compiler:compile {execution: default-compile}]
 [INFO] Compiling 19 source files to /tmp/maven-scm/maven-scm-1.3/maven-scm-
 providers/maven-scm-provider-tfs/target/classes
 [INFO] [plexus:descriptor {execution: default}]
 [INFO] Discovered 1 component descriptors(s)
 [INFO] [resources:testResources {execution: default-testResources}]
 [WARNING] Using platform encoding (ANSI_X3.4-1968 actually) to copy filtered 
 resources, i.e. build is platform dependent!
 [INFO] skip non existing resourceDirectory /tmp/maven-scm/maven-scm-1.3/maven-
 scm-providers/maven-scm-provider-tfs/src/test/resources
 [INFO] [compiler:testCompile {execution: default-testCompile}]
 [INFO] Not compiling test sources
 [INFO] [surefire:test {execution: default-test}]
 [INFO] Tests are skipped.
 [INFO] [jar:jar {execution: default-jar}]
 [INFO] Building jar: /tmp/maven-scm/maven-scm-1.3/maven-scm-providers/maven-
 scm-provider-tfs/target/maven-scm-provider-tfs-1.3.jar
 [INFO] 
 
 [INFO] Building Maven SCM Standard Providers
 [INFO]task-segment: [package]
 [INFO] 
 
 [INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
 [INFO] 
 
 [INFO] Building Maven SCM Client
 [INFO]task-segment: [package]
 [INFO] 
 
 [INFO] [plexus:merge-descriptors {execution: merge}]
 [INFO] [resources:resources {execution: default-resources}]
 [WARNING] Using platform encoding (ANSI_X3.4-1968 actually) to copy filtered 
 resources, i.e. build is platform dependent!
 [INFO] Copying 1 resource
 [INFO] [compiler:compile {execution: default-compile}]
 [INFO] Compiling 1 source file to /tmp/maven-scm/maven-scm-1.3/maven-scm-
 client/target/classes
 [INFO] [resources:testResources {execution: default-testResources}]
 [WARNING] Using platform encoding (ANSI_X3.4-1968 actually) to copy filtered 
 resources, i.e. build is platform dependent!
 [INFO] skip non existing resourceDirectory /tmp/maven-scm/maven-scm-1.3/maven-
 scm-client/src/test/resources
 [INFO] [compiler:testCompile {execution: default-testCompile}]
 [INFO] Not compiling test sources
 [INFO] 

[pkg-java] r15668 - in trunk/maven-debian-helper: bin debian maven-packager-utils/src/main/java/org/debian/maven/packager maven-packager-utils/src/main/resources maven-packager-utils/src/test/resource

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-08 23:48:49 + (Sun, 08 Jan 2012)
New Revision: 15668

Added:
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-metadata/
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-metadata/1.0-beta-3.0.7/
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-metadata/1.0-beta-3.0.7/plexus-component-metadata-1.0-beta-3.0.7.jar
   
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-metadata/1.0-beta-3.0.7/plexus-component-metadata-1.0-beta-3.0.7.pom
Modified:
   trunk/maven-debian-helper/bin/mh_make
   trunk/maven-debian-helper/debian/changelog
   
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
   
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build-classpath.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.properties.ant.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.xml.vm
   
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
Log:
Generate package-doc.poms for Ant builds

Modified: trunk/maven-debian-helper/bin/mh_make
===
--- trunk/maven-debian-helper/bin/mh_make   2012-01-08 23:31:44 UTC (rev 
15667)
+++ trunk/maven-debian-helper/bin/mh_make   2012-01-08 23:48:49 UTC (rev 
15668)
@@ -172,10 +172,10 @@
 
 # Restore state after a brutal stop
 if [ -f debian/$BIN_PACKAGE.poms ]; then
-mh_unpatchpoms -p$BIN_PACKAGE
+mh_unpatchpoms -p$BIN_PACKAGE || true
 fi
 if [ -f debian/patches/series ]; then
-quilt pop -a
+quilt pop -a || true
 fi
 
 # Apply existing quilt patchs as source 3(quilt) is used in the package

Modified: trunk/maven-debian-helper/debian/changelog
===
--- trunk/maven-debian-helper/debian/changelog  2012-01-08 23:31:44 UTC (rev 
15667)
+++ trunk/maven-debian-helper/debian/changelog  2012-01-08 23:48:49 UTC (rev 
15668)
@@ -12,6 +12,7 @@
   * Fix failing tests in DependenciesSolverTest
   * Run unit tests during the build,
   * d/control: add B-D on libcommons-io-java as it's used by the junit tests.
+  * Generate package-doc.poms for Ant builds
 
   [ Damien Raude-Morvan ]
   * maven-packager-utils/src/main/resources/build.xml.vm: package-module ant

Modified: 
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
===
--- 
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
  2012-01-08 23:31:44 UTC (rev 15667)
+++ 
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
  2012-01-08 23:48:49 UTC (rev 15668)
@@ -26,16 +26,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -89,6 +80,9 @@
 private static final String[][] PLUGINS_THAT_CAN_BE_IGNORED = {
 {org.apache.maven.plugins, maven-ant-plugin},
 {org.apache.maven.plugins, maven-assembly-plugin},
+{org.apache.maven.plugins, maven-enforcer-plugin},
+{org.apache.maven.plugins, maven-gpg-plugin},
+{org.apache.rat, apache-rat-plugin},
 {org.codehaus.mojo, buildnumber-maven-plugin},
 {org.apache.maven.plugins, maven-verifier-plugin},
 {org.codehaus.mojo, findbugs-maven-plugin},
@@ -499,10 +493,36 @@
 
 public void setOutputDirectory(File outputDirectory) {
 this.outputDirectory = outputDirectory;
-pomTransformer.getRules().setRulesFile(new File(outputDirectory, 
maven.rules));
-pomTransformer.getIgnoreRules().setRulesFile(new File(outputDirectory, 
maven.ignoreRules));
-pomTransformer.getPublishedRules().setRulesFile(new 
File(outputDirectory, maven.publishedRules));
-cleanIgnoreRules.setRulesFile(new File(outputDirectory, 
maven.cleanIgnoreRules));
+File rulesFile = new File(outputDirectory, maven.rules);
+if (rulesFile.exists()  verbose) {
+System.out.println(Use 

[pkg-java] r15669 - in trunk/maven-repo-helper/src: main/java/org/debian/maven/repo test/java/org/debian/maven/repo

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-08 23:50:06 + (Sun, 08 Jan 2012)
New Revision: 15669

Modified:
   
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
   
trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/DependencyRuleTest.java
Log:
Update tests

Modified: 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
===
--- 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
  2012-01-08 23:48:49 UTC (rev 15668)
+++ 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
  2012-01-08 23:50:06 UTC (rev 15669)
@@ -146,7 +146,7 @@
 out.println(description);
 
 for (DependencyRule rule: getRules()) {
-if (dontDuplicate == null || 
!dontDuplicate.getRules().contains(rule)
+if ((dontDuplicate == null || 
!dontDuplicate.getRules().contains(rule))
 // Don't save implicit rules
  !DependencyRule.TO_DEBIAN_VERSION_RULE.equals(rule)
  
!DependencyRule.MAVEN_PLUGINS_KEEP_VERSION_RULE.equals(rule)) {

Modified: 
trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/DependencyRuleTest.java
===
--- 
trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/DependencyRuleTest.java
 2012-01-08 23:48:49 UTC (rev 15668)
+++ 
trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/DependencyRuleTest.java
 2012-01-08 23:50:06 UTC (rev 15669)
@@ -65,4 +65,8 @@
 assertEquals(0, servlet23.compareTo(servlet23));
 }
 
+public void testEquals() {
+DependencyRule mavenPlugin = new DependencyRule(* * maven-plugin * * 
*);
+
assertTrue(mavenPlugin.equals(DependencyRule.MAVEN_PLUGINS_KEEP_VERSION_RULE));
+}
 }


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Re: maven-debian-helper: porting to dh(1)?

[Ludovic Claude]

Hello Steve,

Thanks for starting this task. You save me here, as my Perl skills are
next to zero. To answer to your questions, I would say:

- dh_auto_test could run mvn test, but this doesn't looks really needed
as a standard Maven build using package or install as target will launch
the unit tests unless they have been disabled. I would favour making
dh_auto_test a noop.

- dh_auto_build (and maven.mk for that matter) would benefit from using
install as the default target, as this fixes problems when building some
complex projects, and don't have any bad side effect. The only minus is
that the build uses slightly more time and space.

- the custom classpath using DEB_JARS or whatever you want to name it
sounds unecessary and bad practice as Maven takes care of all classpath
issues. You're allowing packagers to play with the internals of Maven,
and while I added this DEB_JARS to maven.mk, it's not a good idea to
keep it for dh. Anyway (and fortunately), nobody seems to use it.

- The double invocation of classworlds.jar actually launches Maven twice
- with different targets. We can easily optimize things here and launch
Maven only once, but with several targets, for example 'install
javadoc:jar'. The -Ddebian.package argument doesn't seem useful here.

- mh_patchpoms and mh_unpatchpoms can be improved to scan the list of
packages and find the *.poms files that they need in order to patch all
used POM files. I can copy the code already present in mh_install, it
will require a new release of maven-repo-helper.

- mvn-debian can be more actively maintained, I need to see how exactly
we can use it in your dh script.

Ludovic


On 08/01/2012 04:50, Steve Langasek wrote:
 Hi folks,
 
 The wiki page at http://wiki.debian.org/Java/MavenBuilder mentions that
 supporting dh(1) is on the todo list.  As getting rid of cdbs interests me,
 I took a stab at implementing this.  The result is attached.
 
 With this on the system, a maven-using package can have a dh(1) debian/rules
 that looks like this (taken from activemq):
 
 #!/usr/bin/make -f
 
 %:
   dh $@ --buildsystem=maven
 
 override_dh_auto_build:
   dh_auto_build -- install
 
 override_dh_install:
   dh_install
   chmod 644 
 debian/activemq/etc/activemq/instances-available/main/log4j.properties
   chmod 644 
 debian/activemq/usr/share/doc/activemq/examples/conf/log4j.properties
   chmod 644 debian/activemq/usr/share/activemq/README.txt
 
 get-orig-source:
   uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download 
 --rename
 
 
 There are a few things that I feel are still moderately un-dh-like about
 this system, however, and I wonder if anyone here has ideas about how to
 improve it.
 
  - dh_auto_test isn't usable with this build system, because there is
evidently no standard 'check' target.  Is there some way that the
existence of a suitable target could be detected at build time?  (As a
fallback, we could make dh_auto_test a no-op except when overridden and
an extra argument has been passed for the target.)
 
  - Likewise, the only target supported by the build system is 'package', and
if the build system uses another, this must be passed as an argument to
dh_auto_build (see above).  Torsten assures me that 'package' is the
standard target and everything else is non-standard, but in my
unscientific examination of packages so far, 'install' seems to be a
fairly common alternative.
 
  - Extending the classpath for maven is done using a DEB_JARS envvar.  This
is rather un-dh; it also has weird semantics (inherited from the cdbs
class) in that it takes jar names in various formats and tries to search
the system for them.  At the very least, the variable name should
probably be changed for dh; DEB_ as a prefix for variables defined within
debian/rules is a cdbs-ism.  Would MAVEN_JARS be ok here?
 
  - The double invocation of classworlds.jar, once for the main package and
once for the docs package, is a bit awkward, and feeds into some of the
problems above.  For instance, since there's only one invocation of
dh_auto_build, you can't easily specify extra/alternative arguments that
you want to have passed for docs building but not for building of the
main package.  (BTW, does anyone know why the CDBS rules pass
-Ddebian.package when building docs, but not when building the main
package?)
 
  - The build system has to know the names of the binary packages its
building for.  This is certainly unusual, since dh_auto_build means
build the upstream code, dh_auto_install means install the upstream
software relative to a target directory, and only dh_install is used to
split the software into component binary packages.  In this case,
however, we have to know the name of the binary package we're acting on
to even call mh_patchpoms.  I don't see any way around this, but the net
effect is that dh_auto_* always have to be 

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 2ac1311fea234fc6dbf744c7b79559759f1fc960
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 00:45:57 2012 +0100

New upstream version, build missing modules

diff --git a/debian/changelog b/debian/changelog
index bc21d62..a5be000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+plexus-compiler (1.8.2-1) UNRELEASED; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Add dependency on libplexus-components-java, libecj-java
+  * Update description
+  * d/maven.rules: use version 1.x for the artifacts in this package instead
+of 'debian'
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 03 Jan 2012 00:27:31 
+0100
+
 plexus-compiler (1.6-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1b7..ebb7333 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: plexus-compiler
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Torsten Werner twer...@debian.org
+Uploaders: Torsten Werner twer...@debian.org, Ludovic Claude 
ludovic.cla...@laposte.net
 Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (= 
1.4)
-Build-Depends-Indep: libplexus-component-metadata-java, libcommons-lang-java, 
libmaven2-core-java,  
+Build-Depends-Indep: libplexus-component-metadata-java, libcommons-lang-java 
(= 2.0),
+ libecj-java, libmaven2-core-java, libplexus-components-java (= 1.1.16), 
  libplexus-container-default-java, libplexus-utils-java, junit (= 3.8.2),  
  default-jdk-doc, libmaven2-core-java-doc, 
libplexus-container-default-java-doc,  
  libplexus-utils-java-doc, libmaven-javadoc-plugin-java, libaspectj-java
@@ -24,13 +25,14 @@ Breaks: libplexus-compiler-api-java ( 1.6-1~),
 Replaces: libplexus-compiler-api-java ( 1.6-1~),
  libplexus-compiler-manager-java ( 1.6-1~),
  libplexus-compiler-javac-java ( 1.6-1~)
-Description: API for the Plexus compiler system
+Description: Plexus compiler system
  The Plexus project provides a full software stack for creating and executing
  software projects. Based on the Plexus container, the applications can
  utilise component-oriented programming to build modular, reusable components
  that can easily be assembled and reused.
  .
- This package provides the Plexus Compiler API.
+ This package provides the Plexus Compiler API and its implementation modules
+ supporting javac, jikes, eclipse, aspectj and csharp compilers.
 
 # DISABLED because javadoc fails:
 #Package: libplexus-compiler-java-doc
diff --git a/debian/libplexus-compiler-java.poms 
b/debian/libplexus-compiler-java.poms
index 9387c1a..89f8617 100644
--- a/debian/libplexus-compiler-java.poms
+++ b/debian/libplexus-compiler-java.poms
@@ -25,13 +25,13 @@
 #   --site-xml=location: Optional, the location for site.xml if it needs to 
be installed.
 # Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
+pom.xml --has-package-version
 plexus-compiler-api/pom.xml --has-package-version
 plexus-compiler-test/pom.xml --has-package-version
 plexus-compiler-manager/pom.xml --has-package-version
 plexus-compilers/pom.xml --has-package-version
-plexus-compilers/plexus-compiler-aspectj/pom.xml --ignore
+plexus-compilers/plexus-compiler-aspectj/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version
-plexus-compilers/plexus-compiler-eclipse/pom.xml --ignore
+plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version
+plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version
-plexus-compilers/plexus-compiler-jikes/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index b47b61d..d9825b6 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -13,5 +13,5 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., this dependency is then removed
 # from the POM before mvn clean is called
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 0088a40..a555a53 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -12,5 +12,6 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., this dependency is then removed
 # from the POM
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
+org.apache.maven.plugins maven-gpg-plugin * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index 822f087..77aa245 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -15,5 +15,5 @@
 # All elements much match before a rule can be applied
 # Example rule: match jar with groupid= junit

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 5157f82ee9a7fab7fb44e9798078e6c134deea55
Merge: 7d5296d4f946a4fc533047b2616829656ff35b1d 
bfc49d5cca7e5adeaed4dd9fb73559952450b2dc
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 01:07:48 2012 +0100

Merge commit 'upstream/1.8.3'


-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit a9a5b7f8164248a57f48d111d7a1e285756baad4
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 17:21:40 2012 +0100

Update Maven rules

diff --git a/debian/maven.rules b/debian/maven.rules
index e9fb3ba..31f799d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,18 +17,18 @@
 #   junit junit jar s/3\..*/3.x/
 
 junit junit jar s/3\..*/3.x/ * *
-org.codehaus.plexus plexus-compiler-api jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-aspectj jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-csharp jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-eclipse jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-javac jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-jikes jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-manager jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-test jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler pom s/.*/debian/ * *
-org.codehaus.plexus plexus-compilers pom s/.*/debian/ * *
-org.codehaus.plexus plexus-component-metadata * s/.*/1.0-beta-3.0.7/ * *
-org.codehaus.plexus plexus-container-default * s/.*/1.0-alpha/ * *
-org.codehaus.plexus plexus-utils * s/.*/debian/ * *
+org.codehaus.plexus plexus-compiler-api jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-aspectj jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-csharp jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-eclipse jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-javac jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-jikes jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-manager jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler-test jar s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compiler pom s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-compilers pom s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-components pom s/1\..*/1.x/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+s/org.eclipse.jdt/org.eclipse.jdt.core.compiler/ s/core/ecj/ jar s/.*/debian/ 
* *
 s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
 s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 0fe9534..562f1f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-#DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 
 get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download 
--rename

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 7d5296d4f946a4fc533047b2616829656ff35b1d
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 01:04:37 2012 +0100

d/watch: update to new location on Github

diff --git a/debian/changelog b/debian/changelog
index a5be000..3676bb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ plexus-compiler (1.8.2-1) UNRELEASED; urgency=low
   * Update description
   * d/maven.rules: use version 1.x for the artifacts in this package instead
 of 'debian'
+  * d/watch: update to new location on Github
+  * d/orig-tar.sh: remove as it's not needed anymore
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 03 Jan 2012 00:27:31 
+0100
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index f490079..000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../plexus-compiler_$VERSION.orig.tar.gz
-DIR=plexus-compiler-$VERSION
-TAG=$(echo plexus-compiler-$VERSION | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.codehaus.org/plexus/plexus-components/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir  echo moved $TAR to $origDir
-fi
diff --git a/debian/watch b/debian/watch
index 6a9c4bd..f733479 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=uversionmangle=s/-(alpha|beta)-/~$1/ \
-  http://svn.codehaus.org/plexus/plexus-components/tags/ \
-  plexus-compiler-(\d.*)/ debian debian/orig-tar.sh
+opts=dversionmangle=s/\+dfsg//,uversionmangle=s/_/./ \
+http://githubredir.debian.net/github/sonatype/plexus-compiler/ 
plexus-compiler-(.*).tar.gz
+

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 6573c5a4bbcdea52534ef38bcb5b68e5a05444e8
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 20:04:14 2012 +0100

Remove old patches

diff --git 
a/debian/patches/0001-add-version-1.5.5-to-dependency-plexus-util.patch 
b/debian/patches/0001-add-version-1.5.5-to-dependency-plexus-util.patch
deleted file mode 100644
index 2d1c5bc..000
--- a/debian/patches/0001-add-version-1.5.5-to-dependency-plexus-util.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Torsten Werner twer...@debian.org
-Date: Thu, 25 Aug 2011 23:38:12 +0200
-Subject: [PATCH] add version 1.5.5 to dependency plexus-util
-
-Otherwise Maven failes to validate some POMs.

- pom.xml |5 +
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index e1f7185..b2a8181 100644
 a/pom.xml
-+++ b/pom.xml
-@@ -40,6 +40,11 @@
- artifactIdplexus-compiler-test/artifactId
- version${project.version}/version
-   /dependency
-+  dependency
-+groupIdorg.codehaus.plexus/groupId
-+artifactIdplexus-utils/artifactId
-+version1.5.5/version
-+  /dependency
- /dependencies
-   /dependencyManagement
-   dependencies
--- 
diff --git a/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch 
b/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch
deleted file mode 100644
index cedcc0d..000
--- a/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: b/plexus-compiler-api/pom.xml
-===
 a/plexus-compiler-api/pom.xml
-+++ b/plexus-compiler-api/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compiler/artifactId
- version1.6/version
-+relativePath../pom.xml/relativePath
-   /parent
- 
-   artifactIdplexus-compiler-api/artifactId
-Index: b/plexus-compiler-manager/pom.xml
-===
 a/plexus-compiler-manager/pom.xml
-+++ b/plexus-compiler-manager/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compiler/artifactId
- version1.6/version
-+relativePath../pom.xml/relativePath
-   /parent
- 
-   artifactIdplexus-compiler-manager/artifactId
-Index: b/plexus-compiler-test/pom.xml
-===
 a/plexus-compiler-test/pom.xml
-+++ b/plexus-compiler-test/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compiler/artifactId
- version1.6/version
-+relativePath../pom.xml/relativePath
-   /parent
- 
-   artifactIdplexus-compiler-test/artifactId
-Index: b/plexus-compilers/plexus-compiler-aspectj/pom.xml
-===
 a/plexus-compilers/plexus-compiler-aspectj/pom.xml
-+++ b/plexus-compilers/plexus-compiler-aspectj/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compilers/artifactId
- version1.6/version
-+relativePath../pom.xml/relativePath
-   /parent
- 
-   artifactIdplexus-compiler-aspectj/artifactId
-Index: b/plexus-compilers/plexus-compiler-csharp/pom.xml
-===
 a/plexus-compilers/plexus-compiler-csharp/pom.xml
-+++ b/plexus-compilers/plexus-compiler-csharp/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compilers/artifactId
- version1.6/version
-+relativePath../pom.xml/relativePath
-   /parent
- 
-   artifactIdplexus-compiler-csharp/artifactId
-Index: b/plexus-compilers/plexus-compiler-eclipse/pom.xml
-===
 a/plexus-compilers/plexus-compiler-eclipse/pom.xml
-+++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compilers/artifactId
- version1.6/version
-+relativePath../pom.xml/relativePath
-   /parent
- 
-   artifactIdplexus-compiler-eclipse/artifactId
-Index: b/plexus-compilers/plexus-compiler-javac/pom.xml
-===
 a/plexus-compilers/plexus-compiler-javac/pom.xml
-+++ b/plexus-compilers/plexus-compiler-javac/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compilers/artifactId
- version1.6/version
-+relativePath../pom.xml/relativePath
-   /parent
- 
-   artifactIdplexus-compiler-javac/artifactId
-Index: b/plexus-compilers/plexus-compiler-jikes/pom.xml
-===
 a/plexus-compilers/plexus-compiler-jikes/pom.xml
-+++ b/plexus-compilers/plexus-compiler-jikes/pom.xml
-@@ -6,6 +6,7 @@
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-compilers

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 11541bad87261a934e9815be15cee549eca20283
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 21:07:46 2012 +0100

Add new patches to fix tests

diff --git a/debian/patches/fix_test_classpath.patch 
b/debian/patches/fix_test_classpath.patch
new file mode 100644
index 000..c7074fd
--- /dev/null
+++ b/debian/patches/fix_test_classpath.patch
@@ -0,0 +1,11 @@
+--- 
a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
 
b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
+@@ -68,7 +68,7 @@
+ {
+ List cp = new ArrayList();
+ 
+-File file = getLocalArtifactPath( commons-lang, commons-lang, 
2.0, jar );
++File file = getLocalArtifactPath( commons-lang, commons-lang, 
debian, jar );
+ 
+ assertTrue( test prerequisite: commons-lang library must be 
available in local repository, expected 
+ + file.getAbsolutePath(), file.canRead() );
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..9935f49
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_test_classpath.patch

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 561cb4a2d9fb50fbd0fae9e0a1b0afa4c0bee5e1
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 01:08:48 2012 +0100

New upstream version 1.8.3

diff --git a/debian/changelog b/debian/changelog
index 3676bb0..528e81f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-plexus-compiler (1.8.2-1) UNRELEASED; urgency=low
+plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
 
   * New upstream version, add myself to Uploaders
   * Add dependency on libplexus-components-java, libecj-java

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 67377b65959395c13b7bc6f92242d715d9c818c7
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 21:17:13 2012 +0100

Update changelog

diff --git a/debian/TODO b/debian/TODO
index 81d80c8..c77a16a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,3 +1,2 @@
-- fix test failures
 - fix javadoc build
-- build disabled modules
+- build disabled plexus-aspectj-compiler module
diff --git a/debian/changelog b/debian/changelog
index 528e81f..477cf87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
 plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
 
   * New upstream version, add myself to Uploaders
-  * Add dependency on libplexus-components-java, libecj-java
+  * Add dependency on libplexus-components-java, libecj-java,
+  * Remove dependency on libaspectj-java, as plexus-aspectj-compiler
+cannot compile with AspectJ 1.6
   * Update description
   * d/maven.rules: use version 1.x for the artifacts in this package instead
 of 'debian'
   * d/watch: update to new location on Github
   * d/orig-tar.sh: remove as it's not needed anymore
+  * p/patches: remove old patches, not needed anymore as the parent POM
+is now packaged and contains the same information,
+add a patch to fix the failing unit tests
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 03 Jan 2012 00:27:31 
+0100
 

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 8c42ef2eb06aee306c4765543d4b25ea26c05374
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 20:44:51 2012 +0100

Don't compile plexus-compiler-aspectj, it doesn't work with current AspectJ 
1.6

diff --git a/debian/control b/debian/control
index ebb7333..cfcbc06 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends-Indep: libplexus-component-metadata-java, 
libcommons-lang-java (=
  libecj-java, libmaven2-core-java, libplexus-components-java (= 1.1.16), 
  libplexus-container-default-java, libplexus-utils-java, junit (= 3.8.2),  
  default-jdk-doc, libmaven2-core-java-doc, 
libplexus-container-default-java-doc,  
- libplexus-utils-java-doc, libmaven-javadoc-plugin-java, libaspectj-java
+ libplexus-utils-java-doc, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-compiler.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-compiler.git
diff --git a/debian/libplexus-compiler-java.poms 
b/debian/libplexus-compiler-java.poms
index 89f8617..8c31adb 100644
--- a/debian/libplexus-compiler-java.poms
+++ b/debian/libplexus-compiler-java.poms
@@ -30,7 +30,7 @@ plexus-compiler-api/pom.xml --has-package-version
 plexus-compiler-test/pom.xml --has-package-version
 plexus-compiler-manager/pom.xml --has-package-version
 plexus-compilers/pom.xml --has-package-version
-plexus-compilers/plexus-compiler-aspectj/pom.xml --has-package-version
+plexus-compilers/plexus-compiler-aspectj/pom.xml --ignore
 plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index 31f799d..3396c38 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -30,5 +30,5 @@ org.codehaus.plexus plexus-compilers pom s/1\..*/1.x/ * *
 org.codehaus.plexus plexus-components pom s/1\..*/1.x/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 s/org.eclipse.jdt/org.eclipse.jdt.core.compiler/ s/core/ecj/ jar s/.*/debian/ 
* *
-s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
-s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *
+#s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
+#s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit f3633b9b21e3e8108b05446e3c489a0a4533f717
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 22:42:10 2012 +0100

Fix build script

diff --git a/debian/build.xml b/debian/build.xml
index f39c111..b0f129e 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -21,11 +21,11 @@
 clean-module dir=plexus-compiler-api/
 clean-module dir=plexus-compiler-test/
 clean-module dir=plexus-compiler-manager/
-clean-module dir=plexus-compiler-csharp/
-clean-module dir=plexus-compiler-eclipse/
-clean-module dir=plexus-compiler-jikes/
-clean-module dir=plexus-compiler-javac/
 clean-module dir=plexus-compilers/
+clean-module dir=plexus-compilers/plexus-compiler-csharp/
+clean-module dir=plexus-compilers/plexus-compiler-eclipse/
+clean-module dir=plexus-compilers/plexus-compiler-jikes/
+clean-module dir=plexus-compilers/plexus-compiler-javac/
 /target
 
 target name=package
@@ -33,11 +33,11 @@
 package-module dir=plexus-compiler-api/
 package-module dir=plexus-compiler-test/
 package-module dir=plexus-compiler-manager/
-package-module dir=plexus-compiler-csharp/
-package-module dir=plexus-compiler-eclipse/
-package-module dir=plexus-compiler-jikes/
-package-module dir=plexus-compiler-javac/
 package-module dir=plexus-compilers/
+package-module dir=plexus-compilers/plexus-compiler-csharp/
+package-module dir=plexus-compilers/plexus-compiler-eclipse/
+package-module dir=plexus-compilers/plexus-compiler-jikes/
+package-module dir=plexus-compilers/plexus-compiler-javac/
 /target
 
 target name=javadoc
@@ -45,14 +45,13 @@
 packageset dir=plexus-compiler-api/src/main/java//
 packageset dir=plexus-compiler-test/src/main/java//
 packageset dir=plexus-compiler-manager/src/main/java//
-packageset dir=plexus-compiler-csharp/src/main/java//
-packageset dir=plexus-compiler-eclipse/src/main/java//
-packageset dir=plexus-compiler-jikes/src/main/java//
-packageset dir=plexus-compiler-javac/src/main/java//
-packageset dir=plexus-compilers/src/main/java//
+packageset 
dir=plexus-compilers/plexus-compiler-csharp/src/main/java//
+packageset 
dir=plexus-compilers/plexus-compiler-eclipse/src/main/java//
+packageset 
dir=plexus-compilers/plexus-compiler-jikes/src/main/java//
+packageset 
dir=plexus-compilers/plexus-compiler-javac/src/main/java//
 /javadoc
 /target
 
 target name=build-all depends=package, javadoc /
 
-/project
\ No newline at end of file
+/project

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 694a75bd9180abb1bab72b66d0162f78c6863ade
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 22:43:13 2012 +0100

Fix version in d/control

diff --git a/debian/control b/debian/control
index 8dee05d..9d7854f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Torsten Werner twer...@debian.org, Ludovic Claude 
ludovic.claude@l
 Build-Depends: debhelper (= 7), default-jdk, maven-repo-helper (= 1.5), 
ant-optional, maven-ant-helper (= 7.1)
 Build-Depends-Indep: libcommons-lang-java (= 2.0),
  libecj-java, libmaven2-core-java, libplexus-components-java (= 1.1.16), 
- libplexus-container-default-java, libplexus-utils-java (= 1.5.15, junit (= 
3.8.2),
+ libplexus-container-default-java, libplexus-utils-java (= 1.5.15), junit (= 
3.8.2),
  default-jdk-doc, libmaven2-core-java-doc, 
libplexus-container-default-java-doc,
  libplexus-utils-java-doc
 Standards-Version: 3.9.2

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit fd7da26b31386356dfa1fa2977fec87903b51fb8
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 22:46:13 2012 +0100

Add missing macro package-module

diff --git a/debian/build.xml b/debian/build.xml
index b0f129e..69dd8b1 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -16,6 +16,17 @@
 /sequential
 /macrodef
 
+macrodef name=package-module
+attribute name=dir/
+sequential
+  ant target=package-and-local-install antfile=${maven.build} 
dir=@{dir}
+property name=debian.dir location=debian /
+property name=project.dir value=@{dir} /
+property name=keep-cleaned-pom value=true /
+  /ant
+/sequential
+/macrodef
+
 target name=clean
 clean-module dir=/
 clean-module dir=plexus-compiler-api/

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 59232949a09bb7b291093cc84a34596c8d0b0998
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Thu Jan 5 00:50:14 2012 +0100

Fix build classpath

diff --git a/debian/build-classpath b/debian/build-classpath
index a3d49a2..8afb9ab 100644
--- a/debian/build-classpath
+++ b/debian/build-classpath
@@ -9,3 +9,11 @@
 /usr/share/java/maven-repository-metadata.jar
 /usr/share/java/plexus-container-default-alpha.jar
 /usr/share/java/plexus-utils.jar
+${basedir}/plexus-compiler-api/target/plexus-compiler-api-${version}.jar
+${basedir}/plexus-compiler-test/target/plexus-compiler-test-${version}.jar
+${basedir}/plexus-compiler-manager/target/plexus-compiler-manager-${version}.jar
+${basedir}/plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-${version}.jar
+${basedir}/plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-${version}.jar
+${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar
+${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar
+${basedir}/plexus-compilers/target/plexus-compilers-${version}.jar
diff --git a/debian/build.xml b/debian/build.xml
index 69dd8b1..df96d87 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -29,26 +29,26 @@
 
 target name=clean
 clean-module dir=/
-clean-module dir=plexus-compiler-api/
-clean-module dir=plexus-compiler-test/
-clean-module dir=plexus-compiler-manager/
-clean-module dir=plexus-compilers/
-clean-module dir=plexus-compilers/plexus-compiler-csharp/
-clean-module dir=plexus-compilers/plexus-compiler-eclipse/
-clean-module dir=plexus-compilers/plexus-compiler-jikes/
-clean-module dir=plexus-compilers/plexus-compiler-javac/
+clean-module dir=plexus-compiler-api//
+clean-module dir=plexus-compiler-test//
+clean-module dir=plexus-compiler-manager//
+clean-module dir=plexus-compilers/plexus-compiler-csharp//
+clean-module dir=plexus-compilers/plexus-compiler-eclipse//
+clean-module dir=plexus-compilers/plexus-compiler-jikes//
+clean-module dir=plexus-compilers/plexus-compiler-javac//
+clean-module dir=plexus-compilers//
 /target
 
 target name=package
 package-module dir=/
-package-module dir=plexus-compiler-api/
-package-module dir=plexus-compiler-test/
-package-module dir=plexus-compiler-manager/
-package-module dir=plexus-compilers/
-package-module dir=plexus-compilers/plexus-compiler-csharp/
-package-module dir=plexus-compilers/plexus-compiler-eclipse/
-package-module dir=plexus-compilers/plexus-compiler-jikes/
-package-module dir=plexus-compilers/plexus-compiler-javac/
+package-module dir=plexus-compiler-api//
+package-module dir=plexus-compiler-test//
+package-module dir=plexus-compiler-manager//
+package-module dir=plexus-compilers/plexus-compiler-csharp//
+package-module dir=plexus-compilers/plexus-compiler-eclipse//
+package-module dir=plexus-compilers/plexus-compiler-jikes//
+package-module dir=plexus-compilers/plexus-compiler-javac//
+package-module dir=plexus-compilers//
 /target
 
 target name=javadoc
@@ -65,4 +65,4 @@
 
 target name=build-all depends=package, javadoc /
 
-/project
+/project
\ No newline at end of file

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 8f551bd559fe4d218fec77ae008e9ea94386d4c6
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 22:39:02 2012 +0100

* d/rules: use debhelper and Ant for the build as Maven is a build 
dependency of plexus-compiler
* d/control: Remove Build-Depends on cdbs, maven-debian-helper,
  libplexus-component-metadata-java
* Add Build-Depends on maven-repo-helper, ant-optional, maven-ant-helper,
  default-jdk-doc, libmaven2-core-java-doc,
  libplexus-container-default-java-doc, libplexus-utils-java-doc

diff --git a/debian/README.source b/debian/README.source
index 957b703..e742305 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,6 +4,3 @@ Information about plexus-compiler
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
 
-The build system uses Maven but prevents it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.
diff --git a/debian/build-classpath b/debian/build-classpath
new file mode 100644
index 000..a3d49a2
--- /dev/null
+++ b/debian/build-classpath
@@ -0,0 +1,11 @@
+/usr/share/java/ant-nodeps.jar
+/usr/share/java/ant-junit.jar
+/usr/share/java/commons-lang.jar
+/usr/share/java/ecj.jar
+/usr/share/java/junit.jar
+/usr/share/java/maven-core.jar
+/usr/share/java/maven-model.jar
+/usr/share/java/maven-project.jar
+/usr/share/java/maven-repository-metadata.jar
+/usr/share/java/plexus-container-default-alpha.jar
+/usr/share/java/plexus-utils.jar
diff --git a/debian/build.properties b/debian/build.properties
new file mode 100644
index 000..dd0f8aa
--- /dev/null
+++ b/debian/build.properties
@@ -0,0 +1,3 @@
+build.directory=target
+javadoc.dir=target/apidocs
+javadoc.generate=true
diff --git a/debian/build.xml b/debian/build.xml
new file mode 100644
index 000..f39c111
--- /dev/null
+++ b/debian/build.xml
@@ -0,0 +1,58 @@
+?xml version=1.0?
+
+project name=pkg-java default=build-all basedir=..
+
+property file=debian/build.properties/
+property name=maven.build 
value=/usr/share/maven-ant-helper/maven-build.xml/
+property file=/usr/share/maven-ant-helper/maven-defaults.properties/
+
+macrodef name=clean-module
+attribute name=dir/
+sequential
+  ant target=clean antfile=${maven.build} dir=@{dir}
+property name=debian.dir location=debian /
+property name=project.dir value=@{dir} /
+  /ant
+/sequential
+/macrodef
+
+target name=clean
+clean-module dir=/
+clean-module dir=plexus-compiler-api/
+clean-module dir=plexus-compiler-test/
+clean-module dir=plexus-compiler-manager/
+clean-module dir=plexus-compiler-csharp/
+clean-module dir=plexus-compiler-eclipse/
+clean-module dir=plexus-compiler-jikes/
+clean-module dir=plexus-compiler-javac/
+clean-module dir=plexus-compilers/
+/target
+
+target name=package
+package-module dir=/
+package-module dir=plexus-compiler-api/
+package-module dir=plexus-compiler-test/
+package-module dir=plexus-compiler-manager/
+package-module dir=plexus-compiler-csharp/
+package-module dir=plexus-compiler-eclipse/
+package-module dir=plexus-compiler-jikes/
+package-module dir=plexus-compiler-javac/
+package-module dir=plexus-compilers/
+/target
+
+target name=javadoc
+javadoc destdir=${javadoc.dir}
+packageset dir=plexus-compiler-api/src/main/java//
+packageset dir=plexus-compiler-test/src/main/java//
+packageset dir=plexus-compiler-manager/src/main/java//
+packageset dir=plexus-compiler-csharp/src/main/java//
+packageset dir=plexus-compiler-eclipse/src/main/java//
+packageset dir=plexus-compiler-jikes/src/main/java//
+packageset dir=plexus-compiler-javac/src/main/java//
+packageset dir=plexus-compilers/src/main/java//
+/javadoc
+/target
+
+target name=build-all depends=package, javadoc /
+
+/project
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 477cf87..287a908 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
 
   * New upstream version, add myself to Uploaders
+  * d/rules: use debhelper and Ant for the build as Maven
+is a build dependency of plexus-compiler
+  * d/control: Remove Build-Depends on cdbs, maven-debian-helper,
+libplexus-component-metadata-java
+  * Add Build-Depends on maven-repo-helper, ant-optional, maven-ant-helper,
+default-jdk-doc, libmaven2-core-java-doc,
+libplexus-container-default-java-doc, libplexus-utils-java-doc
   * Add dependency on libplexus-components-java, libecj-java,
   * Remove dependency on libaspectj-java, as plexus-aspectj-compiler
 cannot

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit cc9f4f0e57b3e3fe659ba725ebdab92ae86976cb
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Thu Jan 5 00:55:41 2012 +0100

Debug

diff --git a/debian/rules b/debian/rules
index c770461..9676011 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ export CLASSPATH=$(shell for jar in `cat 
debian/build-classpath`; do if [ -f $$
 export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f 
debian/build.xml
 
 %:
+   echo $(CLASSPATH)
dh $@ --buildsystem=ant --with maven_repo_helper
 
 get-orig-source:

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit b9303d6068e538b872e5f4e6cc9c4c872114e290
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Thu Jan 5 01:22:44 2012 +0100

Fix build -second attempt

diff --git a/debian/build-classpath b/debian/build-classpath
index 8afb9ab..5bfa9ce 100644
--- a/debian/build-classpath
+++ b/debian/build-classpath
@@ -1,19 +1 @@
 /usr/share/java/ant-nodeps.jar
-/usr/share/java/ant-junit.jar
-/usr/share/java/commons-lang.jar
-/usr/share/java/ecj.jar
-/usr/share/java/junit.jar
-/usr/share/java/maven-core.jar
-/usr/share/java/maven-model.jar
-/usr/share/java/maven-project.jar
-/usr/share/java/maven-repository-metadata.jar
-/usr/share/java/plexus-container-default-alpha.jar
-/usr/share/java/plexus-utils.jar
-${basedir}/plexus-compiler-api/target/plexus-compiler-api-${version}.jar
-${basedir}/plexus-compiler-test/target/plexus-compiler-test-${version}.jar
-${basedir}/plexus-compiler-manager/target/plexus-compiler-manager-${version}.jar
-${basedir}/plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-${version}.jar
-${basedir}/plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-${version}.jar
-${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar
-${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar
-${basedir}/plexus-compilers/target/plexus-compilers-${version}.jar
diff --git a/debian/build.properties b/debian/build.properties
index dd0f8aa..2e4f6c6 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -1,3 +1,12 @@
 build.directory=target
 javadoc.dir=target/apidocs
 javadoc.generate=true
+classpath.compile=\
+${basedir}/plexus-compiler-api/target/plexus-compiler-api-${version}.jar:\
+
${basedir}/plexus-compiler-test/target/plexus-compiler-test-${version}.jar:\
+
${basedir}/plexus-compiler-manager/target/plexus-compiler-manager-${version}.jar:\
+
${basedir}/plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-${version}.jar:\
+
${basedir}/plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-${version}.jar:\
+
${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar:\
+
${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar:\
+  target/classes
diff --git a/debian/rules b/debian/rules
index 9676011..c770461 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@ export CLASSPATH=$(shell for jar in `cat 
debian/build-classpath`; do if [ -f $$
 export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f 
debian/build.xml
 
 %:
-   echo $(CLASSPATH)
dh $@ --buildsystem=ant --with maven_repo_helper
 
 get-orig-source:

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 9385cb62c9cfc8f3d9ddc718db67f3e9bf0777e5
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Fri Jan 6 00:02:41 2012 +0100

Fix classpath

diff --git a/debian/build.properties b/debian/build.properties
index 2e4f6c6..746c30a 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -2,11 +2,21 @@ build.directory=target
 javadoc.dir=target/apidocs
 javadoc.generate=true
 classpath.compile=\
-${basedir}/plexus-compiler-api/target/plexus-compiler-api-${version}.jar:\
-
${basedir}/plexus-compiler-test/target/plexus-compiler-test-${version}.jar:\
-
${basedir}/plexus-compiler-manager/target/plexus-compiler-manager-${version}.jar:\
-
${basedir}/plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-${version}.jar:\
-
${basedir}/plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-${version}.jar:\
-
${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar:\
-
${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar:\
+  /usr/share/java/ant-junit.jar:\
+  /usr/share/java/commons-lang.jar:\
+  /usr/share/java/ecj.jar:\
+  /usr/share/java/junit.jar:\
+  /usr/share/java/maven-core.jar:\
+  /usr/share/java/maven-model.jar:\
+  /usr/share/java/maven-project.jar:\
+  /usr/share/java/maven-repository-metadata.jar:\
+  /usr/share/java/plexus-container-default-alpha.jar:\
+  /usr/share/java/plexus-utils.jar:\
+  ${basedir}/plexus-compiler-api/target/plexus-compiler-api-${version}.jar:\
+  ${basedir}/plexus-compiler-test/target/plexus-compiler-test-${version}.jar:\
+  
${basedir}/plexus-compiler-manager/target/plexus-compiler-manager-${version}.jar:\
+  
${basedir}/plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-${version}.jar:\
+  
${basedir}/plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-${version}.jar:\
+  
${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar:\
+  
${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar:\
   target/classes

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit e9bbe3531b8e97dbb90bd6934f96206f9643af56
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Fri Jan 6 00:05:17 2012 +0100

Fix test classpath

diff --git a/debian/build.properties b/debian/build.properties
index 746c30a..97310df 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -20,3 +20,16 @@ classpath.compile=\
   
${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar:\
   
${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar:\
   target/classes
+classpath.test=\
+  /usr/share/java/ant-junit.jar:\
+  /usr/share/java/commons-lang.jar:\
+  /usr/share/java/ecj.jar:\
+  /usr/share/java/junit.jar:\
+  /usr/share/java/maven-core.jar:\
+  /usr/share/java/maven-model.jar:\
+  /usr/share/java/maven-project.jar:\
+  /usr/share/java/maven-repository-metadata.jar:\
+  /usr/share/java/plexus-container-default-alpha.jar:\
+  /usr/share/java/plexus-utils.jar:\
+  target/classes
+

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 83d4fbfc2a9391664a5b64a753d34daec73fbdd9
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Fri Jan 6 00:07:34 2012 +0100

Fix test classpath

diff --git a/debian/build.properties b/debian/build.properties
index 97310df..15734ce 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -6,6 +6,8 @@ classpath.compile=\
   /usr/share/java/commons-lang.jar:\
   /usr/share/java/ecj.jar:\
   /usr/share/java/junit.jar:\
+  /usr/share/java/maven-artifact.jar:\
+  /usr/share/java/maven-artifact-test.jar:\
   /usr/share/java/maven-core.jar:\
   /usr/share/java/maven-model.jar:\
   /usr/share/java/maven-project.jar:\
@@ -25,6 +27,8 @@ classpath.test=\
   /usr/share/java/commons-lang.jar:\
   /usr/share/java/ecj.jar:\
   /usr/share/java/junit.jar:\
+  /usr/share/java/maven-artifact.jar:\
+  /usr/share/java/maven-artifact-test.jar:\
   /usr/share/java/maven-core.jar:\
   /usr/share/java/maven-model.jar:\
   /usr/share/java/maven-project.jar:\

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 7633148b68f25ab66c529178422c757b7d91480d
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Fri Jan 6 00:10:09 2012 +0100

Add missing version argument for Ant

diff --git a/debian/rules b/debian/rules
index c770461..e6fc131 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep 
'^Version:' | cut -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f 
$$jar ]; then echo -n $${jar}:; fi; done)
-export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f 
debian/build.xml
+export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) 
-Dversion=$(DEB_UPSTREAM_VERSION) -f debian/build.xml
 
 %:
dh $@ --buildsystem=ant --with maven_repo_helper

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Plexus Compiler branch, pristine-tar, created. fc1c79a20a9e640903e408970ea5d93250933439

[Ludovic Claude]

The branch, pristine-tar has been created
at  fc1c79a20a9e640903e408970ea5d93250933439 (commit)

- Shortlog 
commit fc1c79a20a9e640903e408970ea5d93250933439
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Tue Jan 3 01:07:48 2012 +0100

pristine-tar data for plexus-compiler_1.8.3.orig.tar.gz

---

-- 
Plexus Compiler

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, pristine-tar, updated. 095ce78c44192a56baa9e1b5fc801d9f8a75a7d9

[Ludovic Claude]

The following commit has been merged in the pristine-tar branch:
commit 7c881619b52c07e145cd92434c9152b9ba6991e8
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 17:40:51 2012 +0100

pristine-tar data for plexus-components_1.1.16.orig.tar.gz

diff --git a/plexus-components_1.1.16.orig.tar.gz.delta 
b/plexus-components_1.1.16.orig.tar.gz.delta
index f9b8867..141c6eb 100644
Binary files a/plexus-components_1.1.16.orig.tar.gz.delta and 
b/plexus-components_1.1.16.orig.tar.gz.delta differ
diff --git a/plexus-components_1.1.16.orig.tar.gz.id 
b/plexus-components_1.1.16.orig.tar.gz.id
index 3ced4ea..81009a4 100644
--- a/plexus-components_1.1.16.orig.tar.gz.id
+++ b/plexus-components_1.1.16.orig.tar.gz.id
@@ -1 +1 @@
-457ee4ae5153ad8bd443e8a5cdb17e1236318486
+f4bf19338e3396d8dfffbba2237a679c96626781

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, master, updated. 14a9d4e7822f04f89ebee7b1badc3232192b5b2c

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 93971314f276f3c09938c9dfbeb73fe76a2b8d8d
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 17:31:59 2012 +0100

Use Ant to build the package

diff --git a/debian/README.source b/debian/README.source
index e75416c..7493f2f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,6 +4,3 @@ Information about plexus-components
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
 
-The build system uses Maven but prevents it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.
diff --git a/debian/build-classpath b/debian/build-classpath
new file mode 100644
index 000..5bfa9ce
--- /dev/null
+++ b/debian/build-classpath
@@ -0,0 +1 @@
+/usr/share/java/ant-nodeps.jar
diff --git a/debian/build.properties b/debian/build.properties
new file mode 100644
index 000..4e12bf5
--- /dev/null
+++ b/debian/build.properties
@@ -0,0 +1,2 @@
+build.directory=target
+maven.test.skip=true
diff --git a/debian/control b/debian/control
index b6345b9..6723191 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Ludovic Claude ludovic.cla...@laposte.net
-Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (= 
1.4)
+Build-Depends: debhelper (= 7), default-jdk, maven-repo-helper (= 1.5)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-java/plexus-components.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/plexus-components.git
@@ -11,8 +11,7 @@ Homepage: http://plexus.codehaus.org/plexus-components
 
 Package: libplexus-components-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
-Recommends: ${maven:OptionalDepends}
+Depends: ${misc:Depends}
 Description: Plexus Components parent POM
  The Plexus project provides a full software stack for creating and executing
  software projects.
diff --git a/debian/copyright b/debian/copyright
index 9862593..0019c8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Copyright: 2001-2011, Codehaus
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2011, Ludovic Claude ludovic.cla...@laposte.net
+Copyright: 2012, Ludovic Claude ludovic.cla...@laposte.net
 License: GPL-3+
 
 License: Apache-2.0
@@ -16,6 +16,6 @@ License: Apache-2.0
 
 License: GPL-3+
   On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/GPL-3'
+  GPL 3 license in '/usr/share/common-licenses/GPL-3'
 
 
diff --git a/debian/maven.rules b/debian/maven.rules
index b62a1b2..ed1d47b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,4 +20,3 @@ junit junit jar s/3\..*/3.x/ * *
 org.codehaus.plexus plexus-components pom s/1\..*/1.x/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 org.codehaus.plexus plexus pom s/2\..*/2.x/ * *
-
diff --git a/debian/rules b/debian/rules
index 562f1f3..28d3fd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+DEB_SOURCE_PACKAGE   := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 
2 -d ' ')
+DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut 
-f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+%:
+   dh $@ --with maven_repo_helper
 
 get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download 
--rename

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, pristine-tar, updated. 095ce78c44192a56baa9e1b5fc801d9f8a75a7d9

[Ludovic Claude]

The following commit has been merged in the pristine-tar branch:
commit 095ce78c44192a56baa9e1b5fc801d9f8a75a7d9
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 17:46:31 2012 +0100

pristine-tar data for plexus-components_1.1.16+dfsg.orig.tar.gz

diff --git a/plexus-components_1.1.16+dfsg.orig.tar.gz.delta 
b/plexus-components_1.1.16+dfsg.orig.tar.gz.delta
index 57ab541..2239199 100644
Binary files a/plexus-components_1.1.16+dfsg.orig.tar.gz.delta and 
b/plexus-components_1.1.16+dfsg.orig.tar.gz.delta differ
diff --git a/plexus-components_1.1.16+dfsg.orig.tar.gz.id 
b/plexus-components_1.1.16+dfsg.orig.tar.gz.id
index e739114..14a5f00 100644
--- a/plexus-components_1.1.16+dfsg.orig.tar.gz.id
+++ b/plexus-components_1.1.16+dfsg.orig.tar.gz.id
@@ -1 +1 @@
-f5966cca0f959f61046813c16e366b612caa1f6f
+57db450e2eef1a6d39d5ba0e3c1760af027c11b7

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, master, updated. 14a9d4e7822f04f89ebee7b1badc3232192b5b2c

[Ludovic Claude]

The following commit has been merged in the master branch:
commit baf2b24303786a4bd527ed3f69a976f018c63a75
Merge: 93971314f276f3c09938c9dfbeb73fe76a2b8d8d 
57db450e2eef1a6d39d5ba0e3c1760af027c11b7
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 17:46:31 2012 +0100

Merge commit 'upstream/1.1.16+dfsg'


-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, pristine-tar, updated. 095ce78c44192a56baa9e1b5fc801d9f8a75a7d9

[Ludovic Claude]

The following commit has been merged in the pristine-tar branch:
commit 4ea45c015a545cae3619c63e9770cd10a5c2203b
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 17:41:19 2012 +0100

pristine-tar data for plexus-components_1.1.16+dfsg.orig.tar.gz

diff --git a/plexus-components_1.1.16+dfsg.orig.tar.gz.delta 
b/plexus-components_1.1.16+dfsg.orig.tar.gz.delta
new file mode 100644
index 000..57ab541
Binary files /dev/null and b/plexus-components_1.1.16+dfsg.orig.tar.gz.delta 
differ
diff --git a/plexus-components_1.1.16+dfsg.orig.tar.gz.id 
b/plexus-components_1.1.16+dfsg.orig.tar.gz.id
new file mode 100644
index 000..e739114
--- /dev/null
+++ b/plexus-components_1.1.16+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+f5966cca0f959f61046813c16e366b612caa1f6f

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, master, updated. 14a9d4e7822f04f89ebee7b1badc3232192b5b2c

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 14a9d4e7822f04f89ebee7b1badc3232192b5b2c
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 18:18:51 2012 +0100

Set ITP bug number, keep profiles element in POM

diff --git a/debian/README.source b/debian/README.source
index 7493f2f..162595c 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,3 +4,9 @@ Information about plexus-components
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
 
+I used the following command to filter upstream tarball and import it in Git:
+
+git-import-orig --filter=*.jar --filter=*.war --filter='plexus-archiver' 
--filter='plexus-cli' --filter='plexus-compiler' --filter='plexus-i18n' 
--filter='plexus-interpolation' --filter='plexus-io'  
--filter='plexus-resources' --filter='plexus-velocity' --filter='plexus-digest' 
--filter='plexus-interactivity' --filter='plexus-swizzle' --filter-pristine-tar 
--pristine-tar -u1.1.16+dfsg ../plexus-components_1.1.16.tar.gz
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Mon, 02 Jan 2012 17:55:47 
+0100
+
diff --git a/debian/changelog b/debian/changelog
index b7bc560..918b09b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-plexus-components (1.1.16-1) UNRELEASED; urgency=low
+plexus-components (1.1.16+dfsg-1) unstable; urgency=low
 
-  * Initial release. (Closes: #XX)
+  * Initial release. (Closes: #654269)
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Mon, 12 Dec 2011 00:45:17 
+0100
diff --git a/debian/libplexus-components-java.poms 
b/debian/libplexus-components-java.poms
index 1031af4..08d4290 100644
--- a/debian/libplexus-components-java.poms
+++ b/debian/libplexus-components-java.poms
@@ -25,7 +25,7 @@
 #   --site-xml=location: Optional, the location for site.xml if it needs to 
be installed.
 # Empty by default. [mh_install]
 #
-pom.xml --has-package-version
+pom.xml --no-parent --has-package-version --keep-elements=profiles
 plexus-archiver/pom.xml --ignore
 plexus-cli/pom.xml --ignore
 plexus-compiler/pom.xml --ignore

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] plexus-components packaging branch, pristine-tar, updated. 095ce78c44192a56baa9e1b5fc801d9f8a75a7d9

[Ludovic Claude]

The following commit has been merged in the pristine-tar branch:
commit 22a7a1ea11f12f098243e8ea3c9bc728ffaf9d33
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 17:46:20 2012 +0100

pristine-tar data for plexus-components_1.1.16.orig.tar.gz

diff --git a/plexus-components_1.1.16.orig.tar.gz.delta 
b/plexus-components_1.1.16.orig.tar.gz.delta
index 141c6eb..b41d1e3 100644
Binary files a/plexus-components_1.1.16.orig.tar.gz.delta and 
b/plexus-components_1.1.16.orig.tar.gz.delta differ
diff --git a/plexus-components_1.1.16.orig.tar.gz.id 
b/plexus-components_1.1.16.orig.tar.gz.id
index 81009a4..bd0041c 100644
--- a/plexus-components_1.1.16.orig.tar.gz.id
+++ b/plexus-components_1.1.16.orig.tar.gz.id
@@ -1 +1 @@
-f4bf19338e3396d8dfffbba2237a679c96626781
+06e98d2b601df3ae79f71f9c29990b4c440fb6c9

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15630 - in trunk/maven-repo-helper: debian src/main/java/org/debian/maven/repo src/test/java/org/debian/maven/repo src/test/resources src/test/resources/plexus-components src/test/resource

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-02 20:14:07 + (Mon, 02 Jan 2012)
New Revision: 15630

Added:
   trunk/maven-repo-helper/src/test/resources/libplexus-components-java.poms
   trunk/maven-repo-helper/src/test/resources/plexus-components.transformed
   trunk/maven-repo-helper/src/test/resources/plexus-components/
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-cli/
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-cli/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-digest/
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-digest/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-i18n/
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-i18n/pom.xml
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-interactivity/
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-interactivity/pom.xml
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-resources/
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-resources/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-velocity/
   
trunk/maven-repo-helper/src/test/resources/plexus-components/plexus-velocity/pom.xml
   trunk/maven-repo-helper/src/test/resources/plexus-components/pom.xml
Modified:
   trunk/maven-repo-helper/debian/changelog
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java
   
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
   
trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java
   trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java
Log:
Fix ignore modules in a POM transformation

Modified: trunk/maven-repo-helper/debian/changelog
===
--- trunk/maven-repo-helper/debian/changelog2012-01-02 18:02:29 UTC (rev 
15629)
+++ trunk/maven-repo-helper/debian/changelog2012-01-02 20:14:07 UTC (rev 
15630)
@@ -2,8 +2,9 @@
 
   * Build with Java 5, use generics. (Closes: #644260)
   * Fix resolution of versions from dependency management
+  * Fix ignore modules in a POM transformation
 
- -- Ludovic Claude ludovic.cla...@laposte.net  Sun, 13 Nov 2011 23:59:09 
+0100
+ -- Ludovic Claude ludovic.cla...@laposte.net  Mon, 02 Jan 2012 20:27:26 
+0100
 
 maven-repo-helper (1.7) unstable; urgency=low
 

Modified: 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java
===
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java 
2012-01-02 18:02:29 UTC (rev 15629)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java 
2012-01-02 20:14:07 UTC (rev 15630)
@@ -83,7 +83,7 @@
 POMOptions options = getPOMOptions(pomPath);
 if (options.isIgnore()) {
 try {
-handler.ignorePOM(new File(pomPath));
+handler.ignorePOM(new File(baseDir, pomPath));
 } catch (Exception e) {
 log.log(Level.SEVERE, null, e);
 }

Modified: 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
===
--- 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java 
2012-01-02 18:02:29 UTC (rev 15629)
+++ 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java 
2012-01-02 20:14:07 UTC (rev 15630)
@@ -43,14 +43,11 @@
 public class POMTransformer extends POMReader {
 
 private static final Logger log = 
Logger.getLogger(POMTransformer.class.getName());
-private static final ListString WRITE_IGNORED_ELEMENTS = 
Arrays.asList(new String[]{
-modelVersion, parent});
-private static final ListString DEBIAN_BUILD_IGNORED_ELEMENTS = 
Arrays.asList(new String[]{
-distributionManagement, repositories, 
pluginRepositories});
-private static final ListString DEBIAN_DOC_IGNORED_ELEMENTS = 
Arrays.asList(new String[]{
-reports, reporting, site});
-private static final ListString INFO_ELEMENTS = Arrays.asList(new 
String[]{groupId,
-artifactId, packaging, version});
+private static final ListString WRITE_IGNORED_ELEMENTS = 
Arrays.asList(modelVersion, parent);
+private static final ListString DEBIAN_BUILD_IGNORED_ELEMENTS = 
Arrays.asList(distributionManagement, repositories, pluginRepositories);
+private static final ListString DEBIAN_DOC_IGNORED_ELEMENTS = 
Arrays.asList(reports, reporting, site);
+private static final ListString INFO_ELEMENTS = Arrays.asList(groupId,
+artifactId, packaging, version);
 private static final Pattern compactDependencyNotationMatcher

Bug#654318: libaspectj-java: Add a published Maven rule to help packagers

[Ludovic Claude]

Package: libaspectj-java
Version: 1.6.11+dfsg-2
Severity: minor

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please add this rule to debian/maven.publishedRules, this will help packagers
working on projects with a dependency using groupId aspectj instead of
org.aspectjrt

s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/
s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/
s/aspectj/org.aspectj/ aspectjweaver jar s/.*/debian/



- -- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-14-generic (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

libaspectj-java depends on no packages.

libaspectj-java recommends no packages.

Versions of packages libaspectj-java suggests:
pn  aspectj   none (no description available)

- -- no debconf information

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJPAjYRAAoJEImmFv6yGz69bBAP/2G0UWQp5815KsW7w2paryOK
pqznbpJEcZrBK6gYtDyZrkQKG4kyq+glQkfhjheNNi75FNl4JJJ0IKCCVALUuk8V
bBa8sO9xo3/JFACqAQQFwHwbs9KifL819MABbAAHtWZdVpyWkAFjr7TUCfOvTaLV
D7XgAqO8BkZNPDnL5vmm/pNDty5lgdTkYp6rC6KnawcFjgegNQgmSVSEAhryue9L
kWlibm71b5Jz9GFAu8q89f8zUn/0MLb9BEU8ys/3ac9DLg0YjGCsyquZrAWG7W3k
HQq4cAl5Qt2YR+Ij2Q2v0ycVSKIqNb7w+hQOtNy5jwnvf8C9o/F8TO+OEYK4/ZAt
G15mvBYthQNoEPMX5D+GNgkFccvyNXNX8WA7O3Z8Sz3zPx0Lknx3lQJpI5uCfO/g
H5yQ9QhjIBZ1plF9mbNrbElKklRhPqiPqwHTiPbISUjYUYIeU16xVCdJb7VsBVVX
yH5vJU5Pu2xhWGzL6uy3L96wcPsFNTJi3uEk3cuupK4u5gMPURUpahrJV08OhHcf
K1+bWsNm+tjOIkW3ZTh/7QlZHOEVQXmdxicoCn7QiKcCZooxsYe5TwgjLhVqqSef
EAJaY6Fy3EZ0C0lKrS0FpXsN6FDXfg4Kp0dI6MKHA1TmXElKKabQM3OwepyoEu//
AY6c//n+Ya4C5SMPobmh
=vnNc
-END PGP SIGNATURE-



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[SCM] plexus-components packaging branch, master, created. 86a09285e1c415980b724621ae655ee9b0b4b009

[Ludovic Claude]

The branch, master has been created
at  86a09285e1c415980b724621ae655ee9b0b4b009 (commit)

- Shortlog 
commit 86a09285e1c415980b724621ae655ee9b0b4b009
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Jan 1 18:48:15 2012 +

Add git ignore

commit bda2f0d608e6b5004a4e761365561f515c0108c2
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Dec 12 00:45:17 2011 +0100

Imported Debian patch 1.1.16-1

commit 457ee4ae5153ad8bd443e8a5cdb17e1236318486
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Jan 1 18:26:27 2012 +

Imported Upstream version 1.1.16

---

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. b4dba00a5e54efc559198061e899fc4f2745d4ec

[Ludovic Claude]

The following commit has been merged in the master branch:
commit b4dba00a5e54efc559198061e899fc4f2745d4ec
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Jan 2 00:37:32 2012 +0100

Update list of packages on 2/1/2012

diff --git a/.gitignore b/.gitignore
index 4f28441..12aa2c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,12 +41,14 @@ eclipse-cdt
 eclipse-cdt-pkg-config
 eclipse-egit
 eclipse-emf
+eclipse-gef
 eclipse-jgit
 eclipse-linuxtools
 eclipse-mercurialeclipse
 eclipse-mylyn
 eclipse-rse
 eclipse-subclipse
+eclipse-wtp
 eclipselink
 examples
 exec-maven-plugin
@@ -175,6 +177,7 @@ libspring-security-java
 libspring-webflow-2.0-java
 libswingworker-java
 libtools-logging-clojure
+libxml-java
 libxmlenc-java
 livetribe-jsr223
 localizer
@@ -238,6 +241,7 @@ sweethome3d
 swt-gtk
 swt-paperclips
 swtcalendar
+testng
 tiger-types
 tomcat5.5
 tomcat6
diff --git a/.mrconfig b/.mrconfig
index 578d16e..89960ec 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -145,6 +145,9 @@ checkout = git_checkout eclipse-egit
 [eclipse-emf]
 checkout = git_checkout eclipse-emf
 
+[eclipse-gef]
+checkout = git_checkout eclipse-gef
+
 [eclipse-jgit]
 checkout = git_checkout eclipse-jgit
 
@@ -163,6 +166,9 @@ checkout = git_checkout eclipse-rse
 [eclipse-subclipse]
 checkout = git_checkout eclipse-subclipse
 
+[eclipse-wtp]
+checkout = git_checkout eclipse-wtp
+
 [eclipselink]
 checkout = git_checkout eclipselink
 
@@ -547,6 +553,9 @@ checkout = git_checkout libswingworker-java
 [libtools-logging-clojure]
 checkout = git_checkout libtools-logging-clojure
 
+[libxml-java]
+checkout = git_checkout libxml-java
+
 [libxmlenc-java]
 checkout = git_checkout libxmlenc-java
 
@@ -736,6 +745,9 @@ checkout = git_checkout swt-paperclips
 [swtcalendar]
 checkout = git_checkout swtcalendar
 
+[testng]
+checkout = git_checkout testng
+
 [tiger-types]
 checkout = git_checkout tiger-types
 

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, created. 84ec0787081b53458c5b44e9179814bfa39484c8

[Ludovic Claude]

The branch, master has been created
at  84ec0787081b53458c5b44e9179814bfa39484c8 (commit)

- Shortlog 
commit 84ec0787081b53458c5b44e9179814bfa39484c8
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Dec 11 23:48:04 2011 +0100

Copy mr configuration from pkg-ruby-extra team

---

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. 2ac2c5c8ee9646a5865e608607b2f24e03e829db

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 2ac2c5c8ee9646a5865e608607b2f24e03e829db
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Mon Dec 12 00:16:38 2011 +0100

Add git ignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..4f28441
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,270 @@
+access-modifier-checker
+acegi-security
+activemq
+activemq-activeio
+activemq-protobuf
+aether
+akuma
+animal-sniffer
+annotation-indexer
+args4j
+async-http-client
+atinject-jsr330
+azureus
+beansbinding
+bindex
+bnd
+bridge-method-injector
+bsaf
+build-helper-maven-plugin
+castor
+castor-maven-plugin
+cdi-api
+clojure
+clojure-contrib
+clojure-defaults
+clojure-devscripts
+clojure-maven-plugin
+cobertura
+cobertura-maven-plugin
+codenarc
+collections15
+commons-exec
+cpptasks
+cronometer
+dbus-java
+dita-ot
+dnsjava
+dynalang
+eclipse
+eclipse-cdt
+eclipse-cdt-pkg-config
+eclipse-egit
+eclipse-emf
+eclipse-jgit
+eclipse-linuxtools
+eclipse-mercurialeclipse
+eclipse-mylyn
+eclipse-rse
+eclipse-subclipse
+eclipselink
+examples
+exec-maven-plugin
+felix-bundlerepository
+felix-framework
+felix-gogo-command
+felix-gogo-runtime
+felix-gogo-shell
+felix-main
+felix-osgi-obr
+felix-shell
+felix-shell-tui
+felix-utils
+gentlyweb-utils
+geogebra
+geronimo-commonj-spec
+geronimo-jpa-2.0-spec
+geronimo-jta-1.1-spec
+geronimo-osgi-support
+geronimo-validation-1.0-spec
+gmetrics
+gradle
+grails
+grails-old
+guava-libraries
+guice
+h2database
+hadoop
+hawtjni
+hbase
+hessian
+httpcomponents-client
+icu4j-4.4
+ini4j
+isorelax
+jabsorb
+jaffl
+jakarta-taglibs-standard
+jameica
+jansi
+jansi-native
+jarjar-maven-plugin
+jas
+jasypt
+java-xmlbuilder
+java3ds-fileloader
+javatar
+javatools
+jboss-common-logging-spi2.1
+jcaptcha
+jcodings
+jcr-api
+jcsp
+jedit
+jellydoc
+jenkins
+jenkins-commons-jelly
+jenkins-commons-jexl
+jenkins-crypto-util
+jenkins-dom4j
+jenkins-executable-war
+jenkins-htmlunit
+jenkins-htmlunit-core-js
+jenkins-json
+jenkins-memory-monitor
+jenkins-task-reactor
+jenkins-test-annotations
+jenkins-trilead-ssh2
+jenkins-winstone
+jenkins-xstream
+jesd
+jets3t
+jffi
+jfugue
+jigsaw
+jinput
+jme
+jmock2
+jnr-netdb
+jnr-x86asm
+josql
+jruby
+jruby-joni
+json-simple
+jsoup
+jspwiki
+jutils
+jvyamlb
+jxplorer
+katta
+kxml2
+leiningen
+libappframework-java
+libbytelist-java
+libclucy-clojure
+libcommons-lang3-java
+libconcurrentlinkedhashmap-java
+libgettext-commons-java
+libgpars-groovy-java
+libhibernate-commons-annotations-java
+libhibernate-jbosscache-java
+libhibernate-validator-java
+libhibernate3-java
+libirclib-java
+libisnativec-java
+libjackson-json-java
+libjava-jdbc-clojure
+libjbcrypt-java
+libjna-java
+libjsr166y-java
+libjsr305-java
+libjsr311-api-java
+libjsyntaxpane-java
+libjtype-java
+libmatthew-java
+libnb-javaparser-java
+libnb-platform-java
+libnb-svnclientadapter-java
+libpam4j
+librelaxng-datatype-java
+librobert-hooke-clojure
+libsmack-java
+libspring-ldap-java
+libspring-security-2.0-java
+libspring-security-java
+libspring-webflow-2.0-java
+libswingworker-java
+libtools-logging-clojure
+libxmlenc-java
+livetribe-jsr223
+localizer
+lucene3
+lwjgl
+mac-widgets
+mathpiper
+mauve
+maven
+maven-ant-tasks
+maven-antrun-extended-plugin
+maven-bundle-plugin
+maven-enforcer
+maven-hpi-plugin
+maven-project-info-reports-plugin
+maven-shared-jar
+maven-stapler-plugin
+metainf-services
+modello-maven-plugin1.4
+modello1.4
+mojarra
+msv
+munge-maven-plugin
+nailgun
+netbeans
+netty
+objenesis
+omegat
+omegat-plugin-tokenizer
+openid4java
+openide-util
+openjpa
+osgi-compendium
+osgi-core
+osgi-foundation-ee
+pauker
+pescetti
+plexus-classworlds2
+plexus-compiler
+plexus-components
+plexus-containers1.5
+plexus-utils2
+robust-http-client
+rome
+rxtx
+salliere
+sdo-api-java
+serp
+sezpoz
+sisu-guice
+sisu-ioc
+sitemesh
+solr
+spock
+stapler
+stapler-adjunct-timeline
+svgsalamander
+svnclientadapter
+svnkit
+sweethome3d
+swt-gtk
+swt-paperclips
+swtcalendar
+tiger-types
+tomcat5.5
+tomcat6
+tomcat7
+trilead-putty-extension
+trilead-ssh2
+triplea
+tuxguitar
+twitter4j
+txw2
+uima-addons
+uima-as
+uimaj
+urlrewritefilter
+weirdx
+weka
+wsil4j
+xhtmlrenderer
+xmlbeans-maven-plugin
+yecht
+yydebug
+zkclient
+zookeeper
+.mrconfig~
+*.dsc
+*.tar.gz
+*.deb
+*.changes
+*.build
+*.upload
diff --git a/update b/update
new file mode 100755
index 000..0b0b72d
--- /dev/null
+++ b/update
@@ -0,0 +1 @@
+mr -j 5 update

-- 
pkg-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] pkg-java packaging branch, master, updated. 2ac2c5c8ee9646a5865e608607b2f24e03e829db

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 98d1e1b9e8c224388b00648115ceafb26013a61c
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Sun Dec 11 23:55:03 2011 +0100

Setup pkg-java repositories

diff --git a/.mrconfig b/.mrconfig
index 32a8c82..578d16e 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -16,6 +16,792 @@ lib=
 svn co /$1
   }
 
+[access-modifier-checker]
+checkout = git_checkout access-modifier-checker
+
+[acegi-security]
+checkout = git_checkout acegi-security
+
+[activemq]
+checkout = git_checkout activemq
+
+[activemq-activeio]
+checkout = git_checkout activemq-activeio
+
+[activemq-protobuf]
+checkout = git_checkout activemq-protobuf
+
+[aether]
+checkout = git_checkout aether
+
+[akuma]
+checkout = git_checkout akuma
+
+[animal-sniffer]
+checkout = git_checkout animal-sniffer
+
+[annotation-indexer]
+checkout = git_checkout annotation-indexer
+
+[args4j]
+checkout = git_checkout args4j
+
+[async-http-client]
+checkout = git_checkout async-http-client
+
+[atinject-jsr330]
+checkout = git_checkout atinject-jsr330
+
+[azureus]
+checkout = git_checkout azureus
+
+[beansbinding]
+checkout = git_checkout beansbinding
+
+[bindex]
+checkout = git_checkout bindex
+
+[bnd]
+checkout = git_checkout bnd
+
+[bridge-method-injector]
+checkout = git_checkout bridge-method-injector
+
+[bsaf]
+checkout = git_checkout bsaf
+
+[build-helper-maven-plugin]
+checkout = git_checkout build-helper-maven-plugin
+
+[castor]
+checkout = git_checkout castor
+
+[castor-maven-plugin]
+checkout = git_checkout castor-maven-plugin
+
+[cdi-api]
+checkout = git_checkout cdi-api
+
+[clojure]
+checkout = git_checkout clojure
+
+[clojure-contrib]
+checkout = git_checkout clojure-contrib
+
+[clojure-defaults]
+checkout = git_checkout clojure-defaults
+
+[clojure-devscripts]
+checkout = git_checkout clojure-devscripts
+
+[clojure-maven-plugin]
+checkout = git_checkout clojure-maven-plugin
+
+[cobertura]
+checkout = git_checkout cobertura
+
+[cobertura-maven-plugin]
+checkout = git_checkout cobertura-maven-plugin
+
+[codenarc]
+checkout = git_checkout codenarc
+
+[collections15]
+checkout = git_checkout collections15
+
+[commons-exec]
+checkout = git_checkout commons-exec
+
+[cpptasks]
+checkout = git_checkout cpptasks
+
+[cronometer]
+checkout = git_checkout cronometer
+
+[dbus-java]
+checkout = git_checkout dbus-java
+
+[dita-ot]
+checkout = git_checkout dita-ot
+
+[dnsjava]
+checkout = git_checkout dnsjava
+
+[dynalang]
+checkout = git_checkout dynalang
+
+[eclipse]
+checkout = git_checkout eclipse
+
+[eclipse-cdt]
+checkout = git_checkout eclipse-cdt
+
+[eclipse-cdt-pkg-config]
+checkout = git_checkout eclipse-cdt-pkg-config
+
+[eclipse-egit]
+checkout = git_checkout eclipse-egit
+
+[eclipse-emf]
+checkout = git_checkout eclipse-emf
+
+[eclipse-jgit]
+checkout = git_checkout eclipse-jgit
+
+[eclipse-linuxtools]
+checkout = git_checkout eclipse-linuxtools
+
+[eclipse-mercurialeclipse]
+checkout = git_checkout eclipse-mercurialeclipse
+
+[eclipse-mylyn]
+checkout = git_checkout eclipse-mylyn
+
+[eclipse-rse]
+checkout = git_checkout eclipse-rse
+
+[eclipse-subclipse]
+checkout = git_checkout eclipse-subclipse
+
+[eclipselink]
+checkout = git_checkout eclipselink
+
+[examples]
+checkout = git_checkout examples
+
+[exec-maven-plugin]
+checkout = git_checkout exec-maven-plugin
+
+[felix-bundlerepository]
+checkout = git_checkout felix-bundlerepository
+
+[felix-framework]
+checkout = git_checkout felix-framework
+
+[felix-gogo-command]
+checkout = git_checkout felix-gogo-command
+
+[felix-gogo-runtime]
+checkout = git_checkout felix-gogo-runtime
+
+[felix-gogo-shell]
+checkout = git_checkout felix-gogo-shell
+
+[felix-main]
+checkout = git_checkout felix-main
+
+[felix-osgi-obr]
+checkout = git_checkout felix-osgi-obr
+
+[felix-shell]
+checkout = git_checkout felix-shell
+
+[felix-shell-tui]
+checkout = git_checkout felix-shell-tui
+
+[felix-utils]
+checkout = git_checkout felix-utils
+
+[gentlyweb-utils]
+checkout = git_checkout gentlyweb-utils
+
+[geogebra]
+checkout = git_checkout geogebra
+
+[geronimo-commonj-spec]
+checkout = git_checkout geronimo-commonj-spec
+
+[geronimo-jpa-2.0-spec]
+checkout = git_checkout geronimo-jpa-2.0-spec
+
+[geronimo-jta-1.1-spec]
+checkout = git_checkout geronimo-jta-1.1-spec
+
+[geronimo-osgi-support]
+checkout = git_checkout geronimo-osgi-support
+
+[geronimo-validation-1.0-spec]
+checkout = git_checkout geronimo-validation-1.0-spec
+
+[gmetrics]
+checkout = git_checkout gmetrics
+
+[gradle]
+checkout = git_checkout gradle
+
+[grails]
+checkout = git_checkout grails
+
+[grails-old]
+checkout = git_checkout grails-old
+
+[guava-libraries]
+checkout = git_checkout guava-libraries
+
+[guice]
+checkout = git_checkout guice
+
+[h2database]
+checkout = git_checkout h2database
+
+[hadoop]
+checkout = git_checkout hadoop
+
+[hawtjni]
+checkout = git_checkout hawtjni
+
+[hbase]
+checkout = git_checkout hbase
+
+[hessian]
+checkout = git_checkout hessian

[SCM] plexus-components packaging branch, master, created. 54e50306f6d64722851abb56649bc7468b7dbefb

[Ludovic Claude]

The branch, master has been created
at  54e50306f6d64722851abb56649bc7468b7dbefb (commit)

- Shortlog 
commit 54e50306f6d64722851abb56649bc7468b7dbefb
Author: Ludovic Claude ludovic.cla...@laposte.net
Date:   Wed Dec 14 00:59:11 2011 +0100

Initial

---

-- 
plexus-components packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15553 - trunk/maven-repo-helper/src/main/java/org/debian/maven/repo

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-12-16 23:15:21 + (Fri, 16 Dec 2011)
New Revision: 15553

Modified:
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java
Log:
Fix NPE

Modified: 
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java
===
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java 
2011-12-16 20:47:28 UTC (rev 15552)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/Repository.java 
2011-12-16 23:15:21 UTC (rev 15553)
@@ -115,6 +115,10 @@
  * @return
  */
 public POMInfo searchMatchingPOM(Dependency dependency) {
+if (dependency == null) {
+return null;
+}
+
 POMInfo pom = getPOM(dependency);
 if (pom != null) {
 return pom;


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#651901: maven-repo-helper: mh_install should support creating additional links (at least one) for a jar

[Ludovic Claude]

Package: maven-repo-helper
Version: 1.7ubuntu1~ppa5
Severity: normal

We should be able to specify the option --create-link for a POM file generating
a jar



-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-13-generic (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages maven-repo-helper depends on:
ii  default-jre- 1:1.6-42ubuntu2 Standard Java or Java compatible R
ii  gcj-4.4-jre- 4.4.6-2ubuntu2  Java runtime environment using GIJ
ii  gcj-4.5-jre- 4.5.3-9ubuntu1  Java runtime environment using GIJ
ii  gcj-4.6-jre- 4.6.1-4ubuntu2  Java runtime environment using GIJ
ii  gcj-jre-head 4:4.6.1-2ubuntu5Java runtime environment using GIJ
ii  libstax-java 1.2.0-1 StAX Reference Implementation (RI)
ii  openjdk-6-jr 6b23~pre11-0ubuntu1.11.10   OpenJDK Java runtime, using Hotspo
ii  openjdk-7-jr 7~b147-2.0-0ubuntu0.11.10.1 OpenJDK Java runtime, using Hotspo
ii  sun-java6-jr 6.26-1natty1Sun Java(TM) Runtime Environment (

Versions of packages maven-repo-helper recommends:
ii  debhelper   8.9.0ubuntu1 helper programs for debian/rules

Versions of packages maven-repo-helper suggests:
ii  maven-debian-helper1.4.5ubuntu1~ppa4 Helper tools for building Debian p

-- no debconf information



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r15506 - trunk/apache-pom/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-12-07 00:08:52 + (Wed, 07 Dec 2011)
New Revision: 15506

Modified:
   trunk/apache-pom/debian/changelog
   trunk/apache-pom/debian/libapache-pom-java.poms
   trunk/apache-pom/debian/maven.ignoreRules
   trunk/apache-pom/debian/maven.rules
Log:
* Update list of plugins to ignore
* Include site-pom.xml and its apache-jar-resource-bundle jar.

Modified: trunk/apache-pom/debian/changelog
===
--- trunk/apache-pom/debian/changelog   2011-12-05 21:00:03 UTC (rev 15505)
+++ trunk/apache-pom/debian/changelog   2011-12-07 00:08:52 UTC (rev 15506)
@@ -1,3 +1,10 @@
+apache-pom (10-3) UNRELEASED; urgency=low
+
+  * Update list of plugins to ignore
+  * Include site-pom.xml and its apache-jar-resource-bundle jar.
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Wed, 07 Dec 2011 00:27:31 
+0100
+
 apache-pom (10-2) unstable; urgency=low
 
   * Only use maven_repo_helper and debhelper to install POM:

Modified: trunk/apache-pom/debian/libapache-pom-java.poms
===
--- trunk/apache-pom/debian/libapache-pom-java.poms 2011-12-05 21:00:03 UTC 
(rev 15505)
+++ trunk/apache-pom/debian/libapache-pom-java.poms 2011-12-07 00:08:52 UTC 
(rev 15506)
@@ -17,4 +17,6 @@
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
 #   --dest-jar=path: the destination for the real jar
 #
-pom.xml --has-package-version --site-xml=src/site-docs/site.xml
+pom.xml --has-package-version --keep-elements=build,reporting
+site-pom.xml --has-package-version --site-xml=src/site-docs/site.xml
+

Modified: trunk/apache-pom/debian/maven.ignoreRules
===
--- trunk/apache-pom/debian/maven.ignoreRules   2011-12-05 21:00:03 UTC (rev 
15505)
+++ trunk/apache-pom/debian/maven.ignoreRules   2011-12-07 00:08:52 UTC (rev 
15506)
@@ -14,13 +14,13 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/
 
-org.apache.maven.plugins maven-docck-plugin * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
 org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.maven.plugins maven-gpg-plugin * * * *
-org.apache.maven.plugins maven-invoker-plugin * * * *
-org.apache.maven.plugins maven-project-info-reports-plugin * * * *
-org.apache.maven.plugins maven-remote-resources-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.plugins maven-scm-plugin * * * *
-org.codehaus.modello modello-maven-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.wagon wagon-ssh * * * *
+org.apache.rat apache-rat-plugin * * * *
 org.codehaus.mojo clirr-maven-plugin * * * *
-org.codehaus.plexus plexus-maven-plugin * * * *

Modified: trunk/apache-pom/debian/maven.rules
===
--- trunk/apache-pom/debian/maven.rules 2011-12-05 21:00:03 UTC (rev 15505)
+++ trunk/apache-pom/debian/maven.rules 2011-12-07 00:08:52 UTC (rev 15506)
@@ -17,3 +17,6 @@
 #   junit junit jar s/3\\..*/3.x/
 
 org.apache apache pom s/.*/debian/ * *
+s/org.apache/org.apache.apache.resources/ apache-jar-resource-bundle jar 
s/1\..*/1.x/ * *
+org.apache.apache.resources apache-jar-resource-bundle jar s/1\..*/1.x/ * *
+


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#644259: Ok, lets switch to Git

[Ludovic Claude]

Thomas,

It looks like a good idea to szitch to Git for this package and for 
maven-debian-helper.


Is there some kind of standard procedure for setting up Git and its many 
branches for a Debian package, and in particular in this case for a 
native Debian package?


Thanks,

Ludovic



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#644260: Improving maven-repo-helper code

[Ludovic Claude]

Hello Thomas,

Those are good ideas, but they will take time and bring not much more in 
terms of functionality.
I agree that the code needs moderniwing, it was written for Java 1.4 as 
Maven 2.0 was also compiled for 1.4. The use of StAX parser made the 
code too procedural, and it evolved quickly in a big clob.


We could use DecentXML for example to patch the POM files, maybe that's 
worth investigating.

http://code.google.com/p/decentxml/

But in general I think that we should look into what Maven provides, and 
it looks like the new Aether libraries could help us to read those POM 
files. It would be great also to find a strategy to reuse the dependency 
resolution algorithm from Maven, as it's quite complex.


So instead of trying to improve the code incrementally, I would favor a 
radical new approach if that were possible. I need first to work on 
Maven 3 packaging and look more deeply which APIs could be reused there.


Another point is that maven-debian-helper and maven-repo-helper are 
deeply dependent, so changes on repo-helper will have to be carefully 
managed.


 Actually I started diving into maven-repo-helper because it somehow 
deleted a

 dependency from a project I want to package (jgit)...

Could you file a bug report for this case?

Thanks for your comments anyway, I will try to incorporate them in 
future devs.


Ludovic



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r15379 - trunk/maven-ant-helper/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 22:40:30 + (Sun, 13 Nov 2011)
New Revision: 15379

Modified:
   trunk/maven-ant-helper/debian/changelog
Log:
* Release

Modified: trunk/maven-ant-helper/debian/changelog
===
--- trunk/maven-ant-helper/debian/changelog 2011-11-12 23:48:58 UTC (rev 
15378)
+++ trunk/maven-ant-helper/debian/changelog 2011-11-13 22:40:30 UTC (rev 
15379)
@@ -1,4 +1,4 @@
-maven-ant-helper (7.5) UNRELEASED; urgency=low
+maven-ant-helper (7.5) ; urgency=low
 
   * Use Java 1.5 for compiling and source level compatibility
 by default (Closes: #644941)


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15380 - trunk/maven-ant-helper/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 22:43:09 + (Sun, 13 Nov 2011)
New Revision: 15380

Modified:
   trunk/maven-ant-helper/debian/changelog
Log:
* release



Modified: trunk/maven-ant-helper/debian/changelog
===
--- trunk/maven-ant-helper/debian/changelog 2011-11-13 22:40:30 UTC (rev 
15379)
+++ trunk/maven-ant-helper/debian/changelog 2011-11-13 22:43:09 UTC (rev 
15380)
@@ -1,4 +1,4 @@
-maven-ant-helper (7.5) ; urgency=low
+maven-ant-helper (7.5) unstable; urgency=low
 
   * Use Java 1.5 for compiling and source level compatibility
 by default (Closes: #644941)


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15382 - trunk/maven-repo-helper/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 22:47:26 + (Sun, 13 Nov 2011)
New Revision: 15382

Modified:
   trunk/maven-repo-helper/debian/changelog
Log:
* Release

Modified: trunk/maven-repo-helper/debian/changelog
===
--- trunk/maven-repo-helper/debian/changelog2011-11-13 22:44:28 UTC (rev 
15381)
+++ trunk/maven-repo-helper/debian/changelog2011-11-13 22:47:26 UTC (rev 
15382)
@@ -1,4 +1,4 @@
-maven-repo-helper (1.7) UNRELEASED; urgency=low
+maven-repo-helper (1.7) unstable; urgency=low
 
   * add --site-xml=location option to mh_install and in the
 package.poms file to explicitly define the location for site.xml.


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15383 - in tags/maven-repo-helper: . 1.7/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 22:49:13 + (Sun, 13 Nov 2011)
New Revision: 15383

Added:
   tags/maven-repo-helper/1.7/
   tags/maven-repo-helper/1.7/debian/changelog
Removed:
   tags/maven-repo-helper/1.7/debian/changelog
Log:
[svn-buildpackage] Tagging maven-repo-helper 1.7

Deleted: tags/maven-repo-helper/1.7/debian/changelog
===
--- trunk/maven-repo-helper/debian/changelog2011-11-10 21:34:11 UTC (rev 
15373)
+++ tags/maven-repo-helper/1.7/debian/changelog 2011-11-13 22:49:13 UTC (rev 
15383)
@@ -1,290 +0,0 @@
-maven-repo-helper (1.7) UNRELEASED; urgency=low
-
-  * add --site-xml=location option to mh_install and in the
-package.poms file to explicitly define the location for site.xml.
-Warning: this forces existing packages to add this option if they
-need to install site.xml
-  * update the version in the POM and in the documentation
-(Closes: #644258)
-  * run the unit tests when building the package, fix broken tests after the
-introduction of relativePath on the parent element of cleaned POM files. 
-  * d/control: add ant-optional, junit, libxmlunit-java, libcommons-io-java to
-Build-Depend-Indep
-  * d/copyright: update fields to match latest DEP5 spec.
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Tue, 01 Nov 2011 16:32:39 
+0200
-
-maven-repo-helper (1.6) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Add tutorial, reference and repository specification in documentation
-  * Update options on mh_installpom and mh_installpoms, to use the new 
arguments
-added to mh_cleanpom
-  * Add Build-Depend on markdown to build the doc
-  * Add support for packages built with dh 7 and javahelper: use
-the following line in your rules file:
- dh $@ --with javahelper --with jh_maven_repo_helper
-This will build the package with javahelper, and the resulting
-jar will be installed in the Maven repository (you need of course the
-package.poms file and the POM files in your package).
-  * Add mh_linkjars to link the jars listed in the .poms file, this is used by
-the jh_maven_repo_helper plugin for dh 7.
-  * Deprecate mh_installjar -i option and replace it with -j to avoid conflicts
-with -i/--ignore-rules option used elsewhere.
-  * Review all options passed to the mh_* scripts, in particular --set-version
-for mh_installjar (Closes: #640730)
-
-  [ Damien Raude-Morvan ]
-  * mh_checkrepo: Fix error when launching without any param.
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Mon, 26 Sep 2011 22:55:09 
+0100
-
-maven-repo-helper (1.5.2) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Match jar with bundle as they are equivalent
-
-  [ Damien Raude-Morvan ]
-  * Keep relativePath attribute on parent pom.
-  * d/control: Fix typo in package description (Closes: #617438).
-  * src/main/java/org/debian/maven/repo/RepositoryReportWriter.java: Add
-a hack to change output of Maven repository checker.
-  * Bump Standards-Version to 3.9.2 (no changes needed).
-
- -- Damien Raude-Morvan draz...@debian.org  Tue, 16 Aug 2011 19:28:03 +0200
-
-maven-repo-helper (1.5.1) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner twer...@debian.org  Wed, 09 Feb 2011 21:39:12 +0100
-
-maven-repo-helper (1.5) experimental; urgency=low
-
-  * Create mh_installsite to install site.xml into the Maven repository,
-and integrate it with mh_install
-  * Avoid duplication between rules in maven.rules and maven.publishedRules,
-as well as between maven.ignoreRules and maven.cleanIgnoreRules
-  * Fix ignore modules, make it work in more cases.
-  * mh_clean: clean also files listed in .mh_clean, similar to what jh_clean
-does.
-  * add support for dh 7 and ant builds: use the following line in your
-rules file:
- dh $@ --with ant --with maven_repo_helper
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Thu, 11 Nov 2010 18:49:49 
+0100
-
-maven-repo-helper (1.4) experimental; urgency=low
-
-  * Better support for inserting properties in the transformed or cleaned
-POM files. Avoid duplicate properties and allow definition of new
-properties.
-  * add support for --has-package-version and --keep-elements in the
-package.poms file, for mh_install add --artifact, --java-lib,
---usj-name, --usj-version, --no-usj-versionless, --dest-jar
-  * update README.Debian and document the new options.
-  * change license from BSD to Apache 2.0, there's no need to have so many
-different licenses in this package, MIT and Apache2.0 are already used.
-  * Keep comments in the POM files as much as possible (Closes: #574045)
-  * mh_cleanpom: keep build, report and reporting elements if the type
-of the POM file is 'pom'.
-  * mh_cleanpom, mh_patchpom: plugin configuration elements containing
-dependencies such as:
-resourceBundleorg.apache:apache-jar-resource-bundle:1.x/resourceBundle
-are detected and rules are applied to them

[pkg-java] r15384 - trunk/maven-repo-helper/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 22:51:55 + (Sun, 13 Nov 2011)
New Revision: 15384

Modified:
   trunk/maven-repo-helper/debian/changelog
Log:
* Ubuntu build


Modified: trunk/maven-repo-helper/debian/changelog
===
--- trunk/maven-repo-helper/debian/changelog2011-11-13 22:49:13 UTC (rev 
15383)
+++ trunk/maven-repo-helper/debian/changelog2011-11-13 22:51:55 UTC (rev 
15384)
@@ -1,3 +1,9 @@
+maven-repo-helper (1.7ubuntu1~ppa1) oneiric; urgency=low
+
+  * Ubuntu build
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Sun, 13 Nov 2011 23:51:14 
+0100
+
 maven-repo-helper (1.7) unstable; urgency=low
 
   * add --site-xml=location option to mh_install and in the


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15385 - tags

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 23:01:49 + (Sun, 13 Nov 2011)
New Revision: 15385

Added:
   tags/apache-pom/
Log:
[svn-inject] Cr?\195?\169ation du r?\195?\169pertoire apache-pom/.


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15386 - trunk

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 23:02:35 + (Sun, 13 Nov 2011)
New Revision: 15386

Added:
   trunk/apache-pom/
Log:
Cr?\195?\169ation du r?\195?\169pertoire tronc


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15387 - in trunk/apache-pom: . debian debian/source

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 23:03:14 + (Sun, 13 Nov 2011)
New Revision: 15387

Added:
   trunk/apache-pom/debian/
   trunk/apache-pom/debian/README.source
   trunk/apache-pom/debian/build.properties
   trunk/apache-pom/debian/changelog
   trunk/apache-pom/debian/compat
   trunk/apache-pom/debian/control
   trunk/apache-pom/debian/copyright
   trunk/apache-pom/debian/libapache-pom-java.poms
   trunk/apache-pom/debian/maven.cleanIgnoreRules
   trunk/apache-pom/debian/maven.ignoreRules
   trunk/apache-pom/debian/maven.publishedRules
   trunk/apache-pom/debian/maven.rules
   trunk/apache-pom/debian/orig-tar.sh
   trunk/apache-pom/debian/rules
   trunk/apache-pom/debian/source/
   trunk/apache-pom/debian/source/format
   trunk/apache-pom/debian/watch
Log:
[svn-inject] Application des modifications Debian (7-1) pour le tronc


Property changes on: trunk/apache-pom/debian
___
Added: mergeWithUpstream
   + 1

Added: trunk/apache-pom/debian/README.source
===
--- trunk/apache-pom/debian/README.source   (rev 0)
+++ trunk/apache-pom/debian/README.source   2011-11-13 23:03:14 UTC (rev 
15387)
@@ -0,0 +1,6 @@
+Information about apache-pom
+--
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+

Added: trunk/apache-pom/debian/build.properties
===
--- trunk/apache-pom/debian/build.properties(rev 0)
+++ trunk/apache-pom/debian/build.properties2011-11-13 23:03:14 UTC (rev 
15387)
@@ -0,0 +1,3 @@
+build.directory=target
+javadoc.dir=target/apidocs
+maven.test.skip=true

Added: trunk/apache-pom/debian/changelog
===
--- trunk/apache-pom/debian/changelog   (rev 0)
+++ trunk/apache-pom/debian/changelog   2011-11-13 23:03:14 UTC (rev 15387)
@@ -0,0 +1,6 @@
+apache-pom (7-1) UNRELEASED; urgency=low
+
+  * Initial release (Closes: #)   is the bug number of your
+ITP
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Thu, 11 Nov 2010 18:27:31 
+0100

Added: trunk/apache-pom/debian/compat
===
--- trunk/apache-pom/debian/compat  (rev 0)
+++ trunk/apache-pom/debian/compat  2011-11-13 23:03:14 UTC (rev 15387)
@@ -0,0 +1 @@
+7

Added: trunk/apache-pom/debian/control
===
--- trunk/apache-pom/debian/control (rev 0)
+++ trunk/apache-pom/debian/control 2011-11-13 23:03:14 UTC (rev 15387)
@@ -0,0 +1,23 @@
+Source: apache-pom
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Ludovic Claude ludovic.cla...@laposte.net
+Build-Depends: debhelper (= 7), cdbs, default-jdk, ant-optional, 
maven-ant-helper ( 6.7)
+Build-Depends-Indep: maven-repo-helper (= 1.4)
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/apache-pom
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/apache-pom
+Homepage: http://www.apache.org/ 
+
+Package: libapache-pom-java
+Architecture: all
+Depends: ${misc:Depends}, 
+Description: Maven POM for The Apache Software Foundation
+ The Apache Software Foundation provides support for the Apache community
+ of open-source software projects. The Apache projects are characterized
+ by a collaborative, consensus based development process, an open and pragmatic
+ software license, and a desire to create high quality software that leads
+ the way in its field. We consider ourselves not simply a group of projects
+ sharing a server, but rather a community of developers and users.
+

Added: trunk/apache-pom/debian/copyright
===
--- trunk/apache-pom/debian/copyright   (rev 0)
+++ trunk/apache-pom/debian/copyright   2011-11-13 23:03:14 UTC (rev 15387)
@@ -0,0 +1,15 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: The Apache Software Foundation
+Source: http://www.apache.org/
+
+Files: *
+Copyright: 2010, The Apache Software Foundation
+License: Apache-2.0
+Files: debian/*
+Copyright: 2010, Ludovic Claude ludovic.cla...@laposte.net
+License: Apache-2.0
+
+License: Apache-2.0
+  TODO: include the full license text here
+
+

Added: trunk/apache-pom/debian/libapache-pom-java.poms
===
--- trunk/apache-pom/debian/libapache-pom-java.poms 
(rev 0)
+++ trunk/apache-pom/debian/libapache-pom-java.poms 2011-11-13 23:03:14 UTC 
(rev 15387)
@@ -0,0 +1,20 @@
+# List of POM files for the package
+# Format of this file

[pkg-java] r15388 - trunk/apache-pom/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 23:06:25 + (Sun, 13 Nov 2011)
New Revision: 15388

Modified:
   trunk/apache-pom/debian/changelog
Log:
Initial release (Closes: #644558)

Modified: trunk/apache-pom/debian/changelog
===
--- trunk/apache-pom/debian/changelog   2011-11-13 23:03:14 UTC (rev 15387)
+++ trunk/apache-pom/debian/changelog   2011-11-13 23:06:25 UTC (rev 15388)
@@ -1,6 +1,5 @@
-apache-pom (7-1) UNRELEASED; urgency=low
+apache-pom (7-1) unstable; urgency=low
 
-  * Initial release (Closes: #)   is the bug number of your
-ITP
+  * Initial release (Closes: #644558)
 
  -- Ludovic Claude ludovic.cla...@laposte.net  Thu, 11 Nov 2010 18:27:31 
+0100


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15389 - in tags/apache-pom: . 7-1/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-13 23:08:17 + (Sun, 13 Nov 2011)
New Revision: 15389

Added:
   tags/apache-pom/7-1/
   tags/apache-pom/7-1/debian/changelog
Removed:
   tags/apache-pom/7-1/debian/changelog
Log:
[svn-buildpackage] Tagging apache-pom 7-1

Deleted: tags/apache-pom/7-1/debian/changelog
===
--- trunk/apache-pom/debian/changelog   2011-11-13 23:03:14 UTC (rev 15387)
+++ tags/apache-pom/7-1/debian/changelog2011-11-13 23:08:17 UTC (rev 
15389)
@@ -1,6 +0,0 @@
-apache-pom (7-1) UNRELEASED; urgency=low
-
-  * Initial release (Closes: #)   is the bug number of your
-ITP
-
- -- Ludovic Claude ludovic.cla...@laposte.net  Thu, 11 Nov 2010 18:27:31 
+0100

Copied: tags/apache-pom/7-1/debian/changelog (from rev 15388, 
trunk/apache-pom/debian/changelog)
===
--- tags/apache-pom/7-1/debian/changelog(rev 0)
+++ tags/apache-pom/7-1/debian/changelog2011-11-13 23:08:17 UTC (rev 
15389)
@@ -0,0 +1,5 @@
+apache-pom (7-1) unstable; urgency=low
+
+  * Initial release (Closes: #644558)
+
+ -- Ludovic Claude ludovic.cla...@laposte.net  Thu, 11 Nov 2010 18:27:31 
+0100


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits