[pkg-java] r17515 - trunk/maven-filtering/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-25 23:46:43 +0000 (Mon, 25 Nov 2013)
New Revision: 17515

Modified:
   trunk/maven-filtering/debian/changelog
   trunk/maven-filtering/debian/components.xml
   trunk/maven-filtering/debian/control
   trunk/maven-filtering/debian/orig-tar.sh
   trunk/maven-filtering/debian/rules
Log:
New upstream release (1.1)
Switch to debhelper level 9
Use XZ compression for the upstream tarball



Modified: trunk/maven-filtering/debian/changelog
===================================================================
--- trunk/maven-filtering/debian/changelog	2013-11-25 23:27:20 UTC (rev 17514)
+++ trunk/maven-filtering/debian/changelog	2013-11-25 23:46:43 UTC (rev 17515)
@@ -1,12 +1,18 @@
-maven-filtering (1.0~beta-2-6) UNRELEASED; urgency=low
+maven-filtering (1.1-1) unstable; urgency=low
 
   * Team upload.
+  * New upstream release
+    - Added a dependency on libplexus-build-api-java
+    - Updated the versions required for the dependencies
+    - Updated debian/components.xml
   * debian/control
     - Use canonical URLs for the Vcs-* fields
-    - Updated Standards-Version to 3.9.4 (no changes)
+    - Updated Standards-Version to 3.9.5 (no changes)
+  * Switch to debhelper level 9
   * debian/rules: Improved the clean target
+  * Use XZ compression for the upstream tarball
 
- -- Emmanuel Bourg <ebourg at apache.org>  Sat, 19 Oct 2013 00:29:45 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 26 Nov 2013 00:38:36 +0100
 
 maven-filtering (1.0~beta-2-5) unstable; urgency=low
 

Modified: trunk/maven-filtering/debian/components.xml
===================================================================
--- trunk/maven-filtering/debian/components.xml	2013-11-25 23:27:20 UTC (rev 17514)
+++ trunk/maven-filtering/debian/components.xml	2013-11-25 23:46:43 UTC (rev 17515)
@@ -7,6 +7,10 @@
       <description></description>
       <requirements>
         <requirement>
+          <role>org.sonatype.plexus.build.incremental.BuildContext</role>
+          <field-name>buildContext</field-name>
+        </requirement>
+        <requirement>
           <role>org.apache.maven.shared.filtering.MavenFileFilter</role>
           <role-hint>default</role-hint>
           <field-name>mavenFileFilter</field-name>
@@ -18,6 +22,12 @@
       <role-hint>default</role-hint>
       <implementation>org.apache.maven.shared.filtering.DefaultMavenFileFilter</implementation>
       <description></description>
+      <requirements>
+        <requirement>
+          <role>org.sonatype.plexus.build.incremental.BuildContext</role>
+          <field-name>buildContext</field-name>
+        </requirement>
+      </requirements>
     </component>
   </components>
 </component-set>

Modified: trunk/maven-filtering/debian/control
===================================================================
--- trunk/maven-filtering/debian/control	2013-11-25 23:27:20 UTC (rev 17514)
+++ trunk/maven-filtering/debian/control	2013-11-25 23:46:43 UTC (rev 17515)
@@ -9,12 +9,13 @@
                      ant-optional,
                      junit,
                      libmaven2-core-java,
+                     libplexus-build-api-java,
                      libplexus-container-default-java,
-                     libplexus-interpolation-java (>= 1.6),
-                     libplexus-utils-java (>= 1.5.6),
+                     libplexus-interpolation-java (>= 1.12),
+                     libplexus-utils-java (>= 1.5.15),
                      maven-ant-helper (>> 4),
                      maven-repo-helper
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-filtering
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-filtering/
 Homepage: http://maven.apache.org/shared/maven-filtering/
@@ -22,9 +23,10 @@
 Package: libmaven-filtering-java
 Architecture: all
 Depends: libmaven2-core-java,
+         libplexus-build-api-java,
          libplexus-container-default-java,
-         libplexus-interpolation-java (>= 1.6),
-         libplexus-utils-java (>= 1.5.6),
+         libplexus-interpolation-java (>= 1.12),
+         libplexus-utils-java (>= 1.5.15),
          ${misc:Depends}
 Description: Maven Filtering
  Maven is a software project management and comprehension tool. Based on the

Modified: trunk/maven-filtering/debian/orig-tar.sh
===================================================================
--- trunk/maven-filtering/debian/orig-tar.sh	2013-11-25 23:27:20 UTC (rev 17514)
+++ trunk/maven-filtering/debian/orig-tar.sh	2013-11-25 23:46:43 UTC (rev 17515)
@@ -1,11 +1,11 @@
 #!/bin/sh -e
 
-TAR=../maven-filtering_$2.orig.tar.gz
+TAR=../maven-filtering_$2.orig.tar.xz
 DIR=maven-filtering-$2
 TAG=$(echo maven-filtering-$2 | sed -e's,~,-,')
 
 svn export http://svn.apache.org/repos/asf/maven/shared/tags/$TAG $DIR
-tar -c -z -f $TAR $DIR
+XZ_OPT=--best tar -c -J -f $TAR $DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'

Modified: trunk/maven-filtering/debian/rules
===================================================================
--- trunk/maven-filtering/debian/rules	2013-11-25 23:27:20 UTC (rev 17514)
+++ trunk/maven-filtering/debian/rules	2013-11-25 23:46:43 UTC (rev 17515)
@@ -6,8 +6,8 @@
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~/-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps maven-core maven-project maven-model \
-  plexus-container-default-alpha plexus-interpolation plexus-utils junit
+DEB_JARS             := ant-nodeps maven-core maven-project maven-model maven-settings \
+  plexus-build-api plexus-container-default-alpha plexus-interpolation plexus-utils junit
 DEB_ANT_BUILD_TARGET := package #javadoc
 DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
 DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)