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

sebastic pushed a commit to branch stretch
in repository josm.

commit 8cf49a9ae88f669fc222f9757ac0709c9ae5ea19
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Thu Jun 18 15:06:05 2015 +0200

    Patch REVISION file to add Build-Name property for identification of the 
Debian build.
---
 debian/changelog                              |  7 +++++++
 debian/patches/00-build.patch                 | 15 ++++++++-------
 debian/patches/04-use_system_jmapviewer.patch |  2 +-
 debian/patches/05-fix_version.patch           |  2 +-
 debian/patches/06-move_data_out_of_jar.patch  |  2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b54023e..74d2272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn8159+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Patch REVISION file to add Build-Name property for identification of the
+    Debian build. (closes: #789161)
+
+ -- Bas Couwenberg <sebas...@debian.org>  Thu, 18 Jun 2015 14:55:12 +0200
+
 josm (0.0.svn8159+dfsg1-1) unstable; urgency=medium
 
   * Update branch in gbp.conf and Vcs-Git URL.
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index f2b5c87..c255eed 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -54,15 +54,16 @@ JARs and not depend on Internet connection.
          <tstamp>
              <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
          </tstamp>
-@@ -87,6 +100,7 @@
+@@ -87,6 +100,8 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
++Build-Name: Debian
 +Debian-Release: ${debian.version}
  </echo>
      </target>
      <!--
-@@ -106,7 +120,8 @@ Build-Date: ${build.tstamp}
+@@ -106,7 +121,8 @@ Build-Date: ${build.tstamp}
          <copy file="README" todir="build"/>
          <copy file="LICENSE" todir="build"/>
          <!-- create josm-custom.jar -->
@@ -72,7 +73,7 @@ JARs and not depend on Internet connection.
          <jar destfile="dist/josm-custom.jar" basedir="build" 
level="${clevel}">
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
              <manifest>
-@@ -116,6 +131,8 @@ Build-Date: ${build.tstamp}
+@@ -116,6 +132,8 @@ Build-Date: ${build.tstamp}
                  <attribute name="Permissions" value="all-permissions"/>
                  <attribute name="Codebase" value="josm.openstreetmap.de"/>
                  <attribute name="Application-Name" value="JOSM - Java 
OpenStreetMap Editor"/>
@@ -81,7 +82,7 @@ JARs and not depend on Internet connection.
              </manifest>
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
-@@ -186,10 +203,7 @@ Build-Date: ${build.tstamp}
+@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="javacc" depends="init" unless="javacc.notRequired">
          <mkdir dir="${mapcss.dir}/parsergen"/>
@@ -93,7 +94,7 @@ JARs and not depend on Internet connection.
              <arg value="-DEBUG_PARSER=false"/>
              <arg value="-DEBUG_TOKEN_MANAGER=false"/>
              <arg value="-JDK_VERSION=1.7"/>
-@@ -214,15 +228,10 @@ Build-Date: ${build.tstamp}
+@@ -214,15 +229,10 @@ Build-Date: ${build.tstamp}
          </exec>
      </target>
      <target name="compile" depends="init,javacc,jaxb">
@@ -112,7 +113,7 @@ JARs and not depend on Internet connection.
              destdir="build" target="1.7" source="1.7" debug="on" 
includeantruntime="false" createMissingPackageInfoClass="false" 
encoding="UTF-8">
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
-@@ -251,6 +260,7 @@ Build-Date: ${build.tstamp}
+@@ -251,6 +261,7 @@ Build-Date: ${build.tstamp}
          </uptodate>
          <mkdir dir="build"/>
          <mkdir dir="dist"/>
@@ -120,7 +121,7 @@ JARs and not depend on Internet connection.
      </target>
      <target name="javadoc">
          <javadoc destdir="javadoc" 
-@@ -272,6 +282,7 @@ Build-Date: ${build.tstamp}
+@@ -272,6 +283,7 @@ Build-Date: ${build.tstamp}
          <delete dir="dist"/>
          <delete dir="${mapcss.dir}/parsergen"/>
          <delete dir="${imagerytypes.dir}"/>
diff --git a/debian/patches/04-use_system_jmapviewer.patch 
b/debian/patches/04-use_system_jmapviewer.patch
index 87e5e72..5880982 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -10,7 +10,7 @@ Forwarded: no
 
 --- a/build.xml
 +++ b/build.xml
-@@ -137,7 +137,6 @@ Debian-Release: ${debian.version}
+@@ -138,7 +138,6 @@ Debian-Release: ${debian.version}
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
              <zipfileset dir="styles" prefix="styles"/>
diff --git a/debian/patches/05-fix_version.patch 
b/debian/patches/05-fix_version.patch
index 308d75a..94df90c 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -126,7 +126,7 @@ Debian-Release: ${debian.version}
+@@ -127,7 +127,7 @@ Debian-Release: ${debian.version}
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
              <manifest>
                  <attribute name="Main-class" value="JOSM"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index 03a6ad2..78f5b3c 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -61,7 +61,7 @@ Bug-Debian: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
              }
 --- a/build.xml
 +++ b/build.xml
-@@ -134,9 +134,9 @@ Debian-Release: ${debian.version}
+@@ -135,9 +135,9 @@ Debian-Release: ${debian.version}
                  <attribute name="Debian-Release" value="${debian.version}"/>
                  <attribute name="Class-Path" value="${classpathprop}"/>
              </manifest>

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to