[DebianGIS-dev] [SCM] josm-plugins branch, upstream, updated. upstream/0.0.svn22363-2-g961fcf5
The following commit has been merged in the upstream branch: -- Plugins for josm ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn22363-1-15-g3fb2444
The following commit has been merged in the master branch: commit 1bca6176d9a9976fd7d08bbf43891242dec256b7 Author: David Paleino da...@debian.org Date: Tue Sep 7 11:35:54 2010 +0200 debian/copyright: add notice for newly added remotecontrol plugin diff --git a/debian/changelog b/debian/changelog index 2d1ddf5..a5728a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,9 @@ josm-plugins (0.0.svn23040-1) UNRELEASED; urgency=low * debian/rules: - add remotecontrol to the list of downloded plugins * debian/master.xml: build remotecontrol before wmsplugin + * debian/copyright: add notice for newly added remotecontrol plugin - -- David Paleino da...@debian.org Tue, 07 Sep 2010 11:27:38 +0200 + -- David Paleino da...@debian.org Tue, 07 Sep 2010 11:35:26 +0200 josm-plugins (0.0.svn22363-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 49a0260..9bd41d0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -47,6 +47,10 @@ Files: openvisible/* Copyright: © 2008-2009 Christof Dallermassl cdaller...@gmx.at License: GPL-3+ +Files: remotecontrol/* +Copyright: © Frederik Ramm frede...@remote.org +License: GPL-2+ + Files: routing/* Copyright: © 2008, Innovant License: GPL-2+ -- Plugins for josm ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn22363-1-15-g3fb2444
The following commit has been merged in the master branch: commit 3fb244405750efb3853a9531d437609b7dd8a749 Merge: 1bca6176d9a9976fd7d08bbf43891242dec256b7 9c7683f04cc47d26188bac7ef11aaa766c31c0a2 Author: David Paleino da...@debian.org Date: Tue Sep 7 11:37:12 2010 +0200 Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/josm-plugins -- Plugins for josm ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch: commit 1b8eed13508df40524f0393f506225e94a78fe3a Merge: d6a21b84c87b55ed96d597e5c034813498b9b8fe 5a150c240169275fbc9981a13dab7fd54989c6e0 Author: David Paleino da...@debian.org Date: Tue Sep 7 09:23:39 2010 +0200 Merge commit 'upstream/0.0.svn3514' -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch: commit 34916f0db55ec0394ede04692dac90f600ea2923 Author: David Paleino da...@debian.org Date: Tue Sep 7 09:26:08 2010 +0200 New upstream snapshot diff --git a/debian/changelog b/debian/changelog index 6f8f4fd..2757f41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm (0.0.svn3514-1) UNRELEASED; urgency=low + + * New upstream snapshot + + -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:25:48 +0200 + josm (0.0.svn3376-1) unstable; urgency=low * New upstream snapshot -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch:
commit d223d87a0effc27421bf7bad9cbcd75781f83079
Author: David Paleino da...@debian.org
Date: Tue Sep 7 09:40:48 2010 +0200
debian/patches/* refreshed to cleanly apply to the new code
diff --git a/debian/changelog b/debian/changelog
index 2757f41..bdaa357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
josm (0.0.svn3514-1) UNRELEASED; urgency=low
* New upstream snapshot
+ * debian/patches/* refreshed to cleanly apply to the new code
- -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:25:48 +0200
+ -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:40:14 +0200
josm (0.0.svn3376-1) unstable; urgency=low
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 04b90d6..9ce2716 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -4,9 +4,9 @@ Subject: adjustments to the ant build file, mainly to not
include
Forwarded: no
---
- build.xml | 36 +---
+ build.xml | 38 ++
i18n/build.xml | 26 +-
- 2 files changed, 34 insertions(+), 28 deletions(-)
+ 2 files changed, 35 insertions(+), 29 deletions(-)
--- josm.orig/build.xml
+++ josm/build.xml
@@ -87,11 +87,19 @@ Forwarded: no
-
- !-- All jar files necessary to run only JOSM (no
tests) --
- zipfileset
src=lib/metadata-extractor-2.3.1-nosun.jar /
-- zipfileset src=lib/signpost-core-1.1.jar /
+- zipfileset src=lib/signpost-core-1.2.1.1.jar /
/jar
/target
-@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
+@@ -116,13 +104,14 @@ Build-Date: ${build.tstamp}
+ zipfileset dir=macosx
includes=JOSM.app/Contents/MacOS/JOSM filemode=755/
+ /zip
+ /target
+-
++
+ target name=compile depends=init
+ javac srcdir=src classpathref=classpath destdir=build
+ target=1.5 source=1.5 debug=on
encoding=UTF-8
compilerarg value=-Xlint:deprecation/
compilerarg value=-Xlint:unchecked/
/javac
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 9fb1a55..bb7c782 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -6,8 +6,8 @@ Forwarded: no
---
src/org/openstreetmap/josm/actions/AboutAction.java |7 +++
src/org/openstreetmap/josm/data/Version.java|7 +++
- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java | 20
+++---
- 3 files changed, 19 insertions(+), 15 deletions(-)
+ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java | 19
+++---
+ 3 files changed, 19 insertions(+), 14 deletions(-)
--- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
+++ josm/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -71,40 +71,40 @@ Forwarded: no
*
--- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -68,8 +68,8 @@ public final class BugReportExceptionHan
- Main.parent,
- html
- + tr(An unexpected exception occurred.br +
--This is always a coding error. If you are
running the latestbr +
--version of JOSM, please consider being kind and
file a bug report.
-+Please consider being kind and file a bug
report.\n +
-+See http://bugs.debian.org for a guide how to do
this.
- )
- + /html,
- tr(Unexpected Exception),
-@@ -120,21 +120,13 @@ public final class BugReportExceptionHan
+@@ -74,8 +74,8 @@ public final class BugReportExceptionHan
+ Main.parent,
+ html
+ + tr(An unexpected exception occurred.br +
+-This is always a coding error. If you are
running the latestbr +
+-version of JOSM, please consider being kind
and file a bug report.
++Please consider being kind and file a bug
report.\n +
++See http://bugs.debian.org for a guide how
to do this.
+ )
+ + /html,
+ tr(Unexpected Exception),
+@@ -126,21 +126,14 @@ public final class BugReportExceptionHan
- JPanel p = new JPanel(new GridBagLayout());
- p.add(new JMultilineLabel(
--tr(You have encountered an error in JOSM. Before you
file a bug report +
--make sure you have updated to the
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch:
commit 56355c37c320e60cc2c84e5ded2d58aac741f65c
Author: David Paleino da...@debian.org
Date: Tue Sep 7 09:41:41 2010 +0200
debian/patches/60-port_oauth_1.2.patch removed, merged upstream
diff --git a/debian/changelog b/debian/changelog
index bdaa357..4add49f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn3514-1) UNRELEASED; urgency=low
* New upstream snapshot
* debian/patches/* refreshed to cleanly apply to the new code
+ * debian/patches/60-port_oauth_1.2.patch removed, merged upstream
- -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:40:14 +0200
+ -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:41:17 +0200
josm (0.0.svn3376-1) unstable; urgency=low
diff --git a/debian/patches/60-port_oauth_1.2.patch
b/debian/patches/60-port_oauth_1.2.patch
deleted file mode 100644
index c794616..000
--- a/debian/patches/60-port_oauth_1.2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: David Paleino da...@debian.org
-Subject: port JOSM code to OAuth-Signpost 1.2
-Forwarded: https://josm.openstreetmap.de/ticket/5244
-
- src/org/openstreetmap/josm/data/oauth/OAuthParameters.java|6
+++---
- src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java |4
++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
josm.orig/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
-+++ josm/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
-@@ -5,7 +5,7 @@ import oauth.signpost.OAuthConsumer;
- import oauth.signpost.OAuthProvider;
- import oauth.signpost.basic.DefaultOAuthConsumer;
- import oauth.signpost.basic.DefaultOAuthProvider;
--import oauth.signpost.signature.SignatureMethod;
-+import oauth.signpost.signature.HmacSha1MessageSigner;
-
- import org.openstreetmap.josm.data.Preferences;
- import org.openstreetmap.josm.tools.CheckParameterUtil;
-@@ -133,7 +133,8 @@ public class OAuthParameters {
- * @return the consumer
- */
- public OAuthConsumer buildConsumer() {
--return new DefaultOAuthConsumer(consumerKey, consumerSecret,
SignatureMethod.HMAC_SHA1);
-+OAuthConsumer consumer = new DefaultOAuthConsumer(consumerKey,
consumerSecret);
-+return consumer;
- }
-
- /**
-@@ -146,7 +147,6 @@ public class OAuthParameters {
- public OAuthProvider buildProvider(OAuthConsumer consumer) throws
IllegalArgumentException {
- CheckParameterUtil.ensureParameterNotNull(consumer, consumer);
- return new DefaultOAuthProvider(
--consumer,
- requestTokenUrl,
- accessTokenUrl,
- authoriseUrl
josm.orig/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
-+++ josm/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
-@@ -129,7 +129,7 @@ public class OsmOAuthAuthorizationClient
- try {
- monitor.beginTask();
- monitor.indeterminateSubTask(tr(Retrieving OAuth Request Token
from ''{0}'', oauthProviderParameters.getRequestTokenUrl()));
--provider.retrieveRequestToken(null);
-+provider.retrieveRequestToken(consumer, null);
- return OAuthToken.createToken(consumer);
- } catch(OAuthCommunicationException e){
- if (canceled)
-@@ -162,7 +162,7 @@ public class OsmOAuthAuthorizationClient
- try {
- monitor.beginTask();
- monitor.indeterminateSubTask(tr(Retrieving OAuth Access Token
from ''{0}'', oauthProviderParameters.getAccessTokenUrl()));
--provider.retrieveAccessToken(null);
-+provider.retrieveAccessToken(consumer, null);
- return OAuthToken.createToken(consumer);
- } catch(OAuthCommunicationException e){
- if (canceled)
diff --git a/debian/patches/series b/debian/patches/series
index 6d571f1..e608444 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
40-elemstyles.patch
50-preferences_world_readable.patch
#60-disable_oauth.patch
-60-port_oauth_1.2.patch
70-default_look_and_feel.patch
80-fix_images.patch
--
Java OpenStreetMap editor
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch:
commit 643c0347cf0011626342aa6fd15af0c0d6374557
Author: David Paleino da...@debian.org
Date: Tue Sep 7 09:42:15 2010 +0200
debian/patches/60-disable_oauth.patch removed, not being applied since a
couple of releases
diff --git a/debian/patches/60-disable_oauth.patch
b/debian/patches/60-disable_oauth.patch
deleted file mode 100644
index 2d6c3fc..000
--- a/debian/patches/60-disable_oauth.patch
+++ /dev/null
@@ -1,602 +0,0 @@
-From: David Paleino da...@debian.org
-Subject: disable everything OAuth-related, since we're missing packaged
- dependencies.
-Forwarded: not-needed, Debian-specific
-
- build.xml
|3 -
- src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
|5 +
- src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
| 12 +++-
- src/org/openstreetmap/josm/gui/MainApplication.java
|4 -
-
src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
| 15 -
- src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
| 10 +++
-
src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
| 27 --
- src/org/openstreetmap/josm/io/OsmConnection.java
| 13 +++-
- src/org/openstreetmap/josm/io/auth/CredentialsManager.java
|6 +-
- src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
|6 +-
- src/org/openstreetmap/josm/tools/ExceptionUtil.java
|8 ++
- 11 files changed, 81 insertions(+), 28 deletions(-)
-
josm.orig/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-+++ josm/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -95,8 +95,9 @@ public final class ShowStatusReportActio
- if (toCheck.startsWith(osm-server.username)
- || toCheck.startsWith(osm-server.password)
- || toCheck.startsWith(marker.show)
--|| toCheck.startsWith(oauth.access-token.key)
--||
toCheck.startsWith(oauth.access-token.secret)) {
-+) {
-+//|| toCheck.startsWith(oauth.access-token.key)
-+ // ||
toCheck.startsWith(oauth.access-token.secret)) {
- continue;
- }
- text.append(line);
josm.orig/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
-+++ josm/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
-@@ -15,7 +15,7 @@ import javax.swing.JOptionPane;
- import org.openstreetmap.josm.Main;
- import org.openstreetmap.josm.io.ChangesetClosedException;
- import org.openstreetmap.josm.io.IllegalDataException;
--import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
-+//import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
- import org.openstreetmap.josm.io.OsmApiException;
- import org.openstreetmap.josm.io.OsmApiInitializationException;
- import org.openstreetmap.josm.io.OsmTransferException;
-@@ -249,11 +249,13 @@ public class ExceptionDialogUtil {
- public static void explainAuthenticationFailed(OsmApiException e) {
- String authMethod = Main.pref.get(osm-server.auth-method, basic);
- String msg;
-+/*
- if (authMethod.equals(oauth)) {
- msg = ExceptionUtil.explainFailedOAuthAuthentication(e);
- } else {
-+*/
- msg = ExceptionUtil.explainFailedBasicAuthentication(e);
--}
-+//}
-
- HelpAwareOptionPane.showOptionDialog(
- Main.parent,
-@@ -273,7 +275,7 @@ public class ExceptionDialogUtil {
- public static void explainAuthorizationFailed(OsmApiException e) {
- HelpAwareOptionPane.showOptionDialog(
- Main.parent,
--ExceptionUtil.explainFailedOAuthAuthorisation(e),
-+tr(OAuth authorization disabled by Debian.),
- tr(Authorisation Failed),
- JOptionPane.ERROR_MESSAGE,
- ht(/ErrorMessages#AuthenticationFailed)
-@@ -318,6 +320,7 @@ public class ExceptionDialogUtil {
- *
- * @param e the exception
- */
-+/*
- public static void
explainMissingOAuthAccessTokenException(MissingOAuthAccessTokenException e) {
- HelpAwareOptionPane.showOptionDialog(
- Main.parent,
-@@ -327,6 +330,7 @@ public class ExceptionDialogUtil {
- ht(/ErrorMessages#MissingOAuthAccessToken)
- );
- }
-+*/
-
- /**
- * Explains a {...@see UnknownHostException} which has caused an {...@see
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch: commit b82283740dc08a99a03436583eeb094a28251a24 Author: David Paleino da...@debian.org Date: Tue Sep 7 09:44:03 2010 +0200 debian/control: Build-Depends on default-jdk bumped to = 1.6 diff --git a/debian/changelog b/debian/changelog index 4add49f..0ec43a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ josm (0.0.svn3514-1) UNRELEASED; urgency=low * New upstream snapshot * debian/patches/* refreshed to cleanly apply to the new code * debian/patches/60-port_oauth_1.2.patch removed, merged upstream + * debian/control: +- Build-Depends on default-jdk bumped to = 1.6 - -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:41:17 +0200 + -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:43:45 +0200 josm (0.0.svn3376-1) unstable; urgency=low diff --git a/debian/control b/debian/control index ffc3204..e43d69f 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: ant, debhelper (= 7.0.50~), gettext, - default-jdk, + default-jdk (= 1:1.6), libgettext-commons-java (= 0.9.6), libmetadata-extractor-java, libgettext-ant-tasks-java, -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch: commit a0c1655ff239b24652dcdb639fd1fd093ca10564 Author: David Paleino da...@debian.org Date: Tue Sep 7 09:46:09 2010 +0200 debian/control: Standards-Version bumped to 3.9.1, no changes needed diff --git a/debian/changelog b/debian/changelog index 0ec43a1..2324328 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ josm (0.0.svn3514-1) UNRELEASED; urgency=low * debian/patches/60-port_oauth_1.2.patch removed, merged upstream * debian/control: - Build-Depends on default-jdk bumped to = 1.6 +- Standards-Version bumped to 3.9.1, no changes needed - -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:43:45 +0200 + -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:45:50 +0200 josm (0.0.svn3376-1) unstable; urgency=low diff --git a/debian/control b/debian/control index e43d69f..041f51c 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: libgettext-ant-tasks-java, libterm-readkey-perl , liboauth-signpost-java (= 1.2) -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Homepage: http://josm.openstreetmap.de Vcs-Git: git://git.debian.org/pkg-grass/josm.git Vcs-Browser: http://git.debian.org/?p=pkg-grass/josm.git -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch: commit 70da5edce6240ffabc2a79196e371daeaf0c41c6 Author: David Paleino da...@debian.org Date: Tue Sep 7 09:46:50 2010 +0200 debian/control: drop alternative dependency on sun-java5-jre: Java 5 is no more supported by upstream diff --git a/debian/changelog b/debian/changelog index 2324328..1d4b1ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,10 @@ josm (0.0.svn3514-1) UNRELEASED; urgency=low * debian/control: - Build-Depends on default-jdk bumped to = 1.6 - Standards-Version bumped to 3.9.1, no changes needed +- drop alternative dependency on sun-java5-jre: Java 5 is no more + supported by upstream - -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:45:50 +0200 + -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:46:23 +0200 josm (0.0.svn3376-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 041f51c..c22e196 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-grass/josm.git Package: josm Architecture: all Depends: - openjdk-6-jre | sun-java5-jre | sun-java6-jre, + openjdk-6-jre | sun-java6-jre, libgettext-commons-java (= 0.9.6), libmetadata-extractor-java, liboauth-signpost-java (= 1.2), -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch: commit f53e534dfdf2d39c87846cd3bfd4a18bb012b251 Author: David Paleino da...@debian.org Date: Tue Sep 7 09:57:53 2010 +0200 Fix patch diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch index bb7c782..12bc0a9 100644 --- a/debian/patches/20-bts.patch +++ b/debian/patches/20-bts.patch @@ -89,7 +89,7 @@ Forwarded: no -tr(You have encountered an error in JOSM. Before you file a bug report + -make sure you have updated to the latest version of JOSM here:)), GBC.eol()); -p.add(new UrlLabel(http://josm.openstreetmap.de/#Download;), GBC.eop().insets(8,0,0,0)); -+tr(Please report a bug against josm.)), GBC.eol()) ++tr(Please report a bug against josm.)), GBC.eol()); p.add(new JMultilineLabel( -tr(You should also update your plugins. If neither of those help please + -file a bug report in our bugtracker using this link:)), GBC.eol()); -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
The following commit has been merged in the master branch: commit eb7fce821e91091f2cbc3103baf283268301 Author: David Paleino da...@debian.org Date: Tue Sep 7 11:38:04 2010 +0200 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 1d4b1ad..a2c70f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm (0.0.svn3514-1) UNRELEASED; urgency=low +josm (0.0.svn3514-1) unstable; urgency=low * New upstream snapshot * debian/patches/* refreshed to cleanly apply to the new code @@ -9,7 +9,7 @@ josm (0.0.svn3514-1) UNRELEASED; urgency=low - drop alternative dependency on sun-java5-jre: Java 5 is no more supported by upstream - -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:46:23 +0200 + -- David Paleino da...@debian.org Tue, 07 Sep 2010 09:58:00 +0200 josm (0.0.svn3376-1) unstable; urgency=low -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, pristine-tar, updated. 90a78632c743e346df9192d3fe16ab36eb5c3c20
The following commit has been merged in the pristine-tar branch: commit 90a78632c743e346df9192d3fe16ab36eb5c3c20 Author: David Paleino da...@debian.org Date: Tue Sep 7 09:23:34 2010 +0200 pristine-tar data for josm_0.0.svn3514.orig.tar.gz diff --git a/josm_0.0.svn3514.orig.tar.gz.delta b/josm_0.0.svn3514.orig.tar.gz.delta new file mode 100644 index 000..82e26a0 Binary files /dev/null and b/josm_0.0.svn3514.orig.tar.gz.delta differ diff --git a/josm_0.0.svn3514.orig.tar.gz.id b/josm_0.0.svn3514.orig.tar.gz.id new file mode 100644 index 000..cba756c --- /dev/null +++ b/josm_0.0.svn3514.orig.tar.gz.id @@ -0,0 +1 @@ +5a150c240169275fbc9981a13dab7fd54989c6e0 -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] Processing of josm_0.0.svn3514-1_i386.changes
josm_0.0.svn3514-1_i386.changes uploaded successfully to localhost along with the files: josm_0.0.svn3514-1.dsc josm_0.0.svn3514.orig.tar.gz josm_0.0.svn3514-1.debian.tar.gz josm_0.0.svn3514-1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] josm_0.0.svn3514-1_i386.changes ACCEPTED
Accepted: josm_0.0.svn3514-1.debian.tar.gz to main/j/josm/josm_0.0.svn3514-1.debian.tar.gz josm_0.0.svn3514-1.dsc to main/j/josm/josm_0.0.svn3514-1.dsc josm_0.0.svn3514-1_all.deb to main/j/josm/josm_0.0.svn3514-1_all.deb josm_0.0.svn3514.orig.tar.gz to main/j/josm/josm_0.0.svn3514.orig.tar.gz Override entries for your package: josm_0.0.svn3514-1.dsc - source utils josm_0.0.svn3514-1_all.deb - extra utils Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2921 - packages/opencpn/trunk/debian
Author: hamish-guest
Date: 2010-09-08 00:25:21 + (Wed, 08 Sep 2010)
New Revision: 2921
Modified:
packages/opencpn/trunk/debian/control
packages/opencpn/trunk/debian/rules
Log:
need dpatch; don't need imagemagick
Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control 2010-09-05 06:27:42 UTC (rev
2920)
+++ packages/opencpn/trunk/debian/control 2010-09-08 00:25:21 UTC (rev
2921)
@@ -3,7 +3,9 @@
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Anton Martchukov an...@martchukov.com
-Build-Depends: debhelper (= 7.0.50~), cmake, libglu-dev, libwxbase2.8-dev,
libwxgtk2.8-dev, libgtk2.0-dev, imagemagick, zlib1g-dev, libbz2-dev, libgps-dev
+Build-Depends: debhelper (= 7.0.50~), dpatch, cmake, libglu-dev,
+ libwxbase2.8-dev, libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev,
+ libbz2-dev, libgps-dev
Standards-Version: 3.8.4
Homepage: http://www.opencpn.org/
@@ -12,8 +14,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
Suggests: gpsd
Description: a concise ChartPlotter/Navigator
- opencpn is a cross-platform ship-borne GUI ChartPlotter
- application supporting
+ OpenCPN is a cross-platform ship-borne GUI chart plotter
+ application supporting:
.
* GPS/GPDS Postition Input
* BSB Raster Chart Display
Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2010-09-05 06:27:42 UTC (rev 2920)
+++ packages/opencpn/trunk/debian/rules 2010-09-08 00:25:21 UTC (rev 2921)
@@ -9,18 +9,21 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
%:
dh $@
override_dh_install:
mkdir -p $(CURDIR)/debian/opencpn/usr/share/pixmaps
- convert $(CURDIR)/data/opencpn.png -resize 32x32
$(CURDIR)/debian/opencpn/usr/share/pixmaps/opencpn.xpm
+ cp $(CURDIR)/src/bitmaps/opencpn.xpm
$(CURDIR)/debian/opencpn/usr/share/pixmaps/
dh_install
rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt
+ # why remove doc/ ?
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
override_dh_installman:
- dh_installman debian/opencpn.1
\ No newline at end of file
+ dh_installman debian/opencpn.1
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
