[med-svn] r7765 - in trunk/packages/bio-formats/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 13:43:41 +0000 (Mon, 12 Sep 2011)
New Revision: 7765

Removed:
   trunk/packages/bio-formats/trunk/debian/patches/debian-changes-4.3.1-1
Modified:
   trunk/packages/bio-formats/trunk/debian/patches/series
   trunk/packages/bio-formats/trunk/debian/rules
Log:
redo patch

Deleted: trunk/packages/bio-formats/trunk/debian/patches/debian-changes-4.3.1-1
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/debian-changes-4.3.1-1	2011-09-12 13:41:21 UTC (rev 7764)
+++ trunk/packages/bio-formats/trunk/debian/patches/debian-changes-4.3.1-1	2011-09-12 13:43:41 UTC (rev 7765)
@@ -1,65 +0,0 @@
-Description: Upstream changes introduced in version 4.3.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- bio-formats (4.3.1-1) unstable; urgency=low
- .
-   * Initial Debian Upload (Closes: #??????)
- .
- The person named in the Author field signed this changelog entry.
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- bio-formats-4.3.1.orig/ant/java.xml
-+++ bio-formats-4.3.1/ant/java.xml
-@@ -203,7 +203,7 @@ your FindBugs installation's lib directo
-   <!-- Internal build targets -->
- 
-   <target name="init"
--    depends="init-title, init-timestamp, init-version, init-manifest-cp"/>
-+    depends="init-title, init-timestamp, init-version"/>
- 
-   <target name="init-manifest-cp">
-     <!-- construct manifest classpath -->
---- bio-formats-4.3.1.orig/ant/common.xml
-+++ bio-formats-4.3.1/ant/common.xml
-@@ -33,7 +33,8 @@ Type "ant -p" for a list of targets.
-   <target name="init-version">
-     <!-- check for Git versioning information -->
-     <property name="git.path" value="${root.dir}/.git"/>
--    <available file="${git.path}" property="git.present"/>
-+    <!--available file="${git.path}" property="git.present"/-->
-+<!--
-     <if>
-       <isset property="git.present"/>
-       <then>
-@@ -41,7 +42,7 @@ Type "ant -p" for a list of targets.
-           failifexecutionfails="false">
-           <arg value="show"/>
-           <arg value="-s"/>
--          <arg value="--abbrev-commit"/>
-+          <arg value="-abbrev-commit"/>
-           <arg value="HEAD"/>
-         </exec>
-         <propertyregex property="vcs.revision" input="${git.info}"
-@@ -50,6 +51,7 @@ Type "ant -p" for a list of targets.
-           input="${git.info}" regexp="Date: +([^\n]*)" select="\1"/>
-       </then>
-     </if>
-+-->
- 
-     <!-- set release version from repository URL -->
-     <property name="release.version" value="4.3.1"/>

Modified: trunk/packages/bio-formats/trunk/debian/patches/series
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/series	2011-09-12 13:41:21 UTC (rev 7764)
+++ trunk/packages/bio-formats/trunk/debian/patches/series	2011-09-12 13:43:41 UTC (rev 7765)
@@ -1,2 +1,2 @@
 remove_git.patch
-debian-changes-4.3.1-1
+hack_regex.patch

Modified: trunk/packages/bio-formats/trunk/debian/rules
===================================================================
--- trunk/packages/bio-formats/trunk/debian/rules	2011-09-12 13:41:21 UTC (rev 7764)
+++ trunk/packages/bio-formats/trunk/debian/rules	2011-09-12 13:43:41 UTC (rev 7765)
@@ -14,6 +14,7 @@
 	dh $@ --with javahelper
 
 override_dh_auto_build:
+	mkdir jar
 	ant $(ANT_OPTS) -f build.xml
 
 get-orig-source: