[pkg-java] r16827 - in trunk/libxml-security1.4-java/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Wed Jun 5 23:23:05 UTC 2013
Author: ebourg-guest
Date: 2013-06-05 23:23:05 +0000 (Wed, 05 Jun 2013)
New Revision: 16827
Added:
trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.doc-base.api
trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.install
trunk/libxml-security1.4-java/debian/libxml-security1.4-java.poms
Removed:
trunk/libxml-security1.4-java/debian/libxml-security-java-doc.doc-base.api
trunk/libxml-security1.4-java/debian/libxml-security-java-doc.install
trunk/libxml-security1.4-java/debian/libxml-security-java.poms
Modified:
trunk/libxml-security1.4-java/debian/changelog
trunk/libxml-security1.4-java/debian/control
trunk/libxml-security1.4-java/debian/maven.cleanIgnoreRules
trunk/libxml-security1.4-java/debian/maven.ignoreRules
trunk/libxml-security1.4-java/debian/maven.publishedRules
trunk/libxml-security1.4-java/debian/maven.rules
trunk/libxml-security1.4-java/debian/orig-tar.sh
trunk/libxml-security1.4-java/debian/patches/0001-change-packaging-to-jar.patch
trunk/libxml-security1.4-java/debian/watch
Log:
Preliminary work on libxml-security1.4-java
Modified: trunk/libxml-security1.4-java/debian/changelog
===================================================================
--- trunk/libxml-security1.4-java/debian/changelog 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/changelog 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,3 +1,10 @@
+libxml-security1.4-java (1.4.7-1) experimental; urgency=low
+
+ * Reverting to the latest 1.4.x release
+ * debian/control: Use canonical URLs for the Vcs-* fields
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 05 Jun 2013 23:29:41 +0200
+
libxml-security-java (1.5.4-1) experimental; urgency=low
[ Emmanuel Bourg ]
Modified: trunk/libxml-security1.4-java/debian/control
===================================================================
--- trunk/libxml-security1.4-java/debian/control 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/control 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,4 +1,4 @@
-Source: libxml-security-java
+Source: libxml-security1.4-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -7,33 +7,33 @@
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, libbcprov-java
+ libxalan2-java-doc, libmaven-javadoc-plugin-java
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/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libxml-security1.4-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libxml-security1.4-java
+Homepage: http://santuario.apache.org
-Package: libxml-security-java
+Package: libxml-security1.4-java
Architecture: all
Depends: ${misc:Depends}, ${maven:Depends}
Recommends: ${maven:OptionalDepends}
-Suggests: libxml-security-java-doc
+Suggests: libxml-security1.4-java-doc
Description: Apache Santuario
Apache Santuario supports XML-Signature Syntax and Processing, W3C
Recommendation 12 February 2002, and XML Encryption Syntax and Processing, W3C
Recommendation 10 December 2002. As of version 1.4, the Java library supports
the standard Java API JSR-105: XML Digital Signature APIs.
-Package: libxml-security-java-doc
+Package: libxml-security1.4-java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}, ${maven:DocDepends}
Recommends: ${maven:DocOptionalDepends}
-Suggests: libxml-security-java
+Suggests: libxml-security1.4-java
Description: Documentation for Apache Santuario
Apache Santuario supports XML-Signature Syntax and Processing, W3C
Recommendation 12 February 2002, and XML Encryption Syntax and Processing, W3C
Recommendation 10 December 2002. As of version 1.4, the Java library supports
the standard Java API JSR-105: XML Digital Signature APIs.
.
- This package contains the API documentation of libxml-security-java.
+ This package contains the API documentation of libxml-security1.4-java.
Deleted: trunk/libxml-security1.4-java/debian/libxml-security-java-doc.doc-base.api
===================================================================
--- trunk/libxml-security1.4-java/debian/libxml-security-java-doc.doc-base.api 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/libxml-security-java-doc.doc-base.api 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,10 +0,0 @@
-Document: libxml-security-java
-Title: API Javadoc for Apache Santuario
-Author: The Apache Software Foundation developers
-Abstract: This is the API Javadoc provided for the
- libxml-security-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libxml-security-java/api/index.html
-Files: /usr/share/doc/libxml-security-java/api/*
Deleted: trunk/libxml-security1.4-java/debian/libxml-security-java-doc.install
===================================================================
--- trunk/libxml-security1.4-java/debian/libxml-security-java-doc.install 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/libxml-security-java-doc.install 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,2 +0,0 @@
-target/apidocs/* usr/share/doc/libxml-security-java/api
-
Deleted: trunk/libxml-security1.4-java/debian/libxml-security-java.poms
===================================================================
--- trunk/libxml-security1.4-java/debian/libxml-security-java.poms 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/libxml-security-java.poms 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,28 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --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
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --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. [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. [mh_install]
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --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
Copied: trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.doc-base.api (from rev 16826, trunk/libxml-security1.4-java/debian/libxml-security-java-doc.doc-base.api)
===================================================================
--- trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.doc-base.api (rev 0)
+++ trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.doc-base.api 2013-06-05 23:23:05 UTC (rev 16827)
@@ -0,0 +1,10 @@
+Document: libxml-security1.4-java
+Title: API Javadoc for Apache Santuario
+Author: The Apache Software Foundation developers
+Abstract: This is the API Javadoc provided for the
+ libxml-security1.4-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libxml-security1.4-java/api/index.html
+Files: /usr/share/doc/libxml-security1.4-java/api/*
Copied: trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.install (from rev 16826, trunk/libxml-security1.4-java/debian/libxml-security-java-doc.install)
===================================================================
--- trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.install (rev 0)
+++ trunk/libxml-security1.4-java/debian/libxml-security1.4-java-doc.install 2013-06-05 23:23:05 UTC (rev 16827)
@@ -0,0 +1 @@
+target/apidocs/* usr/share/doc/libxml-security1.4-java/api
Copied: trunk/libxml-security1.4-java/debian/libxml-security1.4-java.poms (from rev 16826, trunk/libxml-security1.4-java/debian/libxml-security-java.poms)
===================================================================
--- trunk/libxml-security1.4-java/debian/libxml-security1.4-java.poms (rev 0)
+++ trunk/libxml-security1.4-java/debian/libxml-security1.4-java.poms 2013-06-05 23:23:05 UTC (rev 16827)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --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
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --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. [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. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --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 --java-lib --no-usj-versionless
Modified: trunk/libxml-security1.4-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libxml-security1.4-java/debian/maven.cleanIgnoreRules 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/maven.cleanIgnoreRules 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,17 +1 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# 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/
Modified: trunk/libxml-security1.4-java/debian/maven.ignoreRules
===================================================================
--- trunk/libxml-security1.4-java/debian/maven.ignoreRules 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/maven.ignoreRules 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,18 +1,3 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# 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/
org.apache.felix maven-bundle-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
Modified: trunk/libxml-security1.4-java/debian/maven.publishedRules
===================================================================
--- trunk/libxml-security1.4-java/debian/maven.publishedRules 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/maven.publishedRules 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,19 +1,2 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\\..*/3.x/
+org.apache.santuario xmlsec s/bundle/jar/ s/1\.4.*/1.4.x/ * *
Modified: trunk/libxml-security1.4-java/debian/maven.rules
===================================================================
--- trunk/libxml-security1.4-java/debian/maven.rules 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/maven.rules 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,24 +1,7 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# 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/ * *
+org.apache.santuario xmlsec s/bundle/jar/ s/1\.4.*/1.4.x/ * *
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-security1.4-java/debian/orig-tar.sh
===================================================================
--- trunk/libxml-security1.4-java/debian/orig-tar.sh 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/orig-tar.sh 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,7 +1,7 @@
#!/bin/sh -e
VERSION=$2
-TAR=../libxml-security-java_$VERSION.orig.tar.gz
+TAR=../libxml-security1.4-java_$VERSION.orig.tar.gz
DIR=libxml-security-java-$VERSION
TAG="$VERSION"
Modified: trunk/libxml-security1.4-java/debian/patches/0001-change-packaging-to-jar.patch
===================================================================
--- trunk/libxml-security1.4-java/debian/patches/0001-change-packaging-to-jar.patch 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/patches/0001-change-packaging-to-jar.patch 2013-06-05 23:23:05 UTC (rev 16827)
@@ -3,12 +3,12 @@
Subject: [PATCH] change packaging to jar
--- a/pom.xml
+++ b/pom.xml
-@@ -20,7 +20,7 @@
+@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
- <name>Apache XML Security for Java</name>
- <version>1.5.4</version>
+ <name>Apache Santuario</name>
+ <version>1.4.7</version>
<description>
Modified: trunk/libxml-security1.4-java/debian/watch
===================================================================
--- trunk/libxml-security1.4-java/debian/watch 2013-06-05 21:02:07 UTC (rev 16826)
+++ trunk/libxml-security1.4-java/debian/watch 2013-06-05 23:23:05 UTC (rev 16827)
@@ -1,4 +1,2 @@
version=3
-
-http://svn.apache.org/repos/asf/santuario/xml-security-java/tags/ (\d[\d.]*)/ \
- debian debian/orig-tar.sh
+http://svn.apache.org/repos/asf/santuario/xml-security-java/tags/ (1.4[\d.]*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list