Author: varun-guest
Date: 2007-10-22 07:16:24 +0000 (Mon, 22 Oct 2007)
New Revision: 4438
Added:
trunk/charva/debian/orig-tar.exclude
trunk/charva/debian/orig-tar.sh
Removed:
trunk/charva/debian/patches/
Modified:
trunk/charva/debian/changelog
trunk/charva/debian/control
trunk/charva/debian/rules
trunk/charva/debian/watch
Log:
* New upstream release
* debian/control:
+ Add myself and Kumar to Uploaders.
+ Switch to java-gcj-compat from kaffe (Closes: #447466)
+ Build-Depend on debhelper 5
+ Add Homepage, Vcs-{SVN, Browser} Headers
* Add debian/orig-tar.sh and debian/orig-tar.exclude to create orig.tar.gz
* Update debian/watch to call debian/orig-tar.sh
* Remove debian/patches/01-build-xml-kaffeh.patch - not required
* debian/rules:
+ Add commons-logging, commons-logging-api and log4j-1.2 to DEB_JARS
+ Use DEB_UPSTREAM_VERSION instead of hard coded VERSION.
+ Set JAVA_HOME to java-gcj
Modified: trunk/charva/debian/changelog
===================================================================
--- trunk/charva/debian/changelog 2007-10-22 06:41:38 UTC (rev 4437)
+++ trunk/charva/debian/changelog 2007-10-22 07:16:24 UTC (rev 4438)
@@ -1,3 +1,21 @@
+charva (1.1.3-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control:
+ + Add myself and Kumar to Uploaders.
+ + Switch to java-gcj-compat from kaffe (Closes: #447466)
+ + Build-Depend on debhelper 5
+ + Add Homepage, Vcs-{SVN, Browser} Headers
+ * Add debian/orig-tar.sh and debian/orig-tar.exclude to create orig.tar.gz
+ * Update debian/watch to call debian/orig-tar.sh
+ * Remove debian/patches/01-build-xml-kaffeh.patch - not required
+ * debian/rules:
+ + Add commons-logging, commons-logging-api and log4j-1.2 to DEB_JARS
+ + Use DEB_UPSTREAM_VERSION instead of hard coded VERSION.
+ + Set JAVA_HOME to java-gcj
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Mon, 22 Oct 2007 12:47:31 +0530
+
charva (1.1.1-4) unstable; urgency=low
* Updated Standards-Version to 3.7.2.
Modified: trunk/charva/debian/control
===================================================================
--- trunk/charva/debian/control 2007-10-22 06:41:38 UTC (rev 4437)
+++ trunk/charva/debian/control 2007-10-22 07:16:24 UTC (rev 4438)
@@ -3,12 +3,15 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), kaffe-dev (>= 2:1.1.6.91-1), cdbs, ant-optional, libncurses5-dev
+Build-Depends: debhelper (>= 5), cdbs, ant-optional, libncurses5-dev, java-gcj-compat-dev
Standards-Version: 3.7.2
+Homepage: http://www.pitman.co.za/projects/charva/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/charva
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/charva
Package: libcharva1-java
Architecture: all
-Depends: kaffe (>= 2:1.1.6.91-1) | java1-runtime | java2-runtime, libcharva1-jni
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libcharva1-jni
Suggests: java-virtual-machine
Description: java windowing toolkit for text terminals
Java framework for presenting a "graphical" user interface, composed of
@@ -18,11 +21,10 @@
and Swing will find programming CHARVA straightforward. User interfaces can
be designed on WYSIWYG IDEs such as Borland JBuilder and then easily
converted to CHARVA merely by changing the "import" statements to import the
- "charva.awt and "charvax.swing" packages instead of the standard "java.awt"
+ "charva.awt" and "charvax.swing" packages instead of the standard "java.awt"
and "javax.swing" packages.
.
- HomePage: <http://www.pitman.co.za/projects/charva/>
- Screenshots: <http://www.pitman.co.za/projects/charva/Screenshots.html>
+ Screenshots: http://www.pitman.co.za/projects/charva/Screenshots.html
Package: libcharva1-jni
Architecture: any
Added: trunk/charva/debian/orig-tar.exclude
===================================================================
--- trunk/charva/debian/orig-tar.exclude (rev 0)
+++ trunk/charva/debian/orig-tar.exclude 2007-10-22 07:16:24 UTC (rev 4438)
@@ -0,0 +1,3 @@
+*.jar
+*.class
+*docs*
Added: trunk/charva/debian/orig-tar.sh
===================================================================
--- trunk/charva/debian/orig-tar.sh (rev 0)
+++ trunk/charva/debian/orig-tar.sh 2007-10-22 07:16:24 UTC (rev 4438)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../charva_$2.orig.tar.gz
+ZIP=../charva-$2.zip
+DIR=charva-$2.orig
+
+# clean up the upstream tarball
+unzip $ZIP
+mv charva $DIR
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR $ZIP $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
Property changes on: trunk/charva/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/charva/debian/rules
===================================================================
--- trunk/charva/debian/rules 2007-10-22 06:41:38 UTC (rev 4437)
+++ trunk/charva/debian/rules 2007-10-22 07:16:24 UTC (rev 4438)
@@ -6,16 +6,14 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-export JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar commons-logging commons-logging-api log4j-1.2
DEB_ANT_BUILD_TARGET := all
-VERSION := 1.1.1
-
install/libcharva1-java::
- install -m 644 java/dist/lib/charva.jar debian/libcharva1-java/usr/share/java/libcharva1-java-$(VERSION).jar
- ln -s libcharva1-java-$(VERSION).jar debian/libcharva1-java/usr/share/java/libcharva1-java.jar
+ install -m 644 java/dist/lib/charva.jar debian/libcharva1-java/usr/share/java/libcharva1-java-$(DEB_UPSTREAM_VERSION).jar
+ ln -s libcharva1-java-$(DEB_UPSTREAM_VERSION).jar debian/libcharva1-java/usr/share/java/libcharva1-java.jar
install/libcharva1-jni::
install -m 644 c/lib/libTerminal.so debian/libcharva1-jni/usr/lib/jni/libTerminal.so.1
Modified: trunk/charva/debian/watch
===================================================================
--- trunk/charva/debian/watch 2007-10-22 06:41:38 UTC (rev 4437)
+++ trunk/charva/debian/watch 2007-10-22 07:16:24 UTC (rev 4438)
@@ -1,2 +1,3 @@
version=3
-http://sf.net/charva/charva-(.+)\.zip
+http://sf.net/charva/charva-(.+)\.zip debian debian/orig-tar.sh
+