r1897 - trunk/charva/debian

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-02-09 22:16:26 +0000 (Thu, 09 Feb 2006)
New Revision: 1897

Removed:
   trunk/charva/debian/libcharva1-java.install
   trunk/charva/debian/libcharva1-java.links
   trunk/charva/debian/libcharva1-jni.install
   trunk/charva/debian/libcharva1-jni.links
Modified:
   trunk/charva/debian/changelog
   trunk/charva/debian/rules
Log:
charva (1.1.1-3) unstable; urgency=low

  * Fix binary only build by dividing install/links targets correctly
  * Move install and links targets into debian/rules


Modified: trunk/charva/debian/changelog
===================================================================
--- trunk/charva/debian/changelog	2006-02-09 22:11:11 UTC (rev 1896)
+++ trunk/charva/debian/changelog	2006-02-09 22:16:26 UTC (rev 1897)
@@ -1,3 +1,10 @@
+charva (1.1.1-3) unstable; urgency=low
+
+  * Fix binary only build by dividing install/links targets correctly
+  * Move install and links targets into debian/rules
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu,  2 Feb 2006 10:51:58 +0100
+
 charva (1.1.1-2) unstable; urgency=low
 
   * Added missing build-dep on ant, ant-optional and libncurses5-dev

Deleted: trunk/charva/debian/libcharva1-java.install
===================================================================
--- trunk/charva/debian/libcharva1-java.install	2006-02-09 22:11:11 UTC (rev 1896)
+++ trunk/charva/debian/libcharva1-java.install	2006-02-09 22:16:26 UTC (rev 1897)
@@ -1 +0,0 @@
-java/dist/lib/charva1.jar usr/share/java

Deleted: trunk/charva/debian/libcharva1-java.links
===================================================================
--- trunk/charva/debian/libcharva1-java.links	2006-02-09 22:11:11 UTC (rev 1896)
+++ trunk/charva/debian/libcharva1-java.links	2006-02-09 22:16:26 UTC (rev 1897)
@@ -1 +0,0 @@
-usr/share/java/charva1-1.1.1.jar usr/share/java/charva1.jar

Deleted: trunk/charva/debian/libcharva1-jni.install
===================================================================
--- trunk/charva/debian/libcharva1-jni.install	2006-02-09 22:11:11 UTC (rev 1896)
+++ trunk/charva/debian/libcharva1-jni.install	2006-02-09 22:16:26 UTC (rev 1897)
@@ -1 +0,0 @@
-c/lib/libTerminal.so.1 usr/lib/jni

Deleted: trunk/charva/debian/libcharva1-jni.links
===================================================================
--- trunk/charva/debian/libcharva1-jni.links	2006-02-09 22:11:11 UTC (rev 1896)
+++ trunk/charva/debian/libcharva1-jni.links	2006-02-09 22:16:26 UTC (rev 1897)
@@ -1 +0,0 @@
-usr/lib/jni/libTerminal.so.1 usr/lib/jni/libTerminal.so

Modified: trunk/charva/debian/rules
===================================================================
--- trunk/charva/debian/rules	2006-02-09 22:11:11 UTC (rev 1896)
+++ trunk/charva/debian/rules	2006-02-09 22:16:26 UTC (rev 1897)
@@ -2,10 +2,6 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2006 Arnaud Vandyck <avdyk at debian.org>
 
-#
-# Based on the cdbs example file from Stefan Gybas
-#
-
 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
@@ -14,13 +10,13 @@
 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
 
-API_VERSION     := 1.1.1
+VERSION     := 1.1.1
 
-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
+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/libcharva1-jni::
+	install -m 644 c/lib/libTerminal.so debian/libcharva1-jni/usr/lib/jni/libTerminal.so.1
+	ln -s libTerminal.so.1 debian/libcharva1-jni/usr/lib/jni/libTerminal.so