Author: gmascellani-guest
Date: 2008-12-23 12:23:04 +0000 (Tue, 23 Dec 2008)
New Revision: 1815

Modified:
   packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Adapt to upstream rev 1137


Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/20_bts.dpatch    2008-12-23 12:22:44 UTC 
(rev 1814)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch    2008-12-23 12:23:04 UTC 
(rev 1815)
@@ -5,19 +5,19 @@
 ## DP: Pattern match debian version in about dialog.
 
 @DPATCH@
-diff -urNad 
josm-0.0.0.20081222~/src/org/openstreetmap/josm/actions/AboutAction.java 
josm-0.0.0.20081222/src/org/openstreetmap/josm/actions/AboutAction.java
---- josm-0.0.0.20081222~/src/org/openstreetmap/josm/actions/AboutAction.java   
2008-12-22 22:41:42.000000000 +0100
-+++ josm-0.0.0.20081222/src/org/openstreetmap/josm/actions/AboutAction.java    
2008-12-22 22:41:50.000000000 +0100
-@@ -67,7 +67,7 @@
-         }
+diff -urNad 
josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java 
josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
+--- josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java      
2008-12-23 11:56:50.000000000 +0100
++++ josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java       
2008-12-23 11:57:49.000000000 +0100
+@@ -55,7 +55,7 @@
+               if(u == null) u = 
Main.class.getResource("/META-INF/MANIFEST.MF");
                revision = loadFile(u);
  
--              Pattern versionPattern = 
Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*", 
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+              Pattern versionPattern = 
Pattern.compile(".*?(?:Revision|Main-Version): ([[0-9].-]*(?: SVN)?).*", 
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+-              Pattern versionPattern = 
Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*).*", 
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++              Pattern versionPattern = 
Pattern.compile(".*?(?:Revision|Main-Version): ([[0-9].-]*).*", 
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
                Matcher match = versionPattern.matcher(revision.getText());
                version = match.matches() ? match.group(1) : tr("UNKNOWN");
  
-@@ -125,7 +125,7 @@
+@@ -86,7 +86,7 @@
                info.add(new JLabel(tr("Homepage")), 
GBC.std().insets(0,0,10,0));
                info.add(new UrlLabel("http://josm.openstreetmap.de";), 
GBC.eol().fill(GBC.HORIZONTAL));
                info.add(new JLabel(tr("Bug Reports")), 
GBC.std().insets(0,0,10,0));
@@ -26,9 +26,9 @@
                info.add(new JLabel(tr("News about JOSM")), 
GBC.std().insets(0,0,10,0));
                info.add(new UrlLabel("http://www.opengeodata.org/?cat=17";), 
GBC.eol().fill(GBC.HORIZONTAL));
  
-diff -urNad 
josm-0.0.0.20081222~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
 
josm-0.0.0.20081222/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
---- 
josm-0.0.0.20081222~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
       2008-12-22 22:41:42.000000000 +0100
-+++ 
josm-0.0.0.20081222/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
        2008-12-22 22:42:28.000000000 +0100
+diff -urNad 
josm-0.0.svn1137~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
 
josm-0.0.svn1137/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+--- 
josm-0.0.svn1137~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
  2008-12-23 11:56:50.000000000 +0100
++++ 
josm-0.0.svn1137/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
   2008-12-23 11:56:59.000000000 +0100
 @@ -91,8 +91,8 @@
  
                        Object[] options = new String[]{tr("Do nothing"), 
tr("Report Bug")};


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

Reply via email to