[pkg-java] r11568 - in trunk/ivy/debian: . source

[Varun Hiremath]

Author: varun
Date: 2010-02-11 21:02:59 +0000 (Thu, 11 Feb 2010)
New Revision: 11568

Added:
   trunk/ivy/debian/source/
   trunk/ivy/debian/source/format
Modified:
   trunk/ivy/debian/changelog
   trunk/ivy/debian/compat
   trunk/ivy/debian/control
   trunk/ivy/debian/pom.xml
   trunk/ivy/debian/rules
Log:
* New upstream release
* Update pom.xml to the latest version
* (Build)-Depend on default-jdk-doc (Closes: #567274)
* Switch to source format 3.0

Modified: trunk/ivy/debian/changelog
===================================================================
--- trunk/ivy/debian/changelog	2010-02-11 20:56:48 UTC (rev 11567)
+++ trunk/ivy/debian/changelog	2010-02-11 21:02:59 UTC (rev 11568)
@@ -1,9 +1,16 @@
-ivy (2.1.0~rc2-4) UNRELEASED; urgency=low
+ivy (2.1.0-1) unstable; urgency=low
 
+  [ Thierry Carrez ]
   * debian/build.xml: Build java2-code to match runtime dependency
 
- -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 10 Nov 2009 11:37:23 +0100
+  [ Varun Hiremath ]
+  * New upstream release
+  * Update pom.xml to the latest version
+  * (Build)-Depend on default-jdk-doc (Closes: #567274)
+  * Switch to source format 3.0
 
+ -- Varun Hiremath <varun at debian.org>  Thu, 11 Feb 2010 15:47:07 -0500
+
 ivy (2.1.0~rc2-3) unstable; urgency=low
 
   * Update pom.xml file to latest 2.1.0~rc2 version (Closes: #548310)

Modified: trunk/ivy/debian/compat
===================================================================
--- trunk/ivy/debian/compat	2010-02-11 20:56:48 UTC (rev 11567)
+++ trunk/ivy/debian/compat	2010-02-11 21:02:59 UTC (rev 11568)
@@ -1 +1 @@
-6
+7

Modified: trunk/ivy/debian/control
===================================================================
--- trunk/ivy/debian/control	2010-02-11 20:56:48 UTC (rev 11567)
+++ trunk/ivy/debian/control	2010-02-11 21:02:59 UTC (rev 11568)
@@ -4,12 +4,12 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: cdbs, debhelper (>= 6)
+Build-Depends: cdbs, debhelper (>= 7)
 Build-Depends-Indep: maven-repo-helper, ant, default-jdk, libcommons-httpclient-java,
  libcommons-lang-java, libcommons-cli-java, liboro-java,
  libcommons-collections-java, libcommons-vfs-java, junit,
- libjsch-java, openjdk-6-doc
-Standards-Version: 3.8.3
+ libjsch-java, default-jdk-doc
+Standards-Version: 3.8.4
 Homepage: http://ant.apache.org/ivy/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ivy
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ivy
@@ -26,7 +26,7 @@
 Package: ivy-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
+Depends: ${misc:Depends}, default-jdk-doc
 Description: The agile dependency manager (documentation)
  Ivy is a very powerful dependency manager oriented toward Java
  dependency management, even though it could be used to manage

Modified: trunk/ivy/debian/pom.xml
===================================================================
--- trunk/ivy/debian/pom.xml	2010-02-11 20:56:48 UTC (rev 11567)
+++ trunk/ivy/debian/pom.xml	2010-02-11 21:02:59 UTC (rev 11568)
@@ -29,7 +29,7 @@
   <groupId>org.apache.ivy</groupId>
   <artifactId>ivy</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-rc2</version>
+  <version>2.1.0</version>
   <url>http://ant.apache.org/ivy/</url>
   <dependencies>
     <dependency>

Modified: trunk/ivy/debian/rules
===================================================================
--- trunk/ivy/debian/rules	2010-02-11 20:56:48 UTC (rev 11567)
+++ trunk/ivy/debian/rules	2010-02-11 21:02:59 UTC (rev 11568)
@@ -24,7 +24,7 @@
 	-rm -rf debian/tmp
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	-uscan --force-download --rename
 
 get-orig-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/apache/ivy/ivy/$(MVN_VERSION)/ivy-$(MVN_VERSION).pom

Added: trunk/ivy/debian/source/format
===================================================================
--- trunk/ivy/debian/source/format	                        (rev 0)
+++ trunk/ivy/debian/source/format	2010-02-11 21:02:59 UTC (rev 11568)
@@ -0,0 +1 @@
+3.0 (quilt)