[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-1-8-g20e2a66

2010-10-14 Thread David Paleino 
The following commit has been merged in the master branch:
commit 20e2a6649b856c3fef93a050f3bf64824aefa5ac
Author: David Paleino 
Date:   Thu Oct 14 20:39:16 2010 +0200

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index d3b1a2c..706782b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-josm-plugins (0.0.svn23479-3) UNRELEASED; urgency=low
+josm-plugins (0.0.svn23479-3) unstable; urgency=low
 
   * Switch priority between webkit-image-gtk and -qt in Recommends
 
- -- David Paleino   Thu, 14 Oct 2010 20:38:50 +0200
+ -- David Paleino   Thu, 14 Oct 2010 20:39:13 +0200
 
 josm-plugins (0.0.svn23479-2) unstable; urgency=low
 

-- 
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.svn23479-1-8-g20e2a66

2010-10-14 Thread David Paleino 
The following commit has been merged in the master branch:
commit eec3f741736e612d230bf7c57824cff3870d1b38
Author: David Paleino 
Date:   Thu Oct 14 20:39:11 2010 +0200

Switch priority between webkit-image-gtk and -qt in Recommends

diff --git a/debian/changelog b/debian/changelog
index 1d72269..d3b1a2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm-plugins (0.0.svn23479-3) UNRELEASED; urgency=low
+
+  * Switch priority between webkit-image-gtk and -qt in Recommends
+
+ -- David Paleino   Thu, 14 Oct 2010 20:38:50 +0200
+
 josm-plugins (0.0.svn23479-2) unstable; urgency=low
 
   * debian/patches/170-fix_webkitimagegtk.patch added, don't output
diff --git a/debian/control b/debian/control
index 2127771..b878091 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Depends:
  , liblog4j1.2-java
  , libjgrapht0.8-java
 Breaks: josm (>= 0.0.svn3593)
-Recommends: webkit-image-qt | webkit-image-gtk
+Recommends: webkit-image-gtk | webkit-image-qt
 Suggests: gpsd
 Description: Plugins for JOSM
  JOSM (Java OpenStreetMap) plugin collection.

-- 
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.svn23479-1-8-g20e2a66

2010-10-14 Thread David Paleino 
The following commit has been merged in the master branch:
commit 36d7159e55960ed8b58457c47bc513f3951b1631
Author: David Paleino 
Date:   Thu Oct 14 20:38:33 2010 +0200

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index b223da6..1d72269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-josm-plugins (0.0.svn23479-2) UNRELEASED; urgency=low
+josm-plugins (0.0.svn23479-2) unstable; urgency=low
 
   * debian/patches/170-fix_webkitimagegtk.patch added, don't output
 a fixed size image, otherwise it's inusable with JOSM.
@@ -10,7 +10,7 @@ josm-plugins (0.0.svn23479-2) UNRELEASED; urgency=low
   * debian/control: added Recommends on webkit-image-* to josm-plugins
 (Closes: #600137)
 
- -- David Paleino   Thu, 14 Oct 2010 11:56:41 +0200
+ -- David Paleino   Thu, 14 Oct 2010 11:58:22 +0200
 
 josm-plugins (0.0.svn23479-1) unstable; urgency=low
 

-- 
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.svn23479-1-8-g20e2a66

2010-10-14 Thread David Paleino 
The following commit has been merged in the master branch:
commit b29edb8ab39697a234a6056442b239ffa949862f
Author: David Paleino 
Date:   Thu Oct 14 11:57:40 2010 +0200

debian/control: added Recommends on webkit-image-* to josm-plugins (Closes: 
#600137)

diff --git a/debian/changelog b/debian/changelog
index 4c310d6..b223da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ josm-plugins (0.0.svn23479-2) UNRELEASED; urgency=low
 manpages written (Closes: #600093)
   * debian/webkit-image-*.{postinst,prerm} added: handle "webkit-image"
 alternative
+  * debian/control: added Recommends on webkit-image-* to josm-plugins
+(Closes: #600137)
 
- -- David Paleino   Thu, 14 Oct 2010 11:43:30 +0200
+ -- David Paleino   Thu, 14 Oct 2010 11:56:41 +0200
 
 josm-plugins (0.0.svn23479-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index efc343b..2127771 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Depends:
  , liblog4j1.2-java
  , libjgrapht0.8-java
 Breaks: josm (>= 0.0.svn3593)
+Recommends: webkit-image-qt | webkit-image-gtk
 Suggests: gpsd
 Description: Plugins for JOSM
  JOSM (Java OpenStreetMap) plugin collection.

-- 
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.svn23479-1-8-g20e2a66

2010-10-14 Thread David Paleino 
The following commit has been merged in the master branch:
commit 21da17c9d5ead9112dcbc15818f6274ad0bfaa6a
Author: David Paleino 
Date:   Thu Oct 14 11:55:57 2010 +0200

remotecontrol added

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 5d145f5..38387fc 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -34,10 +34,6 @@
 - license: unknown, copyright holder unknown too
 - build.xml: OK, needs anti-SVN patch
 - dependencies: depends on looks, which is in Debian
-  + remotecontrol
-- license: MAYBE, GPL-2+ and copyright holder (Frederik Ramm) stated in
-  LICENSE and CONTRIBUTION files, but not on source files themselves.
-- build.xml: OK, needs anti-SVN patch
   + tageditor
 - licese: copyright holder unknown; LICENSE contains GPL-2 text, but no
   indication of license is present on sources

-- 
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.svn23479-1-8-g20e2a66

2010-10-14 Thread David Paleino 
The following commit has been merged in the master branch:
commit 4a77a7ee525bc4cece97f8a3ab11317570a2ca50
Author: David Paleino 
Date:   Thu Oct 14 11:55:33 2010 +0200

debian/webkit-image-*.{postinst,prerm} added: handle "webkit-image" 
alternative

diff --git a/debian/changelog b/debian/changelog
index 099b512..4c310d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ josm-plugins (0.0.svn23479-2) UNRELEASED; urgency=low
   * debian/webkit-image-gtk.1, debian/webkit-image-gtk.manpages,
 debian/webkit-image-qt.1, debian/webkit-image-qt.manpages added:
 manpages written (Closes: #600093)
+  * debian/webkit-image-*.{postinst,prerm} added: handle "webkit-image"
+alternative
 
- -- David Paleino   Thu, 14 Oct 2010 10:21:04 +0200
+ -- David Paleino   Thu, 14 Oct 2010 11:43:30 +0200
 
 josm-plugins (0.0.svn23479-1) unstable; urgency=low
 
diff --git a/debian/webkit-image-gtk.postinst b/debian/webkit-image-gtk.postinst
new file mode 100644
index 000..92cfd97
--- /dev/null
+++ b/debian/webkit-image-gtk.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+# postinst script for webkit-image-gtk
+#
+# see: dh_installdeb(1)
+
+set -e
+
+mandir=/usr/share/man
+
+case "$1" in
+configure)
+if [ -f /usr/bin/webkit-image-gtk ]; then
+update-alternatives --install /usr/bin/webkit-image \
+webkit-image /usr/bin/webkit-image-gtk 100 \
+--slave $mandir/man1/webkit-image.1.gz webkit-image.1.gz \
+$mandir/man1/webkit-image-gtk.1.gz
+fi
+;;
+
+*)
+echo "postinst called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/webkit-image-gtk.prerm b/debian/webkit-image-gtk.prerm
new file mode 100644
index 000..881ebee
--- /dev/null
+++ b/debian/webkit-image-gtk.prerm
@@ -0,0 +1,23 @@
+#!/bin/sh
+# prerm script for webkit-image-gtk
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+remove|upgrade|deconfigure)
+if [ -f /usr/bin/webkit-image-gtk ]; then
+update-alternatives --remove webkit-image /usr/bin/webkit-image-gtk
+fi
+;;
+
+*)
+echo "prerm called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/webkit-image-qt.postinst b/debian/webkit-image-qt.postinst
new file mode 100644
index 000..30553a1
--- /dev/null
+++ b/debian/webkit-image-qt.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+# postinst script for webkit-image-qt
+#
+# see: dh_installdeb(1)
+
+set -e
+
+mandir=/usr/share/man
+
+case "$1" in
+configure)
+if [ -f /usr/bin/webkit-image-qt ]; then
+update-alternatives --install /usr/bin/webkit-image \
+webkit-image /usr/bin/webkit-image-qt 100 \
+--slave $mandir/man1/webkit-image.1.gz webkit-image.1.gz \
+$mandir/man1/webkit-image-qt.1.gz
+fi
+;;
+
+*)
+echo "postinst called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/webkit-image-qt.prerm b/debian/webkit-image-qt.prerm
new file mode 100644
index 000..af06075
--- /dev/null
+++ b/debian/webkit-image-qt.prerm
@@ -0,0 +1,23 @@
+#!/bin/sh
+# prerm script for webkit-image-qt
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+remove|upgrade|deconfigure)
+if [ -f /usr/bin/webkit-image-qt ]; then
+update-alternatives --remove webkit-image /usr/bin/webkit-image-qt
+fi
+;;
+
+*)
+echo "prerm called with unknown argument \`$1'" >&2
+exit 1
+;;
+esac
+
+#DEBHELPER#
+
+exit 0

-- 
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