[pkg-java] r10194 - trunk/swing-layout/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-08-24 17:10:44 +0000 (Mon, 24 Aug 2009)
New Revision: 10194

Modified:
   trunk/swing-layout/debian/changelog
   trunk/swing-layout/debian/compat
   trunk/swing-layout/debian/control
   trunk/swing-layout/debian/copyright
   trunk/swing-layout/debian/rules
Log:
swing-layout (1.0.3-2) unstable; urgency=low

  * Added default-jdk to Build-Depends-Indep and set JAVA_HOME to
    /usr/lib/jvm/default-java. (Closes: #543105).
  * Added myself to uploaders. 
  * Bumped debhelper compat to version 7 - No changes required.
  * Bumped Standards-Version to 3.8.3 - No changes required.
  * Added missing ${misc:Depends} to all binary Depends. 
  * Corrected debian/copyright to refer to LGPL-2.1 rather than
    the versionless LGPL in /usr/share/common-licenses. 

 -- Niels Thykier <niels at thykier.net>  Mon, 24 Aug 2009 19:08:28 +0200


Modified: trunk/swing-layout/debian/changelog
===================================================================
--- trunk/swing-layout/debian/changelog	2009-08-24 07:42:59 UTC (rev 10193)
+++ trunk/swing-layout/debian/changelog	2009-08-24 17:10:44 UTC (rev 10194)
@@ -1,3 +1,16 @@
+swing-layout (1.0.3-2) unstable; urgency=low
+
+  * Added default-jdk to Build-Depends-Indep and set JAVA_HOME to
+    /usr/lib/jvm/default-java. (Closes: #543105).
+  * Added myself to uploaders. 
+  * Bumped debhelper compat to version 7 - No changes required.
+  * Bumped Standards-Version to 3.8.3 - No changes required.
+  * Added missing ${misc:Depends} to all binary Depends. 
+  * Corrected debian/copyright to refer to LGPL-2.1 rather than
+    the versionless LGPL in /usr/share/common-licenses. 
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 24 Aug 2009 19:08:28 +0200
+
 swing-layout (1.0.3-1) unstable; urgency=low
  
   [ Marek Slama ] 

Modified: trunk/swing-layout/debian/compat
===================================================================
--- trunk/swing-layout/debian/compat	2009-08-24 07:42:59 UTC (rev 10193)
+++ trunk/swing-layout/debian/compat	2009-08-24 17:10:44 UTC (rev 10194)
@@ -1 +1 @@
-4
+7

Modified: trunk/swing-layout/debian/control
===================================================================
--- trunk/swing-layout/debian/control	2009-08-24 07:42:59 UTC (rev 10193)
+++ trunk/swing-layout/debian/control	2009-08-24 17:10:44 UTC (rev 10194)
@@ -1,20 +1,19 @@
 Source: swing-layout
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marek Slama <marek.slama at sun.com>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0)
-Build-Depends-Indep: ant, java-gcj-compat-dev, unzip
-Standards-Version: 3.7.3
+Uploaders: Marek Slama <marek.slama at sun.com>, Michael Koch <konqueror at gmx.de>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7),
+Build-Depends-Indep: ant, unzip, default-jdk
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/swing-layout
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/swing-layout
 Homepage: http://swing-layout.dev.java.net
 
 Package: libswing-layout-java
 Architecture: all
-Section: devel
-Priority: optional
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime | java2-runtime, ${misc:Depends}
 Suggests: libswing-layout-java-doc
 Description: Extensions to Swing layout
  The goal of Swing Layout Extensions is to make it easy to create professional
@@ -32,7 +31,7 @@
 Package: libswing-layout-java-doc
 Architecture: all
 Section: doc
-Priority: optional
+Depends: ${misc:Depends}
 Description: Extensions to Swing layout - contains Javadoc API documentation
  The goal of Swing Layout Extensions is to make it easy to create professional
  cross platform layouts with Swing. This project has an eye towards the needs

Modified: trunk/swing-layout/debian/copyright
===================================================================
--- trunk/swing-layout/debian/copyright	2009-08-24 07:42:59 UTC (rev 10193)
+++ trunk/swing-layout/debian/copyright	2009-08-24 17:10:44 UTC (rev 10194)
@@ -58,4 +58,4 @@
     MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.

Modified: trunk/swing-layout/debian/rules
===================================================================
--- trunk/swing-layout/debian/rules	2009-08-24 07:42:59 UTC (rev 10193)
+++ trunk/swing-layout/debian/rules	2009-08-24 17:10:44 UTC (rev 10194)
@@ -4,7 +4,7 @@
 
 DEB_TAR_SRCDIR          := swing-layout-1.0.3
 
-JAVA_HOME=/usr/lib/jvm/java-gcj
+JAVA_HOME=/usr/lib/jvm/default-java
 
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -20,14 +20,14 @@
 stamp-build-$(swing-layout-pkg):
 	ant -Ddist.javadoc.dir=dist/api -f $(DEB_SRCDIR)/build.xml
 	touch $@
-	
+
 install/$(swing-layout-pkg)::
 	install -m 644 $(DEB_SRCDIR)/dist/swing-layout.jar debian/$(swing-layout-pkg)/usr/share/java/swing-layout-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -p$(swing-layout-pkg) usr/share/java/swing-layout-$(DEB_UPSTREAM_VERSION).jar usr/share/java/swing-layout.jar
-	
+
 install/$(swing-layout-doc-pkg)::
 	dh_installdocs -p$(swing-layout-doc-pkg) $(DEB_SRCDIR)/dist/api
-	
+
 clean::
 	# these files are left by cdbs (a bug?)
 	-rm -f *.cdbs-config_list