[SCM] client, protocol, and server for running Java programs from CLI branch, master, updated. debian/0.9.0+trunk95-3-18-gbcb445c

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 4a6e76640a555accf4c6136e7e8de44134efc1a0
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Jun 11 17:42:11 2013 +0900

    drop unnecessary debian patches

diff --git a/debian/changelog b/debian/changelog
index 5257282..f694b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nailgun (0.9.1) UNRELEASED; urgency=low
+
+  * New upstream release 
+  * debian/patches
+    - drop 0001-update-build.xml-for-cobertura.patch and
+      0002-update-build.xml-disable-junitreport.patch.
+      Since upstream dropped build.xml
+
+ -- Hideki Yamane <henrich at debian.org>  Tue, 11 Jun 2013 17:38:42 +0900
+
 nailgun (0.9.0+trunk95-3) unstable; urgency=low
 
   * Upload to unstable. 
diff --git a/debian/patches/0001-update-build.xml-for-cobertura.patch b/debian/patches/0001-update-build.xml-for-cobertura.patch
deleted file mode 100644
index 10dfb38..0000000
--- a/debian/patches/0001-update-build.xml-for-cobertura.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sat, 31 Jul 2010 20:15:06 +0200
-Subject: [PATCH] update build.xml for cobertura
-
-... and fix tools.classpath
----
- build.xml |   17 +++++++++++------
- 1 files changed, 11 insertions(+), 6 deletions(-)
-
-Index: nailgun-0.7.1+trunk95/build.xml
-===================================================================
---- nailgun-0.7.1+trunk95.orig/build.xml	2009-05-22 19:34:14.000000000 -0600
-+++ nailgun-0.7.1+trunk95/build.xml	2012-07-09 09:40:27.173082955 -0600
-@@ -45,8 +45,13 @@
- 	
- 	<!-- declare the jcoverage tasks -->
- 	<path id="tools.classpath">
--		<fileset dir="tools/lib">
--        	<include name="**/*.jar"/>
-+		<fileset dir="/usr/share/java">
-+        	<include name="bcel.jar"/>
-+        	<include name="oro.jar"/>
-+        	<include name="gnu-getopt.jar"/>
-+        	<include name="junit.jar"/>
-+        	<include name="log4j-1.2.jar"/>
-+        	<include name="cobertura.jar"/>
-       	</fileset>
- 	</path>
- 	<taskdef resource="tasks.properties">
-@@ -134,13 +139,13 @@
- 		
- 	<target name="instrument" depends="compile-server">
- 		<mkdir dir="${build.instrumented}"/>
--	    <instrument todir="${build.instrumented}">
-+	    <cobertura-instrument todir="${build.instrumented}">
- 	      <fileset dir="${build.debug}">
- 	        <include name="**/*.class"/>
- 	      	<exclude name="com/martiansoftware/nailgun/examples/**"/>
- 	      	<exclude name="com/martiansoftware/nailgun/builtins/**"/>
- 	      </fileset>
--	    </instrument>
-+	    </cobertura-instrument>
- 		<copy todir="${build.instrumented}">
- 		    <fileset dir="${src.java.prod}" excludes="**/*.class"/>
- 		</copy>
-@@ -181,7 +186,7 @@
- 	      <report format="frames" todir="${docs.junit}"/>
- 	    </junitreport>
- 
--		<report srcdir="${src.java.prod}" destdir="${docs.jcoverage}"/>
-+		<cobertura-report srcdir="${src.java.prod}" destdir="${docs.jcoverage}"/>
- 	</target>
- 	
- 	<target name="jar" depends="test">
diff --git a/debian/patches/0002-update-build.xml-disable-junitreport.patch b/debian/patches/0002-update-build.xml-disable-junitreport.patch
deleted file mode 100644
index d6a446f..0000000
--- a/debian/patches/0002-update-build.xml-disable-junitreport.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: nailgun-0.7.1+trunk95/build.xml
-===================================================================
---- nailgun-0.7.1+trunk95.orig/build.xml	2012-07-09 09:40:27.173082955 -0600
-+++ nailgun-0.7.1+trunk95/build.xml	2012-07-09 09:41:04.181082177 -0600
-@@ -64,6 +64,7 @@
- 		<delete dir="dist"/>
- 		<delete file="ng"/>
- 		<delete file="jcoverage.ser"/>
-+		<delete file="cobertura.ser"/>
- 	</target>
- 		
- 	<!-- updates version numbers in client and server code
-@@ -178,13 +179,15 @@
- 				</fileset>
- 			</batchtest>
- 		</junit>		
--		
-+
-+    <!-- Debian #592823: disable junitreport target due to build failure on HPPA
- 	    <junitreport todir="${docs.junit}">
- 	      <fileset dir="${docs.junit}">
- 	        <include name="TEST-*.xml"/>
- 	      </fileset>
- 	      <report format="frames" todir="${docs.junit}"/>
- 	    </junitreport>
-+     -->
- 
- 		<cobertura-report srcdir="${src.java.prod}" destdir="${docs.jcoverage}"/>
- 	</target>
diff --git a/debian/patches/series b/debian/patches/series
index 74fd773..d8ae9dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001-update-build.xml-for-cobertura.patch
-0002-update-build.xml-disable-junitreport.patch
 name_define_as_ng-nailgun_ng.c.patch
 Makefile_enable_hardening.patch

-- 
client, protocol, and server for running Java programs from CLI