[pkg-java] r16634 - trunk/mina2/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-14 09:20:26 +0000 (Tue, 14 May 2013)
New Revision: 16634

Modified:
   trunk/mina2/debian/changelog
   trunk/mina2/debian/control
   trunk/mina2/debian/copyright
   trunk/mina2/debian/orig-tar.sh
   trunk/mina2/debian/rules
   trunk/mina2/debian/watch
Log:
New upstream release (2.0.7)
Updated Standards-Version to 3.9.4 (no changes)
debian/copyright: Updated to comply with the Copyright Format 1.0
debian/orig-tar.sh: Create the source tarball in the parent directory
Replaced the dependency on libtomcat6-java with libtomcat7-java


Modified: trunk/mina2/debian/changelog
===================================================================
--- trunk/mina2/debian/changelog	2013-05-14 08:19:49 UTC (rev 16633)
+++ trunk/mina2/debian/changelog	2013-05-14 09:20:26 UTC (rev 16634)
@@ -1,3 +1,13 @@
+mina2 (2.0.7+dfsg-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated Standards-Version to 3.9.4 (no changes)
+  * debian/copyright: Updated to comply with the Copyright Format 1.0
+  * debian/orig-tar.sh: Create the source tarball in the parent directory
+  * Replaced the dependency on libtomcat6-java with libtomcat7-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 14 May 2013 11:19:23 +0200
+
 mina2 (2.0.4+dfsg-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/mina2/debian/control
===================================================================
--- trunk/mina2/debian/control	2013-05-14 08:19:49 UTC (rev 16633)
+++ trunk/mina2/debian/control	2013-05-14 09:20:26 UTC (rev 16634)
@@ -2,20 +2,20 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), ant, cdbs, default-jdk
 Build-Depends-Indep: libslf4j-java, libjzlib-java,
-  libmx4j-java, libspring-beans-java, libtomcat6-java, libognl-java, librxtx-java,
+  libmx4j-java, libspring-beans-java, libtomcat7-java, libognl-java, librxtx-java,
   maven-repo-helper
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mina2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mina2
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://mina.apache.org
 
 Package: libmina2-java
 Architecture: all
 Depends: ${misc:Depends}, libslf4j-java
-Recommends: libjzlib-java, libmx4j-java, libtomcat6-java, libognl-java
+Recommends: libjzlib-java, libmx4j-java, libtomcat7-java, libognl-java
 Suggests: libmina-java-doc, libspring-beans-java
 Description: Java network application framework
  Apache MINA is a network application framework which helps users develop high

Modified: trunk/mina2/debian/copyright
===================================================================
--- trunk/mina2/debian/copyright	2013-05-14 08:19:49 UTC (rev 16633)
+++ trunk/mina2/debian/copyright	2013-05-14 09:20:26 UTC (rev 16634)
@@ -1,16 +1,16 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Mina
 Upstream-Contact: Apache Software Foundation, http://mina.apache.org/
 Source: http://www.apache.org/dist/mina/
 
 Files: *
-Copyright: Copyright (C) 2007-2010 The Apache Software Foundation
-Copyright: Copyright (c) 2003 Eric Glass (NTLMResponses.java)
+Copyright: 2007-2010, The Apache Software Foundation
+           2003, Eric Glass (NTLMResponses.java)
 License: Apache-2.0
 
 Files: debian/*
-Copyright: Copyright (C) 2008, Damien Raude-Morvan <drazzib at debian.org>
-Copyright: Copyright (C) 2008, Rail Aliev <rail at i-rs.ru>
+Copyright: 2008, Damien Raude-Morvan <drazzib at debian.org>
+           2008, Rail Aliev <rail at i-rs.ru>
 License: Apache-2.0
 
 License: Apache-2.0

Modified: trunk/mina2/debian/orig-tar.sh
===================================================================
--- trunk/mina2/debian/orig-tar.sh	2013-05-14 08:19:49 UTC (rev 16633)
+++ trunk/mina2/debian/orig-tar.sh	2013-05-14 09:20:26 UTC (rev 16634)
@@ -10,13 +10,14 @@
 # $2 = version
 # $3 = file
 DIR=mina2-$2.orig
-TAR=mina2_$2+dfsg.orig.tar.gz
+TAR=../mina2_$2+dfsg.orig.tar.gz
 
 # clean up the upstream tarball
 tar zxf $3
 mv apache-mina-* $DIR
 GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR
+rm $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Modified: trunk/mina2/debian/rules
===================================================================
--- trunk/mina2/debian/rules	2013-05-14 08:19:49 UTC (rev 16633)
+++ trunk/mina2/debian/rules	2013-05-14 09:20:26 UTC (rev 16634)
@@ -6,7 +6,7 @@
 JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_JARS  := slf4j-api jzlib mx4j spring3-core spring3-beans ognl \
-             /usr/share/tomcat6/lib/tomcat-coyote.jar \
+             /usr/share/tomcat7/lib/tomcat-coyote.jar \
              RXTXcomm.jar
 DEB_ANT_BUILDFILE := debian/build.xml
 DEB_ANT_ARGS := -Ddeb.package=${DEB_SOURCE_PACKAGE}

Modified: trunk/mina2/debian/watch
===================================================================
--- trunk/mina2/debian/watch	2013-05-14 08:19:49 UTC (rev 16633)
+++ trunk/mina2/debian/watch	2013-05-14 09:20:26 UTC (rev 16634)
@@ -1,3 +1,3 @@
 version=3
 opts="dversionmangle=s/\+dfsg//" \
-  http://www.apache.org/dist/mina/2\.([\d.]+)/ apache-mina-(.+)-src\.tar\.gz debian debian/orig-tar.sh
+  http://archive.apache.org/dist/mina/2\.([\d.]+)/ apache-mina-(.+)-src\.tar\.gz debian debian/orig-tar.sh