[med-svn] [htsjdk] 02/04: Add a comment about the Debian specific revision

Vincent Danjean vdanjean at debian.org
Mon Mar 14 21:16:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

vdanjean pushed a commit to branch master
in repository htsjdk.

commit 3237f28cd981c06bee27d26ccd1029e19cb91350
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Mon Mar 14 21:39:17 2016 +0100

    Add a comment about the Debian specific revision
---
 debian/patches/10-build.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/patches/10-build.xml b/debian/patches/10-build.xml
index d5e6622..f9e8f35 100644
--- a/debian/patches/10-build.xml
+++ b/debian/patches/10-build.xml
@@ -7,16 +7,20 @@ Origin: vendor
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -40,7 +40,7 @@
+@@ -39,8 +39,10 @@
+     <property name="javac.debug" value="true"/>
  
      <!-- Get GIT hash, if available, otherwise leave it blank.  -->
- 
+-
 -    <property name="repository.revision" value=""/>
++    <!-- For Debian, do not use GIT hash (it would be the one from the
++         packaging repo), but use the "dfsg" string as sources are
++         repacked -->
 +    <property name="repository.revision" value="dfsg"/>
      <property name="htsjdk-version" value="2.1.1"/>
      <property name="htsjdk-version-file" value="htsjdk.version.properties"/>
      <property name="testng.verbosity" value="2"/>
-@@ -72,6 +72,12 @@
+@@ -72,6 +74,12 @@
              <fileset dir="${lib}">
                  <include name="**/*.jar"/>
              </fileset>
@@ -29,7 +33,7 @@ Forwarded: no
          </path>
      </target>
  
-@@ -132,6 +138,7 @@
+@@ -132,6 +140,7 @@
                          <pathelement path="${classes}"/>
                          <pathelement path="${classes.test}"/>
                          <pathelement path="${scripts}"/>
@@ -37,7 +41,7 @@ Forwarded: no
                      </classpath>
                      <classfileset dir="${classes.test}">
                          <include name="**/Test*.class"/>
-@@ -176,6 +183,7 @@
+@@ -176,6 +185,7 @@
                  <pathelement path="${classes}"/>
                  <pathelement path="${classes.test}"/>
                  <pathelement path="${scripts}"/>
@@ -45,7 +49,7 @@ Forwarded: no
              </classpath>
              <classfileset dir="${classes.test}">
                  <include name="**/${name}.class"/>
-@@ -218,8 +226,14 @@
+@@ -218,8 +228,14 @@
                  <fileset dir="${lib}">
                      <include name="**/*.jar" />
                  </fileset>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htsjdk.git



More information about the debian-med-commit mailing list