[josm] 01/01: Don't mark the Debian package build as a local build in MANIFEST.MF.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository josm.

commit 3f36d68e092dd82abc4b1080d2c333720bc4469b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 11 14:39:55 2015 +0200

    Don't mark the Debian package build as a local build in MANIFEST.MF.
---
 debian/changelog                    |  6 ++++++
 debian/patches/00-build.patch       | 14 ++++++++++----
 debian/patches/05-fix_version.patch | 12 ------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 798262c..c2a47d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn8800+dfsg3-1~exp2) UNRELEASED; urgency=medium
+
+  * Don't mark the Debian package build as a local build in MANIFEST.MF.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 11 Oct 2015 14:31:19 +0200
+
 josm (0.0.svn8800+dfsg3-1~exp1) experimental; urgency=medium
 
   * Also remove OSX support from upstream source.
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 3e4783f..b0e91be 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -1,7 +1,10 @@
 Description: Adjustments to the ant build.xml file.
  Mainly to use system-provided JARs and not depend on Internet connection.
  Also adds support to build the translations in the i18n directory.
+ The Debian package build is identified using the Build-Name in the REVISION
+ file and is not considered local build.
 Author: Giovanni Mascellani <gio at debian.org>
+Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: not-needed
 
 --- a/build.xml
@@ -49,9 +52,12 @@ Forwarded: not-needed
          <tstamp>
              <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
          </tstamp>
-@@ -91,6 +104,8 @@
+@@ -89,8 +102,10 @@
+         <echo file="${revision.dir}/REVISION">
+ # automatically generated by JOSM build.xml - do not edit
  Revision: ${version.entry.commit.revision}
- Is-Local-Build: true
+-Is-Local-Build: true
++Is-Local-Build: false
  Build-Date: ${build.tstamp}
 +Build-Name: Debian
 +Debian-Release: ${debian.version}
@@ -121,7 +127,7 @@ Forwarded: not-needed
 +        <ant dir="i18n" />
          <!-- JMapViewer -->
 -        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**" 
-+        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**" 
++        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
              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"/>
@@ -130,7 +136,7 @@ Forwarded: not-needed
          </javac>
          <!-- JOSM -->
 -        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
-+        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
++        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
              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"/>
diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch
index 1ed057c..7d1dd26 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -17,15 +17,3 @@ Forwarded: not-needed
                  <attribute name="Main-Date" value="${version.entry.commit.date}"/>
                  <attribute name="Permissions" value="all-permissions"/>
                  <attribute name="Codebase" value="josm.openstreetmap.de"/>
---- a/src/org/openstreetmap/josm/data/Version.java
-+++ b/src/org/openstreetmap/josm/data/Version.java
-@@ -234,9 +234,6 @@ public class Version {
-         if (buildName != null) {
-             s += " " + buildName;
-         }
--        if (isLocalBuild() && v != JOSM_UNKNOWN_VERSION) {
--            s += " SVN";
--        }
-         String result = "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
-         if (includeOsDetails && Main.platform != null) {
-             result += " " + Main.platform.getOSDescription();

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