[pkg-java] r14147 - in trunk/libjgoodies-binding-java/debian: . source

Torsten Werner twerner at alioth.debian.org
Thu Aug 11 05:31:36 UTC 2011


Author: twerner
Date: 2011-08-11 05:31:36 +0000 (Thu, 11 Aug 2011)
New Revision: 14147

Added:
   trunk/libjgoodies-binding-java/debian/source/
   trunk/libjgoodies-binding-java/debian/source/format
Modified:
   trunk/libjgoodies-binding-java/debian/changelog
   trunk/libjgoodies-binding-java/debian/control
   trunk/libjgoodies-binding-java/debian/orig-tar.sh
   trunk/libjgoodies-binding-java/debian/rules
   trunk/libjgoodies-binding-java/debian/watch
Log:
* Newer upstream release. Newest but API incompatible version is 2.4.0.
* Switch to default-jdk.
* Add Build-Depends: libjgoodies-common-java.
* Change Section: java.
* Clean up Depends.
* Switch to source format 3.0.

Modified: trunk/libjgoodies-binding-java/debian/changelog
===================================================================
--- trunk/libjgoodies-binding-java/debian/changelog	2011-08-10 01:40:22 UTC (rev 14146)
+++ trunk/libjgoodies-binding-java/debian/changelog	2011-08-11 05:31:36 UTC (rev 14147)
@@ -1,3 +1,14 @@
+libjgoodies-binding-java (2.1.0-1) unstable; urgency=low
+
+  * Newer upstream release. Newest but API incompatible version is 2.4.0.
+  * Switch to default-jdk.
+  * Add Build-Depends: libjgoodies-common-java.
+  * Change Section: java.
+  * Clean up Depends.
+  * Switch to source format 3.0.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 11 Aug 2011 07:31:21 +0200
+
 libjgoodies-binding-java (2.0.6-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libjgoodies-binding-java/debian/control
===================================================================
--- trunk/libjgoodies-binding-java/debian/control	2011-08-10 01:40:22 UTC (rev 14146)
+++ trunk/libjgoodies-binding-java/debian/control	2011-08-11 05:31:36 UTC (rev 14147)
@@ -1,10 +1,10 @@
 Source: libjgoodies-binding-java
-Section: libs
+Section: java
 Priority: optional
 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>
 Build-Depends: cdbs, debhelper (>= 6)
-Build-Depends-Indep: ant, java-gcj-compat-dev
+Build-Depends-Indep: ant, default-jdk, libjgoodies-common-java
 Standards-Version: 3.8.0
 Homepage: https://binding.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjgoodies-binding-java
@@ -12,7 +12,7 @@
 
 Package: libjgoodies-binding-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}
 Description: Swing Data Binding Framework
  The JGoodies Binding synchronizes object properties with Swing
  components. And it helps you represent the state and behavior of a

Modified: trunk/libjgoodies-binding-java/debian/orig-tar.sh
===================================================================
--- trunk/libjgoodies-binding-java/debian/orig-tar.sh	2011-08-10 01:40:22 UTC (rev 14146)
+++ trunk/libjgoodies-binding-java/debian/orig-tar.sh	2011-08-11 05:31:36 UTC (rev 14147)
@@ -2,11 +2,10 @@
 
 # called by uscan with '--upstream-version' <version> <file>
 TAR=../libjgoodies-binding-java_$2.orig.tar.gz
-DIR=libjgoodies-binding-java-$2.orig
+DIR=jgoodies-binding-$2
 
 # clean up the upstream tarball
 unzip $3
-mv binding-$2 $DIR
 tar -c -z -f $TAR --exclude '*/docs/api/*' --exclude '*.jar' $DIR
 rm -rf $DIR $3
 
@@ -17,4 +16,3 @@
   echo "moved $TAR to $origDir"
 fi
 
-exit 0

Modified: trunk/libjgoodies-binding-java/debian/rules
===================================================================
--- trunk/libjgoodies-binding-java/debian/rules	2011-08-10 01:40:22 UTC (rev 14146)
+++ trunk/libjgoodies-binding-java/debian/rules	2011-08-11 05:31:36 UTC (rev 14147)
@@ -3,13 +3,19 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME                  := /usr/lib/jvm/java-gcj
+JAVA_HOME                  := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET       := jar javadoc
 DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+DEB_JARS                   := jgoodies-common
 
 install/libjgoodies-binding-java::
-	install -m 644 -D build/binding.jar $(DEB_DESTDIR)/usr/share/java/binding-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/binding-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/binding.jar
+	install -m 644 -D build/jgoodies-binding.jar \
+	    $(DEB_DESTDIR)/usr/share/java/jgoodies-binding-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/jgoodies-binding-$(DEB_UPSTREAM_VERSION).jar \
+	    /usr/share/java/jgoodies-binding.jar
+	# keep a compat symlink
+	dh_link /usr/share/java/jgoodies-binding.jar \
+	    /usr/share/java/binding.jar
 
 get-orig-source:
-	-uscan --upstream-version 0
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

Added: trunk/libjgoodies-binding-java/debian/source/format
===================================================================
--- trunk/libjgoodies-binding-java/debian/source/format	                        (rev 0)
+++ trunk/libjgoodies-binding-java/debian/source/format	2011-08-11 05:31:36 UTC (rev 14147)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/libjgoodies-binding-java/debian/watch
===================================================================
--- trunk/libjgoodies-binding-java/debian/watch	2011-08-10 01:40:22 UTC (rev 14146)
+++ trunk/libjgoodies-binding-java/debian/watch	2011-08-11 05:31:36 UTC (rev 14147)
@@ -1,4 +1,11 @@
 version=3
+# older versions at http://www.jgoodies.com/downloads/archive.html
 opts=uversionmangle=s/_/./g \
-  http://www.jgoodies.com/downloads/libraries.html .*/binding-(\d_\d_\d).zip \
+  http://www.jgoodies.com/downloads/libraries.html \
+  .*/jgoodies-binding-(\d_\d_\d).zip \
   debian debian/orig-tar.sh
+
+opts=uversionmangle=s/_/./g \
+  http://www.jgoodies.com/downloads/archive.html \
+  .*/jgoodies-binding-(\d_\d_\d).zip \
+  debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list