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

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-02-01 22:52:17 +0000 (Mon, 01 Feb 2010)
New Revision: 11485

Modified:
   trunk/swing-layout/debian/changelog
   trunk/swing-layout/debian/control
   trunk/swing-layout/debian/copyright
   trunk/swing-layout/debian/rules
Log:
* New upstream release (Closes: #567325)
* debian/rules file is changed to use ant.mk
* copyright file "Upstream download" link is corrected

Modified: trunk/swing-layout/debian/changelog
===================================================================
--- trunk/swing-layout/debian/changelog	2010-02-01 22:41:01 UTC (rev 11484)
+++ trunk/swing-layout/debian/changelog	2010-02-01 22:52:17 UTC (rev 11485)
@@ -1,3 +1,11 @@
+swing-layout (1.0.4-1) unstable; urgency=low
+
+  * New upstream release (Closes: #567325)
+  * debian/rules file is changed to use ant.mk
+  * copyright file "Upstream download" link is corrected
+
+ -- Yulia Novozhilova <Yulia.Novozhilova at sun.com>  Wed, 27 Jan 2010 16:48:28 +0300
+
 swing-layout (1.0.3-2) unstable; urgency=low
 
   * Added default-jdk to Build-Depends-Indep and set JAVA_HOME to

Modified: trunk/swing-layout/debian/control
===================================================================
--- trunk/swing-layout/debian/control	2010-02-01 22:41:01 UTC (rev 11484)
+++ trunk/swing-layout/debian/control	2010-02-01 22:52:17 UTC (rev 11485)
@@ -3,9 +3,9 @@
 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>,
- Niels Thykier <niels at thykier.net>
+ Niels Thykier <niels at thykier.net>, Yulia Novozhilova <Yulia.Novozhilova at sun.com>
 Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7),
-Build-Depends-Indep: ant, unzip, default-jdk
+Build-Depends-Indep: ant, 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

Modified: trunk/swing-layout/debian/copyright
===================================================================
--- trunk/swing-layout/debian/copyright	2010-02-01 22:41:01 UTC (rev 11484)
+++ trunk/swing-layout/debian/copyright	2010-02-01 22:52:17 UTC (rev 11485)
@@ -2,8 +2,8 @@
 13-July-2007.
 
 Upstream downloaded from:
-  https://swing-layout.dev.java.net/files/documents/2752/50110/swing-layout-1.0.2-src.zip
-
+    https://swing-layout.dev.java.net/files/documents/2752/144673/swing-layout-1.0.4-src.zip
+    
 Upstream home page:
   http://swing-layout.dev.java.net/
 

Modified: trunk/swing-layout/debian/rules
===================================================================
--- trunk/swing-layout/debian/rules	2010-02-01 22:41:01 UTC (rev 11484)
+++ trunk/swing-layout/debian/rules	2010-02-01 22:52:17 UTC (rev 11485)
@@ -1,34 +1,22 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-DEB_TAR_SRCDIR          := swing-layout-1.0.3
+JAVA_HOME  := /usr/lib/jvm/default-java
 
-JAVA_HOME=/usr/lib/jvm/default-java
+DEB_ANT_BUILDFILE := $(DEB_SRCDIR)/build.xml
+DEB_ANT_ARGS := -Ddist.javadoc.dir=dist/api
 
-include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
 # package name
 swing-layout-pkg        := libswing-layout-java
 swing-layout-doc-pkg    := $(swing-layout-pkg)-doc
 
-build/$(swing-layout-pkg):: stamp-build-$(swing-layout-pkg)
 
-# This target is here to avoid multiple invocation of build target.
-# build/$(swing-layout-pkg) is invoked 2 times when building binary packages.
-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
+	install -m 644 -D $(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
-	-rm -f stamp-build-$(swing-layout-pkg)