Author: drazzib
Date: 2011-03-29 23:26:56 +0000 (Tue, 29 Mar 2011)
New Revision: 13475
Added:
tags/libjettison-java/1.2-3/
tags/libjettison-java/1.2-3/debian/changelog
tags/libjettison-java/1.2-3/debian/compat
tags/libjettison-java/1.2-3/debian/control
tags/libjettison-java/1.2-3/debian/maven.rules
tags/libjettison-java/1.2-3/debian/pom.xml
tags/libjettison-java/1.2-3/debian/rules
Removed:
tags/libjettison-java/1.2-3/debian/changelog
tags/libjettison-java/1.2-3/debian/compat
tags/libjettison-java/1.2-3/debian/control
tags/libjettison-java/1.2-3/debian/rules
Log:
[svn-buildpackage] Tagging libjettison-java 1.2-3
Deleted: tags/libjettison-java/1.2-3/debian/changelog
===================================================================
--- trunk/libjettison-java/debian/changelog 2011-03-16 20:33:24 UTC (rev
13434)
+++ tags/libjettison-java/1.2-3/debian/changelog 2011-03-29 23:26:56 UTC
(rev 13475)
@@ -1,57 +0,0 @@
-libjettison-java (1.2-2) unstable; urgency=low
-
- * Update copyright file because the json code uses the Apache license now. It
- is based on an older public domain implementation of the JSON.org library.
- (Closes: #585469)
-
- -- Torsten Werner <twer...@debian.org> Thu, 10 Jun 2010 20:17:19 +0200
-
-libjettison-java (1.2-1) unstable; urgency=low
-
- * New upstream version.
- * Merge changes from Ubuntu.
- * Switch to source format 3.0.
- * Update Standards-Version: 3.8.4.
- * Switch back to source and target version 1.5 because upstream uses Java 5
- features.
-
- -- Torsten Werner <twer...@debian.org> Sat, 08 May 2010 17:52:11 +0200
-
-libjettison-java (1.1-1ubuntu2) karmic; urgency=low
-
- * debian/build.xml: Build java2-compatible code to match JRE dependency
- * debian/control: Drop java1-runtime-headless ORed dependency
-
- -- Thierry Carrez <thierry.car...@ubuntu.com> Tue, 25 Aug 2009 15:08:56 +0200
-
-libjettison-java (1.1-1ubuntu1) karmic; urgency=low
-
- * debian/control: Runtime dependency on -headless JREs (LP: #387884)
- * debian/control, debian/rules: Build-depend on default-jdk
-
- -- Thierry Carrez <thierry.car...@ubuntu.com> Fri, 03 Jul 2009 15:05:02 +0200
-
-libjettison-java (1.1-1) unstable; urgency=low
-
- * Updated watch file.
- * New upstream release
- * Add missing Depends: ${misc:Depends}.
- * Bump up Standards-Version: 3.8.1 (no changes).
- * Change Section: java.
- * Fix downloading of orig tarball.
- * Do no longer quote the full text of the Apache license in debian/copyright.
-
- -- Torsten Werner <twer...@debian.org> Tue, 19 May 2009 22:43:46 +0200
-
-libjettison-java (1.0-1) unstable; urgency=low
-
- * new upstream release
- * Change Standards-Version: 3.7.3 (no changes).
-
- -- Torsten Werner <twer...@debian.org> Sat, 08 Mar 2008 10:38:47 +0100
-
-libjettison-java (1.0~RC2-1) unstable; urgency=low
-
- * initial version (Closes: #453111)
-
- -- Torsten Werner <twer...@debian.org> Sat, 24 Nov 2007 00:01:40 +0100
Copied: tags/libjettison-java/1.2-3/debian/changelog (from rev 13474,
trunk/libjettison-java/debian/changelog)
===================================================================
--- tags/libjettison-java/1.2-3/debian/changelog
(rev 0)
+++ tags/libjettison-java/1.2-3/debian/changelog 2011-03-29 23:26:56 UTC
(rev 13475)
@@ -0,0 +1,73 @@
+libjettison-java (1.2-3) unstable; urgency=low
+
+ * Team upload.
+ * Install Maven artifacts (Closes: #620049).
+ Thanks to James Page <james.p...@canonical.com> :
+ - debian/control: Add maven-repo-helper to Build-Depends.
+ - debian/rules: Use mh_installpom and mh_installjar instead of
+ install/dh_link.
+ - debian/pom.xml: Downloaded POM for Maven.
+ - debian/maven.rules: Force installed POM to use "jar" packaging.
+ * Update Standards-Version: 3.9.1 (no changes needed).
+ * Bump Debhelper compat level to 7 (and update B-D).
+ * Drop Depends on a JRE since it's a library package.
+
+ -- Damien Raude-Morvan <draz...@debian.org> Wed, 30 Mar 2011 01:22:27 +0200
+
+libjettison-java (1.2-2) unstable; urgency=low
+
+ * Update copyright file because the json code uses the Apache license now. It
+ is based on an older public domain implementation of the JSON.org library.
+ (Closes: #585469)
+
+ -- Torsten Werner <twer...@debian.org> Thu, 10 Jun 2010 20:17:19 +0200
+
+libjettison-java (1.2-1) unstable; urgency=low
+
+ * New upstream version.
+ * Merge changes from Ubuntu.
+ * Switch to source format 3.0.
+ * Update Standards-Version: 3.8.4.
+ * Switch back to source and target version 1.5 because upstream uses Java 5
+ features.
+
+ -- Torsten Werner <twer...@debian.org> Sat, 08 May 2010 17:52:11 +0200
+
+libjettison-java (1.1-1ubuntu2) karmic; urgency=low
+
+ * debian/build.xml: Build java2-compatible code to match JRE dependency
+ * debian/control: Drop java1-runtime-headless ORed dependency
+
+ -- Thierry Carrez <thierry.car...@ubuntu.com> Tue, 25 Aug 2009 15:08:56 +0200
+
+libjettison-java (1.1-1ubuntu1) karmic; urgency=low
+
+ * debian/control: Runtime dependency on -headless JREs (LP: #387884)
+ * debian/control, debian/rules: Build-depend on default-jdk
+
+ -- Thierry Carrez <thierry.car...@ubuntu.com> Fri, 03 Jul 2009 15:05:02 +0200
+
+libjettison-java (1.1-1) unstable; urgency=low
+
+ * Updated watch file.
+ * New upstream release
+ * Add missing Depends: ${misc:Depends}.
+ * Bump up Standards-Version: 3.8.1 (no changes).
+ * Change Section: java.
+ * Fix downloading of orig tarball.
+ * Do no longer quote the full text of the Apache license in debian/copyright.
+
+ -- Torsten Werner <twer...@debian.org> Tue, 19 May 2009 22:43:46 +0200
+
+libjettison-java (1.0-1) unstable; urgency=low
+
+ * new upstream release
+ * Change Standards-Version: 3.7.3 (no changes).
+
+ -- Torsten Werner <twer...@debian.org> Sat, 08 Mar 2008 10:38:47 +0100
+
+libjettison-java (1.0~RC2-1) unstable; urgency=low
+
+ * initial version (Closes: #453111)
+
+ -- Torsten Werner <twer...@debian.org> Sat, 24 Nov 2007 00:01:40 +0100
Deleted: tags/libjettison-java/1.2-3/debian/compat
===================================================================
--- trunk/libjettison-java/debian/compat 2011-03-16 20:33:24 UTC (rev
13434)
+++ tags/libjettison-java/1.2-3/debian/compat 2011-03-29 23:26:56 UTC (rev
13475)
@@ -1 +0,0 @@
-5
Copied: tags/libjettison-java/1.2-3/debian/compat (from rev 13473,
trunk/libjettison-java/debian/compat)
===================================================================
--- tags/libjettison-java/1.2-3/debian/compat (rev 0)
+++ tags/libjettison-java/1.2-3/debian/compat 2011-03-29 23:26:56 UTC (rev
13475)
@@ -0,0 +1 @@
+7
Deleted: tags/libjettison-java/1.2-3/debian/control
===================================================================
--- trunk/libjettison-java/debian/control 2011-03-16 20:33:24 UTC (rev
13434)
+++ tags/libjettison-java/1.2-3/debian/control 2011-03-29 23:26:56 UTC (rev
13475)
@@ -1,26 +0,0 @@
-Source: libjettison-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Torsten Werner <twer...@debian.org>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, default-jdk
-Standards-Version: 3.8.4
-Homepage: http://jettison.codehaus.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjettison-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjettison-java/
-
-Package: libjettison-java
-Architecture: all
-Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}
-Description: collection of StAX parsers and writers for JSON
- Jettison is a collection of StAX parsers (streaming API for XML) and
- writers which read and write JSON (JavaScript Object Notation). This
- allows nearly transparent enablement of JSON based web services in
- services frameworks like Apache CXF.
- .
- There are currently two included conventions for mapping JSON to XML.
- The first is BadgerFish which implements the full XML infoset in JSON
- using various techniques. The second is called the "mapped"
- convention. It allows you to manually map XML namespaces to JSON
- element prefixes.
Copied: tags/libjettison-java/1.2-3/debian/control (from rev 13473,
trunk/libjettison-java/debian/control)
===================================================================
--- tags/libjettison-java/1.2-3/debian/control (rev 0)
+++ tags/libjettison-java/1.2-3/debian/control 2011-03-29 23:26:56 UTC (rev
13475)
@@ -0,0 +1,26 @@
+Source: libjettison-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Torsten Werner <twer...@debian.org>
+Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper
+Build-Depends-Indep: ant, default-jdk
+Standards-Version: 3.9.1
+Homepage: http://jettison.codehaus.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjettison-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjettison-java/
+
+Package: libjettison-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: collection of StAX parsers and writers for JSON
+ Jettison is a collection of StAX parsers (streaming API for XML) and
+ writers which read and write JSON (JavaScript Object Notation). This
+ allows nearly transparent enablement of JSON based web services in
+ services frameworks like Apache CXF.
+ .
+ There are currently two included conventions for mapping JSON to XML.
+ The first is BadgerFish which implements the full XML infoset in JSON
+ using various techniques. The second is called the "mapped"
+ convention. It allows you to manually map XML namespaces to JSON
+ element prefixes.
Copied: tags/libjettison-java/1.2-3/debian/maven.rules (from rev 13474,
trunk/libjettison-java/debian/maven.rules)
===================================================================
--- tags/libjettison-java/1.2-3/debian/maven.rules
(rev 0)
+++ tags/libjettison-java/1.2-3/debian/maven.rules 2011-03-29 23:26:56 UTC
(rev 13475)
@@ -0,0 +1,2 @@
+# Force installed POM to use "jar" packaging
+org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
Copied: tags/libjettison-java/1.2-3/debian/pom.xml (from rev 13473,
trunk/libjettison-java/debian/pom.xml)
===================================================================
--- tags/libjettison-java/1.2-3/debian/pom.xml (rev 0)
+++ tags/libjettison-java/1.2-3/debian/pom.xml 2011-03-29 23:26:56 UTC (rev
13475)
@@ -0,0 +1,120 @@
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.2</version>
+ <packaging>bundle</packaging>
+ <name>Jettison</name>
+ <description>A StAX implementation for JSON.</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <scm>
+
<connection>scm:svn:https://svn.codehaus.org/jettison/tags/jettison-1.2</connection>
+
<developerConnection>scm:svn:https://svn.codehaus.org/jettison/tags/jettison-1.2</developerConnection>
+ <url>https://svn.codehaus.org/jettison/tags/jettison-1.2</url>
+ </scm>
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.codehaus.org/jettison/tags/</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>1.0.0</version>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName>
+
<Export-Package>org.codehaus.jettison*;version=${project.version}</Export-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>!*</Private-Package>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <distributionManagement>
+ <repository>
+ <id>codehaus.org</id>
+ <name>jettison Central Repository</name>
+ <url>dav:https://dav.codehaus.org/repository/jettison/</url>
+ </repository>
+ <snapshotRepository>
+ <id>codehaus.org</id>
+ <name>jettison Central Development Repository</name>
+ <url>dav:https://dav.codehaus.org/snapshots.repository/jettison/</url>
+ </snapshotRepository>
+ <site>
+ <id>codehaus.org</id>
+ <url>dav:https://dav.codehaus.org/jettison/</url>
+ </site>
+ </distributionManagement>
+
+</project>
\ No newline at end of file
Deleted: tags/libjettison-java/1.2-3/debian/rules
===================================================================
--- trunk/libjettison-java/debian/rules 2011-03-16 20:33:24 UTC (rev 13434)
+++ tags/libjettison-java/1.2-3/debian/rules 2011-03-29 23:26:56 UTC (rev
13475)
@@ -1,14 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-
-install/libjettison-java::
- install -m644 -D jettison.jar
$(DEB_DESTDIR)/usr/share/java/jettison-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibjettison-java
/usr/share/java/jettison-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/jettison.jar
-
-get-orig-source:
- uscan --force-download --rename
Copied: tags/libjettison-java/1.2-3/debian/rules (from rev 13473,
trunk/libjettison-java/debian/rules)
===================================================================
--- tags/libjettison-java/1.2-3/debian/rules (rev 0)
+++ tags/libjettison-java/1.2-3/debian/rules 2011-03-29 23:26:56 UTC (rev
13475)
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_BUILDFILE := debian/build.xml
+PACKAGE := jettison
+MAVEN_REPO := http://repo1.maven.org/maven2
+
+install/libjettison-java::
+ mh_installpom -plib$(PACKAGE)-java -e$(DEB_UPSTREAM_VERSION)
debian/pom.xml
+ mh_installjar -plib$(PACKAGE)-java -e$(DEB_UPSTREAM_VERSION) -l
debian/pom.xml $(PACKAGE).jar
+
+get-orig-source:
+ uscan --force-download --rename
+
+get-orig-pom:
+ wget -U NoSuchBrowser/1.0 -O debian/pom.xml \
+
$(MAVEN_REPO)/org/codehaus/jettison/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
