[pkg-java] r16539 - in trunk/libxml-security-java/debian: . patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Mon Apr 15 10:08:33 UTC 2013 

Author: ebourg-guest
Date: 2013-04-15 10:08:33 +0000 (Mon, 15 Apr 2013)
New Revision: 16539

Modified:
   trunk/libxml-security-java/debian/changelog
   trunk/libxml-security-java/debian/control
   trunk/libxml-security-java/debian/libxml-security-java.poms
   trunk/libxml-security-java/debian/maven.ignoreRules
   trunk/libxml-security-java/debian/maven.rules
   trunk/libxml-security-java/debian/patches/0001-change-packaging-to-jar.patch
Log:
New upstream release (1.5.4)

Modified: trunk/libxml-security-java/debian/changelog
===================================================================
--- trunk/libxml-security-java/debian/changelog	2013-04-15 01:43:00 UTC (rev 16538)
+++ trunk/libxml-security-java/debian/changelog	2013-04-15 10:08:33 UTC (rev 16539)
@@ -1,3 +1,12 @@
+libxml-security-java (1.5.4-1) experimental; urgency=low
+
+  * Team upload.
+  * New upstream release
+  * Refreshed the patch
+  * Updated Standards-Version to 3.9.4 (no changes)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 15 Apr 2013 12:06:57 +0200
+
 libxml-security-java (1.4.5-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libxml-security-java/debian/control
===================================================================
--- trunk/libxml-security-java/debian/control	2013-04-15 01:43:00 UTC (rev 16538)
+++ trunk/libxml-security-java/debian/control	2013-04-15 10:08:33 UTC (rev 16539)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>,
- Niels Thykier <niels at thykier.net>
+ Niels Thykier <niels at thykier.net>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libmaven-dependency-plugin-java, libcommons-logging-java, libjaxp1.3-java,  
  libxalan2-java, libxerces2-java, junit4, default-jdk-doc, libcommons-logging-java-doc,  
  libxalan2-java-doc, libmaven-javadoc-plugin-java 
-Standards-Version: 3.9.1
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxml-security-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxml-security-java
 Homepage: http://santuario.apache.org/

Modified: trunk/libxml-security-java/debian/libxml-security-java.poms
===================================================================
--- trunk/libxml-security-java/debian/libxml-security-java.poms	2013-04-15 01:43:00 UTC (rev 16538)
+++ trunk/libxml-security-java/debian/libxml-security-java.poms	2013-04-15 10:08:33 UTC (rev 16539)
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -11,16 +13,16 @@
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in /usr/share/java
 #   --usj-version=<version>: version to use when installing the library in /usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
 #   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --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.
+#   --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

Modified: trunk/libxml-security-java/debian/maven.ignoreRules
===================================================================
--- trunk/libxml-security-java/debian/maven.ignoreRules	2013-04-15 01:43:00 UTC (rev 16538)
+++ trunk/libxml-security-java/debian/maven.ignoreRules	2013-04-15 10:08:33 UTC (rev 16539)
@@ -15,3 +15,4 @@
 #   junit junit jar s/3\\..*/3.x/
 
 org.apache.felix maven-bundle-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *

Modified: trunk/libxml-security-java/debian/maven.rules
===================================================================
--- trunk/libxml-security-java/debian/maven.rules	2013-04-15 01:43:00 UTC (rev 16538)
+++ trunk/libxml-security-java/debian/maven.rules	2013-04-15 10:08:33 UTC (rev 16539)
@@ -17,5 +17,8 @@
 #   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/4\..*/4.x/ * *
+org.apache apache pom s/.*/debian/ * *
 org.apache.santuario xmlsec bundle s/.*/debian/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+log4j log4j * s/1\.2\..*/1.2.x/ * *
+org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * *

Modified: trunk/libxml-security-java/debian/patches/0001-change-packaging-to-jar.patch
===================================================================
--- trunk/libxml-security-java/debian/patches/0001-change-packaging-to-jar.patch	2013-04-15 01:43:00 UTC (rev 16538)
+++ trunk/libxml-security-java/debian/patches/0001-change-packaging-to-jar.patch	2013-04-15 10:08:33 UTC (rev 16539)
@@ -1,22 +1,14 @@
 From: Torsten Werner <twerner at debian.org>
 Date: Tue, 30 Aug 2011 13:59:54 +0200
 Subject: [PATCH] change packaging to jar
-
----
- pom.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 1dfc616..a4a7964 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -22,7 +22,7 @@
+@@ -20,7 +20,7 @@
      <modelVersion>4.0.0</modelVersion>
      <groupId>org.apache.santuario</groupId>
      <artifactId>xmlsec</artifactId>
 -    <packaging>bundle</packaging>
 +    <packaging>jar</packaging>
-     <name>Apache Santuario</name>
-     <version>1.4.5</version>
+     <name>Apache XML Security for Java</name>
+     <version>1.5.4</version>
      <description>
---

More information about the pkg-java-commits mailing list