[pkg-java] r7838 - in trunk/jalview/debian: . patches

fourmond at alioth.debian.org fourmond at alioth.debian.org
Sat Jan 17 14:46:34 UTC 2009 

Author: fourmond
Date: 2009-01-17 14:46:34 +0000 (Sat, 17 Jan 2009)
New Revision: 7838

Added:
   trunk/jalview/debian/patches/
   trunk/jalview/debian/patches/00list
   trunk/jalview/debian/patches/10-build.dpatch
Modified:
   trunk/jalview/debian/changelog
   trunk/jalview/debian/control
   trunk/jalview/debian/new-upstream
   trunk/jalview/debian/rules
   trunk/jalview/debian/watch
Log:
[jalview] Fix watchfile and makes it build again now that build helper jars have been stripped off

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2009-01-17 13:49:32 UTC (rev 7837)
+++ trunk/jalview/debian/changelog	2009-01-17 14:46:34 UTC (rev 7838)
@@ -4,5 +4,7 @@
   * Initial release (Closes: #507436)
   * Adding a debian/new-upstream script to repackage the original
     tarball, getting rid of the non-free bits.
+  * debian/patches/10-build.dpatch: disable features that depends
+    on things removed from the .dfsg tarball
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 17 Jan 2009 14:18:11 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 17 Jan 2009 15:24:21 +0100

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2009-01-17 13:49:32 UTC (rev 7837)
+++ trunk/jalview/debian/control	2009-01-17 14:46:34 UTC (rev 7838)
@@ -3,10 +3,13 @@
 Priority: optional
 Maintainer: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep,
-	       ant
+	       ant, dpatch, libxerces2-java, libxalan2-java
 Standards-Version: 3.8.0
 Homepage: http://www.jalview.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jalview
 
+
 Package: jalview
 Architecture: any
 Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,

Modified: trunk/jalview/debian/new-upstream
===================================================================
--- trunk/jalview/debian/new-upstream	2009-01-17 13:49:32 UTC (rev 7837)
+++ trunk/jalview/debian/new-upstream	2009-01-17 14:46:34 UTC (rev 7838)
@@ -20,7 +20,7 @@
 dir=`mktemp -d`
 
 # We repackage the upstream source zip file:
-tar cvz -C $dir -f "$filename"
+tar xvz -C $dir -f "$filename"
 origname=jalview_$version.dfsg.orig.tar.gz
 
 # We repackage excluding the lib/ subdir
@@ -29,9 +29,11 @@
 rm -rf jalview*/utils
 # Remove unneeded jar files.
 for jar in xercesImpl.jar ; do
-    rm -f jalview*/lib/$f
+    rm -f jalview*/lib/$jar
 done
 tar cvz -f $origname jalv*
 cd -
+# We remove any file already existing there: it might be a symlink.
+rm -f $orginame 
 mv $dir/$origname ..
-rm -rf $dir
\ No newline at end of file
+# rm -rf $dir
\ No newline at end of file


Property changes on: trunk/jalview/debian/new-upstream
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/jalview/debian/patches/00list
===================================================================
--- trunk/jalview/debian/patches/00list	                        (rev 0)
+++ trunk/jalview/debian/patches/00list	2009-01-17 14:46:34 UTC (rev 7838)
@@ -0,0 +1 @@
+10-build
\ No newline at end of file

Added: trunk/jalview/debian/patches/10-build.dpatch
===================================================================
--- trunk/jalview/debian/patches/10-build.dpatch	                        (rev 0)
+++ trunk/jalview/debian/patches/10-build.dpatch	2009-01-17 14:46:34 UTC (rev 7838)
@@ -0,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-build.dpatch by  <fourmond at debian.org>
+##
+## DP: Mutilate build.xml to disable features that are not necessary
+## DP: for debian package building and that cause FTBS because the
+## DP: files for them are not in the .dfsg tarball.
+
+ at DPATCH@
+diff -urNad jalview-2.4.dfsg~/build.xml jalview-2.4.dfsg/build.xml
+--- jalview-2.4.dfsg~/build.xml	2008-08-27 14:40:34.000000000 +0200
++++ jalview-2.4.dfsg/build.xml	2009-01-17 15:30:47.000000000 +0100
+@@ -1,14 +1,14 @@
+ <?xml version="1.0"?>
+ <project name="jalviewX" default="usage" basedir=".">
+ 	<!-- we use jalopy to format our sources -->
+-	<taskdef name="jalopy"
+-         classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+-		<classpath>
+-			<fileset dir="utils/jalopy/lib">
+-				<include name="*.jar" />
+-			</fileset>
+-		</classpath>
+-	</taskdef>
++<!-- 	<taskdef name="jalopy" -->
++<!--          classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"> -->
++<!-- 		<classpath> -->
++<!-- 			<fileset dir="utils/jalopy/lib"> -->
++<!-- 				<include name="*.jar" /> -->
++<!-- 			</fileset> -->
++<!-- 		</classpath> -->
++<!-- 	</taskdef> -->
+ 
+ 	<target name="help" depends="usage"/>
+ 	<target name="usage">
+@@ -96,10 +96,10 @@
+ 		<property name="wsdl.ClientNS" value="ext.vamsas" />
+ 		<!-- the class path for building the application -->
+ 		<path id="build.classpath">
+-			<fileset dir="utils">
+-				<include name="*.jar"/>
+-				<include name="**/*.jar"/>
+-			</fileset>
++<!-- 			<fileset dir="utils"> -->
++<!-- 				<include name="*.jar"/> -->
++<!-- 				<include name="**/*.jar"/> -->
++<!-- 			</fileset> -->
+ 			<fileset dir="${libDir}">
+ 				<include name="*.jar"/>
+ 				<include name="**/*.jar"/>
+@@ -123,18 +123,15 @@
+ 	</target>
+ 
+ 
+-	<taskdef classpath="utils/roxes-ant-tasks-1.2-2004-01-30.jar" resource="com/roxes/tools/ant/taskdefs.properties"/>
+-	<target name="buildPropertiesFile" depends="init">
+-		<tstamp prefix="build">
+-			<format property="date" pattern="dd MMMM yyyy"/>
+-		</tstamp>
+-		<properties file="${outputDir}/.build_properties">
+-			<header>
+-          ---Jalview Build Details---
+-        </header>
+-			<property name="VERSION" value="${JALVIEW_VERSION}"/>
+-			<property name="BUILD_DATE" value="${build.date}"/>
+-		</properties>
++	<!-- Manual replacement of the property ant task -->
++	<target name="buildPropertiesFile" depends="init, build">
++	  <tstamp prefix="build">
++	    <format property="date" pattern="dd MMMM yyyy"/>
++	  </tstamp>
++	  <propertyfile file="${outputDir}/.build_properties">
++	    <entry key="VERSION" value="${JALVIEW_VERSION}"/>
++	    <entry key="BUILD_DATE" value="${build.date}"/>
++	  </propertyfile>
+ 	</target>
+ 
+ 


Property changes on: trunk/jalview/debian/patches/10-build.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2009-01-17 13:49:32 UTC (rev 7837)
+++ trunk/jalview/debian/rules	2009-01-17 14:46:34 UTC (rev 7838)
@@ -22,6 +22,11 @@
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
 
+DEB_JARS             := $(ANT_HOME)/lib/ant-nodeps.jar xml-api xercesImpl
+
+# Additional arguments for ant, such as properties.
+ANT_ARGS := -DJALVIEW_VERSION=$(VERSION)
+
 # Some comments here:
 # libaxis-java
 #  -> saaj.jar
@@ -36,12 +41,12 @@
 # These are jar provided by the source tarball that should be installed
 # along with the program to make it work.
 #
-# AS LONG AS THIS VARIABLE EXISTS, UPLOAD TO MAIN, AND POSSIBLY TO NON-FREE
+# AS LONG AS THIS VARIABLE EXISTS, UPLOAD TO MAIN, AND POSSIBLY TO NON-FREE,
 # IS IMPOSSIBLE !
 BINARY_JARS = activation.jar axis.jar castor-1.1-cycle-xml.jar \
 	commons-discovery.jar commons-logging.jar jaxrpc.jar \
 	jhall.jar Jmol-11.0.2.jar log4j-1.2.8.jar mail.jar regex.jar \
-	saaj.jar vamsas-client.jar wsdl4j.jar xml-apis.jar
+	saaj.jar vamsas-client.jar wsdl4j.jar
 
 
 print-version:

Modified: trunk/jalview/debian/watch
===================================================================
--- trunk/jalview/debian/watch	2009-01-17 13:49:32 UTC (rev 7837)
+++ trunk/jalview/debian/watch	2009-01-17 14:46:34 UTC (rev 7838)
@@ -7,4 +7,4 @@
 version=3
 
 opts="dversionmangle=s/\.dfsg//,uversionmangle=s/_/./"	\
-http://www.jalview.org/source/source.html jalview_(.*)\.tar\.gz debian/new-upstream
+http://www.jalview.org/source/source.html jalview_(.*)\.tar\.gz debian debian/new-upstream

More information about the pkg-java-commits mailing list