[pkg-java] r4446 - in trunk/charva/debian: . patches

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-10-23 13:58:13 +0000 (Tue, 23 Oct 2007)
New Revision: 4446

Added:
   trunk/charva/debian/patches/
   trunk/charva/debian/patches/build.diff
   trunk/charva/debian/patches/series
Modified:
   trunk/charva/debian/changelog
   trunk/charva/debian/control
   trunk/charva/debian/orig-tar.exclude
   trunk/charva/debian/rules
Log:
* Add patches/build.diff to disable entering of os.type manually during build. 
* debian/rules:
  + Pass -Dos.type=$(DEB_BUILD_ARCH_OS) to ant to set os.type
  + implement get.orig.source

Modified: trunk/charva/debian/changelog
===================================================================
--- trunk/charva/debian/changelog	2007-10-23 13:29:45 UTC (rev 4445)
+++ trunk/charva/debian/changelog	2007-10-23 13:58:13 UTC (rev 4446)
@@ -3,6 +3,10 @@
   * New upstream release
   * Current upstream zip archive has no version; So, fix the
     debian/orig-tar.sh file.
+  * Add patches/build.diff to disable entering of os.type manually during build. 
+  * debian/rules:
+    + Pass -Dos.type=$(DEB_BUILD_ARCH_OS) to ant to set os.type
+    + implement get.orig.source
 
  -- Varun Hiremath <varunhiremath at gmail.com>  Tue, 23 Oct 2007 19:02:36 +0530
 

Modified: trunk/charva/debian/control
===================================================================
--- trunk/charva/debian/control	2007-10-23 13:29:45 UTC (rev 4445)
+++ trunk/charva/debian/control	2007-10-23 13:58:13 UTC (rev 4446)
@@ -3,7 +3,7 @@
 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>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
-Build-Depends: debhelper (>= 5), cdbs, ant-optional, libncurses5-dev, libncursesw5-dev, libcommons-logging-java, liblog4j1.2-java, java-gcj-compat-dev
+Build-Depends: debhelper (>= 5), cdbs, ant-optional, libncurses5-dev, libncursesw5-dev, libcommons-logging-java, liblog4j1.2-java, java-gcj-compat-dev, quilt
 Standards-Version: 3.7.2
 Homepage: http://www.pitman.co.za/projects/charva/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/charva

Modified: trunk/charva/debian/orig-tar.exclude
===================================================================
--- trunk/charva/debian/orig-tar.exclude	2007-10-23 13:29:45 UTC (rev 4445)
+++ trunk/charva/debian/orig-tar.exclude	2007-10-23 13:58:13 UTC (rev 4446)
@@ -3,5 +3,5 @@
 *java/classes*
 *test/classes*
 *docs/api*
-*c/lib*
-*c/include*
+*c/lib/*
+*c/include/*

Added: trunk/charva/debian/patches/build.diff
===================================================================
--- trunk/charva/debian/patches/build.diff	                        (rev 0)
+++ trunk/charva/debian/patches/build.diff	2007-10-23 13:58:13 UTC (rev 4446)
@@ -0,0 +1,17 @@
+Index: charva-1.1.4/build.xml
+===================================================================
+--- charva-1.1.4.orig/build.xml	2007-10-23 19:28:14.000000000 +0530
++++ charva-1.1.4/build.xml	2007-10-23 19:28:23.000000000 +0530
+@@ -189,12 +189,6 @@
+             description="Compile the JNI shared library">
+ 
+         <mkdir dir="${c.home}/lib"/>
+-        <input
+-                message="Enter the operating system type: "
+-                validargs="aix,beos,freebsd,gcj,hpux,linux,mac_osx,solaris,win32"
+-                addproperty="os.type"
+-                />
+-
+         <echo>Compiling the shared library using "Makefile.${os.type}.txt"</echo>
+         <exec executable="make"
+               dir="${c.home}/src"

Added: trunk/charva/debian/patches/series
===================================================================
--- trunk/charva/debian/patches/series	                        (rev 0)
+++ trunk/charva/debian/patches/series	2007-10-23 13:58:13 UTC (rev 4446)
@@ -0,0 +1 @@
+build.diff

Modified: trunk/charva/debian/rules
===================================================================
--- trunk/charva/debian/rules	2007-10-23 13:29:45 UTC (rev 4445)
+++ trunk/charva/debian/rules	2007-10-23 13:58:13 UTC (rev 4446)
@@ -4,11 +4,12 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 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 commons-logging commons-logging-api log4j-1.2
-DEB_ANT_BUILD_TARGET   := all
+DEB_ANT_BUILD_TARGET   := all -Dos.type=$(DEB_BUILD_ARCH_OS)
 
 install/libcharva1-java::
 	install -m 644 java/dist/lib/charva.jar debian/libcharva1-java/usr/share/java/libcharva1-java-$(DEB_UPSTREAM_VERSION).jar