[pkg-java] r12819 - in trunk/libswingx-java/debian: . patches source

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-07-26 16:26:23 +0000 (Mon, 26 Jul 2010)
New Revision: 12819

Added:
   trunk/libswingx-java/debian/source/
   trunk/libswingx-java/debian/source/format
Modified:
   trunk/libswingx-java/debian/README.source
   trunk/libswingx-java/debian/changelog
   trunk/libswingx-java/debian/control
   trunk/libswingx-java/debian/patches/pom.diff
   trunk/libswingx-java/debian/rules
Log:
* New upstream release.
* Switch to 3.0 (quilt) format.
* Bump Standards-Version to 3.9.1: no changes needed.
* Drop Depends on JRE: not requested anymore by new Java Policy.

Modified: trunk/libswingx-java/debian/README.source
===================================================================
--- trunk/libswingx-java/debian/README.source	2010-07-26 08:54:32 UTC (rev 12818)
+++ trunk/libswingx-java/debian/README.source	2010-07-26 16:26:23 UTC (rev 12819)
@@ -1,13 +1,3 @@
-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.
-
-
 Orig tarball repack
 ===================
 

Modified: trunk/libswingx-java/debian/changelog
===================================================================
--- trunk/libswingx-java/debian/changelog	2010-07-26 08:54:32 UTC (rev 12818)
+++ trunk/libswingx-java/debian/changelog	2010-07-26 16:26:23 UTC (rev 12819)
@@ -1,3 +1,12 @@
+libswingx-java (1:1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to 3.0 (quilt) format.
+  * Bump Standards-Version to 3.9.1: no changes needed.
+  * Drop Depends on JRE: not requested anymore by new Java Policy.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 26 Jul 2010 12:11:27 +0200
+
 libswingx-java (1:1.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libswingx-java/debian/control
===================================================================
--- trunk/libswingx-java/debian/control	2010-07-26 08:54:32 UTC (rev 12818)
+++ trunk/libswingx-java/debian/control	2010-07-26 16:26:23 UTC (rev 12819)
@@ -4,16 +4,17 @@
 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>,
  Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk, ant, maven-ant-helper
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, maven-ant-helper
 Build-Depends-Indep: libbatik-java, maven-repo-helper
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: https://swingx.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libswingx-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libswingx-java/
 
 Package: libswingx-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java6-runtime
+Depends: ${misc:Depends}
+Suggests: libbatik-java
 Description: extensions to the Swing GUI toolkit
  This package contains extensions to the Swing GUI toolkit, including new and
  enhanced components that provide functionality commonly required by rich

Modified: trunk/libswingx-java/debian/patches/pom.diff
===================================================================
--- trunk/libswingx-java/debian/patches/pom.diff	2010-07-26 08:54:32 UTC (rev 12818)
+++ trunk/libswingx-java/debian/patches/pom.diff	2010-07-26 16:26:23 UTC (rev 12819)
@@ -34,17 +34,18 @@
          </dependency>
 --- a/pom.xml
 +++ b/pom.xml
-@@ -112,13 +112,6 @@
- 			<version>2.0.235</version>
- 			<scope>compile</scope>
- 		</dependency>
--        </dependency>
--        <dependency>
--            <groupId>org.swinglabs</groupId>
--            <artifactId>multiplegradientpaint</artifactId>
--            <version>1.0</version>
--            <scope>compile</scope>
--        </dependency> 
+@@ -118,12 +118,14 @@
+             <version>1.1</version>
+             <!--scope>compile</scope-->
+         </dependency>
++<!--
+         <dependency>
+             <groupId>org.swinglabs</groupId>
+             <artifactId>multiplegradientpaint</artifactId>
+             <version>1.0</version>
+             <scope>compile</scope>
+         </dependency> 
++-->
  		<dependency>
              <groupId>junit</groupId>
              <artifactId>junit</artifactId>

Modified: trunk/libswingx-java/debian/rules
===================================================================
--- trunk/libswingx-java/debian/rules	2010-07-26 08:54:32 UTC (rev 12818)
+++ trunk/libswingx-java/debian/rules	2010-07-26 16:26:23 UTC (rev 12819)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := swingx
 VERSION              := $(DEB_UPSTREAM_VERSION)

Added: trunk/libswingx-java/debian/source/format
===================================================================
--- trunk/libswingx-java/debian/source/format	                        (rev 0)
+++ trunk/libswingx-java/debian/source/format	2010-07-26 16:26:23 UTC (rev 12819)
@@ -0,0 +1 @@
+3.0 (quilt)