[maven2-core] 09/38: * New upstream release (Closes: #542546) * Update download url for debian/watch and debian/orig-tar.sh * Move API docs to /usr/share/doc/libmaven2-core-java/api * Update Standards-Version to 3.8.3 - add debian/README.source * debian/control: Add version contraints on dependencies * debian/orig-tar.sh: Add orig-tar.exclude to ignore unecessary code and compiled libraries from upstream

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Feb 27 13:24:17 UTC 2015 

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven2-core.

commit 31a3f2c2caf38b61c2ad793a80af38fa8f8c2684
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Fri Sep 4 18:32:10 2009 +0000

    * New upstream release (Closes: #542546)
    * Update download url for debian/watch and debian/orig-tar.sh
    * Move API docs to /usr/share/doc/libmaven2-core-java/api
    * Update Standards-Version to 3.8.3
       - add debian/README.source
    * debian/control: Add version contraints on dependencies
    * debian/orig-tar.sh: Add orig-tar.exclude to ignore unecessary code
      and compiled libraries from upstream
---
 debian/README.source                       |  9 +++++++++
 debian/changelog                           | 13 +++++++++++++
 debian/control                             | 24 ++++++++++++------------
 debian/libmaven2-core-java-doc.doc-base    |  4 ++--
 debian/orig-tar.exclude                    |  4 ++++
 debian/orig-tar.sh                         |  6 ++----
 debian/patches/plugin-versions.patch       | 28 ++++++++++++++++++++++++++--
 debian/patches/remove_webdav_support.patch | 28 +++++++++++++---------------
 debian/watch                               |  2 +-
 9 files changed, 82 insertions(+), 36 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..f846ea2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
diff --git a/debian/changelog b/debian/changelog
index 4d05473..302cbc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+maven2-core (2.2.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #542546)
+  * Update download url for debian/watch and debian/orig-tar.sh
+  * Move API docs to /usr/share/doc/libmaven2-core-java/api
+  * Update Standards-Version to 3.8.3
+     - add debian/README.source
+  * debian/control: Add version contraints on dependencies
+  * debian/orig-tar.sh: Add orig-tar.exclude to ignore unecessary code
+    and compiled libraries from upstream
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 03 Sep 2009 18:07:56 +0100
+
 maven2-core (2.2.0-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 96b37c9..e265a9e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,25 +6,25 @@ Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), quilt, default-jdk
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
   junit, 
-  libcommons-cli-java (>= 1.1), libslf4j-java,
-  libdoxia-java, libmodello-java, libplexus-container-default-java,
+  libcommons-cli-java (>= 1.1), libslf4j-java (>= 1.5.6), libclassworlds-java (>= 1.1),
+  libdoxia-java (>= 1.1), libmodello-java (>= 1.0.1), libplexus-container-default-java,
   libplexus-ant-factory-java, libplexus-bsh-factory-java,
-  libplexus-archiver-java, libplexus-sec-dispatcher-java,
-  libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java, 
-  libplexus-utils-java (>=1:1.5.5), libwagon-java, libbackport-util-concurrent-java
-Standards-Version: 3.8.1
+  libplexus-archiver-java, libplexus-sec-dispatcher-java (>= 1.3),
+  libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java (>= 1.11), 
+  libplexus-utils-java (>=1:1.5.15), libwagon-java, libbackport-util-concurrent-java (>= 3.1)
+Standards-Version: 3.8.3
 Homepage: http://maven.apache.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2-core
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2-core
 
 Package: libmaven2-core-java
 Architecture: all
-Depends: ${misc:Depends}, libcommons-cli-java (>= 1.1), libslf4j-java,
-  libdoxia-java, libmodello-java, libplexus-container-default-java,
-  libplexus-archiver-java, libplexus-sec-dispatcher-java,
-  libplexus-ant-factory-java, libplexus-bsh-factory-java,
-  libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java, 
-  libplexus-utils-java (>=1:1.5.5), libwagon-java, libbackport-util-concurrent-java
+Depends: ${misc:Depends}, libcommons-cli-java (>= 1.1), libslf4j-java (>= 1.5.6),
+  libdoxia-java (>= 1.1), libmodello-java (>= 1.0.1), libplexus-container-default-java, 
+  libplexus-archiver-java, libplexus-sec-dispatcher-java (>= 1.3),
+  libplexus-ant-factory-java, libplexus-bsh-factory-java, libclassworlds-java (>= 1.1),
+  libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java (>= 1.11), 
+  libplexus-utils-java (>=1:1.5.15), libwagon-java, libbackport-util-concurrent-java (>= 3.1)
 Description: Core libraries for Maven2
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,
diff --git a/debian/libmaven2-core-java-doc.doc-base b/debian/libmaven2-core-java-doc.doc-base
index 5102efc..6fe31df 100644
--- a/debian/libmaven2-core-java-doc.doc-base
+++ b/debian/libmaven2-core-java-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: Programmer API of Maven2,
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libmaven2-core-java-doc/api/index.html
-Files: /usr/share/doc/libmaven2-core-java-doc/api/*
+Index: /usr/share/doc/libmaven2-core-java/api/index.html
+Files: /usr/share/doc/libmaven2-core-java/api/*
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
new file mode 100644
index 0000000..be61400
--- /dev/null
+++ b/debian/orig-tar.exclude
@@ -0,0 +1,4 @@
+*.jar
+apache-maven
+
+
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 8136747..82a1bb0 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -5,10 +5,8 @@ TAR=../maven2-core_$VERSION.orig.tar.gz
 DIR=maven2-core-$VERSION
 TAG=$(echo maven-$2 | sed s/~RC/-RC/ )
 
-svn export http://svn.apache.org/repos/asf/maven/components/tags/$TAG $DIR
-# remove the jar as Debian requires everything to be built from source, it will be rebuild from source
-rm $DIR/maven-ant-tasks*.jar
-tar -c -z -f $TAR $DIR
+svn export http://svn.apache.org/repos/asf/maven/maven-2/tags/$TAG $DIR
+GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'
diff --git a/debian/patches/plugin-versions.patch b/debian/patches/plugin-versions.patch
index 62ba357..aefcb3b 100644
--- a/debian/patches/plugin-versions.patch
+++ b/debian/patches/plugin-versions.patch
@@ -1,6 +1,11 @@
 --- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
 +++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-@@ -80,7 +80,7 @@
+@@ -76,11 +76,11 @@
+          </plugin>       
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+-           <version>2.2-beta-2</version>
++           <version>2.2-beta-4</version>
           </plugin>         
           <plugin>
             <artifactId>maven-clean-plugin</artifactId>
@@ -18,7 +23,17 @@
           </plugin>
           <plugin>
             <artifactId>maven-deploy-plugin</artifactId>
-@@ -104,7 +104,7 @@
+@@ -96,15 +96,15 @@
+          </plugin>
+          <plugin>
+            <artifactId>maven-ear-plugin</artifactId>
+-           <version>2.3.1</version>
++           <version>2.3.2</version>
+          </plugin>
+          <plugin>
+            <artifactId>maven-ejb-plugin</artifactId>
+-           <version>2.1</version>
++           <version>2.2</version>
           </plugin>
           <plugin>
             <artifactId>maven-install-plugin</artifactId>
@@ -45,3 +60,12 @@
           </plugin>
           <plugin>
             <artifactId>maven-source-plugin</artifactId>
+@@ -144,7 +144,7 @@
+          </plugin>
+          <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+-           <version>2.1-alpha-2</version>
++           <version>2.1-beta-1</version>
+          </plugin>
+        </plugins>
+      </pluginManagement>
diff --git a/debian/patches/remove_webdav_support.patch b/debian/patches/remove_webdav_support.patch
index ba83269..96af78a 100644
--- a/debian/patches/remove_webdav_support.patch
+++ b/debian/patches/remove_webdav_support.patch
@@ -1,20 +1,18 @@
 --- a/maven-core/pom.xml
 +++ b/maven-core/pom.xml
-@@ -45,17 +45,6 @@
+@@ -62,6 +62,7 @@
+         </exclusion>
+       </exclusions>
      </dependency>
++<!-- Removed as jackrabbit depends on JSR 170 which has a non free license
      <dependency>
        <groupId>org.apache.maven.wagon</groupId>
--      <artifactId>wagon-webdav-jackrabbit</artifactId>
--      <scope>runtime</scope>
--      <exclusions>
--        <exclusion>
--          <groupId>commons-logging</groupId>
--          <artifactId>commons-logging</artifactId>
--        </exclusion>
--      </exclusions>
--    </dependency>
--    <dependency>
--      <groupId>org.apache.maven.wagon</groupId>
-       <artifactId>wagon-http</artifactId>
-       <scope>runtime</scope>
-       <exclusions>
+       <artifactId>wagon-webdav-jackrabbit</artifactId>
+@@ -73,6 +74,7 @@
+         </exclusion>
+       </exclusions>
+     </dependency>
++-->
+     <dependency>
+       <groupId>org.slf4j</groupId>
+       <artifactId>slf4j-jdk14</artifactId>
diff --git a/debian/watch b/debian/watch
index 1b8b7dc..44d60c5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 opts=uversionmangle=s/-RC/~RC/ \
-  http://svn.apache.org/repos/asf/maven/components/tags/ \
+  http://svn.apache.org/repos/asf/maven/maven-2/tags/ \
   maven-(2.*)/ debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2-core.git

More information about the pkg-java-commits mailing list