r1848 - in trunk/charva/debian: . patches

Wolfgang Bär wbaer-guest at costa.debian.org
Wed Feb 1 20:24:37 UTC 2006


Author: wbaer-guest
Date: 2006-02-01 20:24:36 +0000 (Wed, 01 Feb 2006)
New Revision: 1848

Added:
   trunk/charva/debian/ant.properties
   trunk/charva/debian/patches/01-build-xml-kaffeh.patch
Removed:
   trunk/charva/debian/charva-dev.dirs
   trunk/charva/debian/charva-dev.files
   trunk/charva/debian/patches/00list
   trunk/charva/debian/patches/01_JFileChooser_getWidth_fix.dpatch
   trunk/charva/debian/patches/02_javadoc_makefile_fix.dpatch
   trunk/charva/debian/patches/03_do_not_build_swing.dpatch
Modified:
   trunk/charva/debian/README.Debian
   trunk/charva/debian/changelog
   trunk/charva/debian/control
   trunk/charva/debian/copyright
   trunk/charva/debian/libcharva1-java.docs
   trunk/charva/debian/libcharva1-java.examples
   trunk/charva/debian/libcharva1-java.files
   trunk/charva/debian/libcharva1-java.install
   trunk/charva/debian/libcharva1-java.links
   trunk/charva/debian/libcharva1-jni.install
   trunk/charva/debian/rules
Log:
Update to new upstream

Modified: trunk/charva/debian/README.Debian
===================================================================
--- trunk/charva/debian/README.Debian	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/README.Debian	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,15 +1,11 @@
 charva for Debian
 -----------------
 
-I'd like to build charva with kaffe or another free jdk to put charva in
-main.
-
 To run an application that uses charva, you'll need to add
-/usr/share/java/charva.jar in the classpath AND at least for j2se1.3
-from Blackdown on my powerpc, you'll have to pass the java.library.path
-property like this:
+/usr/share/java/charva.jar in the classpath  AND you'll have to pass the
+java.library.path property like this:
 
 $ java -classpath some_classpath:/usr/share/java/charva.jar\
    -Djava.library.path=/usr/lib/jni your.package.and.your.Class
 
- -- Arnaud Vandyck <avdyk at debian.org>, Thu Nov 13 00:42:59 2003
+ -- Arnaud Vandyck <avdyk at debian.org>, Tue Jan 17 17:25:50 2006

Added: trunk/charva/debian/ant.properties
===================================================================
--- trunk/charva/debian/ant.properties	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/ant.properties	2006-02-01 20:24:36 UTC (rev 1848)
@@ -0,0 +1 @@
+OS_NAME linux

