[pkg-java] r4259 - trunk/buoy/debian

Tue Sep 25 07:22:48 UTC 2007

Author: varun-guest
Date: 2007-09-25 07:22:48 +0000 (Tue, 25 Sep 2007)
New Revision: 4259

Removed:
   trunk/buoy/debian/libbuoy-java.dirs
Modified:
   trunk/buoy/debian/changelog
   trunk/buoy/debian/compat
   trunk/buoy/debian/control
   trunk/buoy/debian/orig-tar.sh
   trunk/buoy/debian/rules
   trunk/buoy/debian/watch
Log:
* Fix debian/watch and debian/orig-tar.sh
* debian/control:
  + Depend and Build-Depend on java-gcj-compat(-dev) instead of kaffe.
  + Add XS-Vcs-{Svn, Browser} headers.
* debian/compat: switch to 5
* Remove debian/libbuoy-java.dirs - not required.
* debian/rules:
  + set JAVA_HOME to java-gcj
  + use DEB_DESTDIR instead of DESTDIR

Modified: trunk/buoy/debian/changelog
===================================================================

--- trunk/buoy/debian/changelog	2007-09-24 20:35:25 UTC (rev 4258)
+++ trunk/buoy/debian/changelog	2007-09-25 07:22:48 UTC (rev 4259)
@@ -1,5 +1,6 @@
 buoy (1.8-1) unstable; urgency=low
 
+  [ Kumar Appaiah ]
   * New upstream release (Closes: #426729)
   * Bump Standards Version to 3.7.2.
   * Move cdbs and debhelper from Build-Depends-Indep to Build-Depends.
@@ -9,8 +10,19 @@
   * Create a buoy-<version>.jar and symlink it to buoy.jar.
   * Add Homepage field to debian/control.
 
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Sun, 23 Sep 2007 15:10:05 +0530
+  [ Varun Hiremath ]
+  * Fix debian/watch and debian/orig-tar.sh
+  * debian/control:
+    + Depend and Build-Depend on java-gcj-compat(-dev) instead of kaffe.
+    + Add XS-Vcs-{Svn, Browser} headers.
+  * debian/compat: switch to 5
+  * Remove debian/libbuoy-java.dirs - not required.
+  * debian/rules:
+    + set JAVA_HOME to java-gcj
+    + use DEB_DESTDIR instead of DESTDIR
 
+ -- Varun Hiremath <varunhiremath at gmail.com>  Tue, 25 Sep 2007 13:00:35 +0530
+
 buoy (1.6-2) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: trunk/buoy/debian/compat
===================================================================
--- trunk/buoy/debian/compat	2007-09-24 20:35:25 UTC (rev 4258)
+++ trunk/buoy/debian/compat	2007-09-25 07:22:48 UTC (rev 4259)
@@ -1 +1 @@
-4
+5

Modified: trunk/buoy/debian/control
===================================================================
--- trunk/buoy/debian/control	2007-09-24 20:35:25 UTC (rev 4258)
+++ trunk/buoy/debian/control	2007-09-25 07:22:48 UTC (rev 4259)
@@ -3,14 +3,16 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
-Build-Depends-Indep: kaffe, ant
-Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: ant, java-gcj-compat-dev
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/buoy
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/buoy
 Homepage: http://buoy.sourceforge.net/
 
 Package: libbuoy-java
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Description: Java User Interface Toolkit
  Buoy is a Java framework for creating user interfaces.
  . 

Deleted: trunk/buoy/debian/libbuoy-java.dirs
===================================================================
--- trunk/buoy/debian/libbuoy-java.dirs	2007-09-24 20:35:25 UTC (rev 4258)
+++ trunk/buoy/debian/libbuoy-java.dirs	2007-09-25 07:22:48 UTC (rev 4259)
@@ -1 +0,0 @@
-usr/share/java

Modified: trunk/buoy/debian/orig-tar.sh
===================================================================
--- trunk/buoy/debian/orig-tar.sh	2007-09-24 20:35:25 UTC (rev 4258)
+++ trunk/buoy/debian/orig-tar.sh	2007-09-25 07:22:48 UTC (rev 4259)
@@ -3,18 +3,19 @@
 # called by uscan with '--upstream-version' <version> <file>
 ZIP=../Buoy$2.zip
 DIR=buoy-$2.orig
+TAR=../buoy_$2.orig.tar.gz
 
 # clean up the upstream tarball
 unzip $ZIP
 mv "Buoy Folder" $DIR
-GZIP=--best tar czf $3 --exclude '*.jar' --exclude 'docs' --exclude '.svn' $DIR
-rm -rf $ZIP $DIR
+GZIP=--best tar czf $TAR --exclude '*.jar' --exclude 'docs' --exclude '.svn' $DIR
+rm -rf $ZIP $DIR $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
     . .svn/deb-layout
-    mv $3 $origDir
-    echo "moved $3 to $origDir"
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
 fi
 
 exit 0

Modified: trunk/buoy/debian/rules
===================================================================
--- trunk/buoy/debian/rules	2007-09-24 20:35:25 UTC (rev 4258)
+++ trunk/buoy/debian/rules	2007-09-25 07:22:48 UTC (rev 4259)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
 DEB_ANT_BUILDFILE    := buoy.xml
@@ -15,9 +15,8 @@
 clean::
 	rm -f buoy.jar
 
-DESTDIR=debian/libbuoy-java
 install/libbuoy-java:: buoy.jar
-	install -m644 buoy.jar $(DESTDIR)/usr/share/java/buoy-$(DEB_UPSTREAM_VERSION).jar
+	install -D -m644 buoy.jar $(DEB_DESTDIR)/usr/share/java/buoy-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/buoy-$(DEB_UPSTREAM_VERSION).jar \
 	  /usr/share/java/buoy.jar
 

Modified: trunk/buoy/debian/watch
===================================================================
--- trunk/buoy/debian/watch	2007-09-24 20:35:25 UTC (rev 4258)
+++ trunk/buoy/debian/watch	2007-09-25 07:22:48 UTC (rev 4259)
@@ -1,3 +1,3 @@
 version=3
 http://heanet.dl.sourceforge.net/sourceforge/buoy/ \
-	Buoy(.*)\.zip debian debian/orig-tar.sh
+	Buoy(\d.*)\.zip debian debian/orig-tar.sh