Modified: trunk/charva/debian/changelog
===================================================================
--- trunk/charva/debian/changelog	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/changelog	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,3 +1,33 @@
+charva (1.1.1-2) unstable; urgency=low
+
+  * Added missing build-dep on ant, ant-optional and libncurses5-dev
+    and exported JAVA_HOME in debian/rules so gcc finds jni.h
+  * Now builds also in autobuilder and jni library will be available
+    and installable on other architecture (closes: #286968)
+  * Fixed dependency on kaffe (added epoch)
+  * Fixed FSF address in copyright
+  * Removed duplicated suggests libcharva1-java in libcharva1-jni
+  * Removed useless charva-dev files in debian directory
+  * Added ${shlibs:Depends} to depends for jni library
+  * Cleaned debian/rules file
+  * Added myself to uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 31 Jan 2006 11:49:38 +0100
+
+charva (1.1.1-1) unstable; urgency=low
+
+  * New upstream release (closes: #290018, #254176)
+  * Move to main! Charva is now build with kaffe
+  * Removed dpatch, charva now uses cdbs (and simplepatchsys)
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Tue, 17 Jan 2006 17:24:49 +0100
+
+charva (1.0.1-3) unstable; urgency=low
+
+  * Removed Build-Depends (closes: #229174).
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Wed, 28 Jan 2004 00:00:07 +0100
+
 charva (1.0.1-2) unstable; urgency=low
 
   * Added the correct dependencies (dpatch, but also, gcc and j2sdk!)

Deleted: trunk/charva/debian/charva-dev.dirs
===================================================================
--- trunk/charva/debian/charva-dev.dirs	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/charva-dev.dirs	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1 +0,0 @@
-usr/include

Deleted: trunk/charva/debian/charva-dev.files
===================================================================
--- trunk/charva/debian/charva-dev.files	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/charva-dev.files	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1 +0,0 @@
-c/src/charva_awt_Toolkit.h

Modified: trunk/charva/debian/control
===================================================================
--- trunk/charva/debian/control	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/control	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,34 +1,31 @@
 Source: charva
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 1.11), j2sdk1.3 | j2sdk1.4
-Build-Depends: gcc
-Standards-Version: 3.6.0
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends: debhelper (>= 4.2.30), kaffe-dev (>= 2:1.1.6.91-1), cdbs, ant, ant-optional, libncurses5-dev
+Standards-Version: 3.6.2
 
 Package: libcharva1-java
 Architecture: all
-Depends: j2re1.3 | j2re1.4 | java1-runtime | java2-runtime, libcharva1-jni
+Depends: kaffe (>= 2:1.1.6.91-1) | 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 elements such as  windows, dialogs, menus, textfields and buttons,
- on a traditional character-cell ASCII  terminal. It has an API  based
- on that of "Swing"  (a.k.a. the  Java Foundation Classes).  Programmers
- familiar with AWT  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" and
- "javax.swing" packages.
+ Java framework for presenting a "graphical" user interface, composed of 
+ elements such as windows, dialogs, menus, textfields and buttons, on a 
+ traditional character-cell ASCII  terminal. It has an API  based on that of
+ "Swing" (a.k.a. the Java Foundation Classes). Programmers familiar with AWT
+ 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" 
+ and "javax.swing" packages.
  .
  HomePage: <http://www.pitman.co.za/projects/charva/>
  Screenshots: <http://www.pitman.co.za/projects/charva/Screenshots.html>
 
 Package: libcharva1-jni
-Suggests: libcharva1-java
 Architecture: any
-Depends: libcharva1-java
-Description: java windowing toolkit for text terminals
- Native library for the charva text terminal toolkit.
+Depends: ${shlibs:Depends}
+Description: java windowing toolkit for text terminals - jni library
+ Native jni library for the charva text terminal toolkit.

Modified: trunk/charva/debian/copyright
===================================================================
--- trunk/charva/debian/copyright	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/copyright	2006-02-01 20:24:36 UTC (rev 1848)
@@ -10,8 +10,9 @@
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc., 
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

Modified: trunk/charva/debian/libcharva1-java.docs
===================================================================
--- trunk/charva/debian/libcharva1-java.docs	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/libcharva1-java.docs	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1 +1,2 @@
-README
+README.txt
+docs/*

Modified: trunk/charva/debian/libcharva1-java.examples
===================================================================
--- trunk/charva/debian/libcharva1-java.examples	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/libcharva1-java.examples	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,4 +1 @@
-java/src/example/*
-java/src/tcharva.sh
-java/src/tswing.sh
-java/src/tutorial
+test/src/example/*

Modified: trunk/charva/debian/libcharva1-java.files
===================================================================
--- trunk/charva/debian/libcharva1-java.files	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/libcharva1-java.files	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1 +1 @@
-java/lib/charva-1.0.1.jar
+java/dist/lib/charva1.jar

Modified: trunk/charva/debian/libcharva1-java.install
===================================================================
--- trunk/charva/debian/libcharva1-java.install	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/libcharva1-java.install	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1 +1 @@
-java/lib/charva-1.0.1.jar usr/share/java
+java/dist/lib/charva1.jar usr/share/java

Modified: trunk/charva/debian/libcharva1-java.links
===================================================================
--- trunk/charva/debian/libcharva1-java.links	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/libcharva1-java.links	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1 +1 @@
-usr/share/java/charva-1.0.1.jar usr/share/java/charva.jar
+usr/share/java/charva1-1.1.1.jar usr/share/java/charva1.jar

Modified: trunk/charva/debian/libcharva1-jni.install
===================================================================
--- trunk/charva/debian/libcharva1-jni.install	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/libcharva1-jni.install	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1 +1 @@
-c/src/libTerminal.so.1 usr/lib/jni
+c/lib/libTerminal.so.1 usr/lib/jni

Deleted: trunk/charva/debian/patches/00list
===================================================================
--- trunk/charva/debian/patches/00list	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/patches/00list	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,3 +0,0 @@
-01_JFileChooser_getWidth_fix
-02_javadoc_makefile_fix
-#03_do_not_build_swing

Added: trunk/charva/debian/patches/01-build-xml-kaffeh.patch
===================================================================
--- trunk/charva/debian/patches/01-build-xml-kaffeh.patch	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/patches/01-build-xml-kaffeh.patch	2006-02-01 20:24:36 UTC (rev 1848)
@@ -0,0 +1,10 @@
+--- build.xml	2005-12-17 10:35:52.000000000 +0000
++++ build.xml.new	2006-01-17 13:47:49.000000000 +0000
+@@ -191,6 +191,7 @@
+         <mkdir dir="${c.home}/include"/>
+         <javah destdir="${c.home}/include"
+             class="charva.awt.Toolkit"
++            implementation="kaffeh"
+             classpath="${build.home}"/>
+ 
+     </target>

Deleted: trunk/charva/debian/patches/01_JFileChooser_getWidth_fix.dpatch
===================================================================
--- trunk/charva/debian/patches/01_JFileChooser_getWidth_fix.dpatch	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/patches/01_JFileChooser_getWidth_fix.dpatch	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 01_JFileChooser_getWidth_fix.dpatch by Arnaud Vandyck <avdyk at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/arnaud/debian/itp/charva/charva-1.0.1/java/src/charvax/swing/JFileChooser.java charva-1.0.1/java/src/charvax/swing/JFileChooser.java
---- /home/arnaud/debian/itp/charva/charva-1.0.1/java/src/charvax/swing/JFileChooser.java	2003-07-24 07:47:37.000000000 +0200
-+++ charva-1.0.1/java/src/charvax/swing/JFileChooser.java	2003-11-12 22:55:17.000000000 +0100
-@@ -417,7 +417,7 @@
- 
- 	    pack();
- 	    Insets insets = getInsets();
--	    _dirList.setColumns(getWidth() - insets.left - insets.right - 2);
-+	    _dirList.setColumns(this.getWidth() - insets.left - insets.right - 2);
- 
- 	    addKeyListener(this);
- 	    addFileChooserListener(this);

Deleted: trunk/charva/debian/patches/02_javadoc_makefile_fix.dpatch
===================================================================
--- trunk/charva/debian/patches/02_javadoc_makefile_fix.dpatch	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/patches/02_javadoc_makefile_fix.dpatch	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 02_javadoc_makefile_fix.dpatch by Arnaud Vandyck <avdyk at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/arnaud/debian/itp/charva/charva-1.0.1/java/src/Makefile charva-1.0.1/java/src/Makefile
---- /home/arnaud/debian/itp/charva/charva-1.0.1/java/src/Makefile	2003-06-02 14:43:58.000000000 +0200
-+++ charva-1.0.1/java/src/Makefile	2003-11-12 23:08:06.000000000 +0100
-@@ -22,7 +22,7 @@
- 
- docs :
- 	rm -rf ../doc/*
--	${JAVA_HOME}/bin/javadoc -breakiterator -overview overview.html \
-+	${JAVA_HOME}/bin/javadoc -overview overview.html \
- 	-doctitle "CHARVA API Specification" \
- 	-windowtitle "charva API Documentation" \
- -d ../doc \

Deleted: trunk/charva/debian/patches/03_do_not_build_swing.dpatch
===================================================================
--- trunk/charva/debian/patches/03_do_not_build_swing.dpatch	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/patches/03_do_not_build_swing.dpatch	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,75 +0,0 @@
-#!/bin/sh -e
-## 03_do_not_build_swing.dpatch by Arnaud Vandyck <avdyk at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/arnaud/debian/avdyk/charva/charva-1.0.1/java/src/Makefile charva-1.0.1/java/src/Makefile
---- /home/arnaud/debian/avdyk/charva/charva-1.0.1/java/src/Makefile	2004-01-24 15:13:02.552469400 +0100
-+++ charva-1.0.1/java/src/Makefile	2004-01-24 15:20:36.579446808 +0100
-@@ -8,11 +8,13 @@
- charva/awt/*.java \
- charva/awt/event/*.java \
- charva/awt/util/*.java \
--charvax/swing/*.java \
--charvax/swing/table/*.java \
--charvax/swing/text/*.java \
--charvax/swing/tree/*.java \
--charvax/swing/border/*.java
-+
-+#charvax/swing/*.java \
-+#charvax/swing/table/*.java \
-+#charvax/swing/text/*.java \
-+#charvax/swing/tree/*.java \
-+#charvax/swing/border/*.java
-+
- 	cd ../classes; ${JAVA_HOME}/bin/jar cf ../lib/charva.jar charva charvax
- 	rm -rf ../classes/charva*
- 
-@@ -29,13 +31,14 @@
- charva.awt \
- charva.awt.event \
- charva.awt.util \
--charvax.swing \
--charvax.swing.table \
--charvax.swing.border \
--charvax.swing.event \
--charvax.swing.text \
--charvax.swing.tree \
--charvax.swing.filechooser
-+
-+#charvax.swing \
-+#charvax.swing.table \
-+#charvax.swing.border \
-+#charvax.swing.event \
-+#charvax.swing.text \
-+#charvax.swing.tree \
-+#charvax.swing.filechooser
- 
- # Use this target after compiling the Toolkit class, to generate the
- # C header file for the Java Native Interface library.
-@@ -56,4 +59,4 @@
- 
- # Clean out the compiled classes.
- clean :
--	rm -rf ../classes/charva ../classes/charvax ../classes/tutorial
-+	-rm -rf ../classes/charva ../classes/charvax ../classes/tutorial

Modified: trunk/charva/debian/rules
===================================================================
--- trunk/charva/debian/rules	2006-02-01 20:06:31 UTC (rev 1847)
+++ trunk/charva/debian/rules	2006-02-01 20:24:36 UTC (rev 1848)
@@ -1,128 +1,26 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2006 Arnaud Vandyck <avdyk at debian.org>
+
 #
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
+# Based on the cdbs example file from Stefan Gybas
+#
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+export JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar
+DEB_ANT_BUILD_TARGET   := all
+LIBRARY_PACKAGE := charva1
+#ANT_ARGS := -verbose
 
-ARCH=linux
-JAVA_DIR=java/src
-C_DIR=c/src
-#export JAVA_HOME=/usr/lib/kaffe
-export JAVA_HOME=/usr/lib/j2se/1.3
-LIBRARY=charva
-SONAME=1
-VERSION=1.0.1
+API_VERSION     := 1.1.1
 
-include /usr/share/dpatch/dpatch.make
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp: patch
-	dh_testdir
-
-	-mkdir java/doc
-	touch configure-stamp
-
-build: build-indep build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp 
-
-	(cd ${C_DIR} ; $(MAKE) -f Makefile.${ARCH})
-	touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp 
-
-	(cd ${JAVA_DIR}; $(MAKE) all javah charvatut)
-	#charvatut javatut docs
-	touch build-indep-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-
-	-(cd java/src ; $(MAKE) clean)
-	-rm -fr java/classes/tutorial java/doc
-	-rm java/lib/charva.jar java/lib/${LIBRARY}-${VERSION}.jar
-	-rm c/src/charva_awt_Toolkit.h c/src/libTerminal.so c/src/libTerminal.so.${SONAME}
-
-	dh_clean 
-
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i 
-	dh_installdirs -i
-
-	mv java/lib/${LIBRARY}.jar java/lib/${LIBRARY}-${VERSION}.jar
-	echo "java/lib/${LIBRARY}-${VERSION}.jar usr/share/java" > debian/lib${LIBRARY}${SONAME}-java.install
-	echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/lib${LIBRARY}${SONAME}-java.links
-
-	#INSTALLDOC#
-
-	dh_install -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s 
-	dh_installdirs -s
-
-	mv c/src/libTerminal.so c/src/libTerminal.so.${SONAME}
-	echo "c/src/libTerminal.so.${SONAME} usr/lib/jni" > debian/lib${LIBRARY}${SONAME}-jni.install
-	echo "usr/lib/jni/libTerminal.so.${SONAME} usr/lib/jni/libTerminal.so" > debian/lib${LIBRARY}${SONAME}-jni.links
-
-	dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_installdebconf	
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+install/lib$(LIBRARY_PACKAGE)-java::
+	cp java/dist/lib/charva.jar java/dist/lib/$(LIBRARY_PACKAGE).jar
+	cp c/lib/libTerminal.so c/lib/libTerminal.so.1
+	install -m 644 java/dist/lib/$(LIBRARY_PACKAGE).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
+	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE).jar




More information about the pkg-java-commits mailing list