[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn22363-1-37-gb3d3d09

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 57f90d4e2165ddfddb02ae7fcae11f6ef769e2aa
Author: David Paleino da...@debian.org
Date:   Mon Sep 13 19:31:51 2010 +0200

debian/control: added two new packages: webkit-image-qt and webkit-image-gtk

diff --git a/debian/changelog b/debian/changelog
index cdbcc85..c35c125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
+
+  * debian/control:
+- added two new packages: webkit-image-qt and webkit-image-gtk
+
+ -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:31:24 +0200
+
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index 2b4abe8..3781995 100644
--- a/debian/control
+++ b/debian/control
@@ -64,3 +64,19 @@ Description: Plugins for JOSM
  The project was started because most maps you think of as free actually
  have legal or technical restrictions on their use, holding back people
  from using them in creative, productive or unexpected ways.
+
+Package: webkit-image-qt
+Architecture: any
+Description: generate images from webpages - Qt version
+ webkit-image is a small tool that lets you generate images
+ from web page snapshots.
+ .
+ This package contains the Qt version
+
+Package: webkit-image-gtk
+Architecture: any
+Description: generate images from webpages - GTK version
+ webkit-image is a small tool that lets you generate images
+ from web page snapshots.
+ .
+ This package contains the Qt version

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 6c695af33543c6a8ae9304f14a89e683c808c908
Author: David Paleino da...@debian.org
Date:   Mon Sep 13 19:37:13 2010 +0200

debian/rules rewritten to use dh7

diff --git a/debian/changelog b/debian/changelog
index c35c125..4614f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
 
   * debian/control:
 - added two new packages: webkit-image-qt and webkit-image-gtk
+  * debian/rules rewritten to use dh7
 
- -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:31:24 +0200
+ -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:36:26 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 7db6060..a74e686 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for josm-plugins (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME  := /usr/share/ant
-DEB_JARS := /usr/share/josm/josm.jar
-DEB_JARS += /usr/share/java/metadata-extractor.jar
-DEB_ANT_BUILDFILE := $(CURDIR)/debian/master.xml
-
-DEB_ANT_BUILD_TARGET := build
-DEB_ANT_CLEAN_TARGET := clean
+export JAVA_HOME=/usr/lib/jvm/default-java
+export 
CLASSPATH=/usr/share/josm/josm.jar:/usr/share/java/metadata-extractor.jar
 
 SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
 PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker livegps 
measurement openvisible routing slippymap surveyor wmsplugin remotecontrol
@@ -25,6 +15,15 @@ endif
 DESTDIR := ../tarballs/josm-plugins-${VERSION}
 DESTTGZ := ../tarballs/josm-plugins_${VERSION}.orig.tar.gz
 
+%:
+   dh $@ --with ant
+
+override_dh_auto_build:
+   and -f $(CURDIR)/debian/master.xml build
+
+override_dh_auto_clean:
+   ant -f $(CURDIR)/debian/master.xml clean
+
 get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit eeebabf32ebcf44129379fa3820e7fa3c7e13df9
Author: David Paleino da...@debian.org
Date:   Mon Sep 13 19:47:56 2010 +0200

debian/control: bump debhelper dependency to = 7.3.3~

diff --git a/debian/changelog b/debian/changelog
index 4614f06..7765a42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
 
   * debian/control:
 - added two new packages: webkit-image-qt and webkit-image-gtk
+- bump debhelper dependency to = 7.3.3~
   * debian/rules rewritten to use dh7
 
- -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:36:26 +0200
+ -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:47:25 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3781995..a502a00 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,7 @@ Uploaders:
  , Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org
 Build-Depends:
  ant
- , cdbs
- , debhelper (= 5)
+ , debhelper (= 7.3.3~)
  , default-jdk
  , josm (= 0.0.svn3514)
  , libmetadata-extractor-java

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 611786d88b7899350007a84b8770de5dd5fa8503
Author: David Paleino da...@debian.org
Date:   Sun Oct 10 21:48:40 2010 +0200

debian/compat bumped to 8

diff --git a/debian/changelog b/debian/changelog
index 7765a42..cdace4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
 - added two new packages: webkit-image-qt and webkit-image-gtk
 - bump debhelper dependency to = 7.3.3~
   * debian/rules rewritten to use dh7
+  * debian/compat bumped to 8
 
- -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:47:25 +0200
+ -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:53:29 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 604fb92917eb541f16eab309f6d2e203e5b93c34
Author: David Paleino da...@debian.org
Date:   Sun Oct 10 21:49:00 2010 +0200

bump debhelper dependency to = 8~

diff --git a/debian/changelog b/debian/changelog
index cdace4c..dc87bbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,11 @@ josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
 
   * debian/control:
 - added two new packages: webkit-image-qt and webkit-image-gtk
-- bump debhelper dependency to = 7.3.3~
+- bump debhelper dependency to = 8~
   * debian/rules rewritten to use dh7
   * debian/compat bumped to 8
 
- -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:53:29 +0200
+ -- David Paleino da...@debian.org  Sun, 10 Oct 2010 21:48:51 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a502a00..4a9a9b1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders:
  , Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org
 Build-Depends:
  ant
- , debhelper (= 7.3.3~)
+ , debhelper (= 8~)
  , default-jdk
  , josm (= 0.0.svn3514)
  , libmetadata-extractor-java

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit e0c33cd7af8c5b517c5bc2541731368c30817b62
Author: David Paleino da...@debian.org
Date:   Sun Oct 10 22:00:44 2010 +0200

New upstream snapshot

diff --git a/debian/changelog b/debian/changelog
index c35c125..6a99760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
+josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot
   * debian/control:
 - added two new packages: webkit-image-qt and webkit-image-gtk
 
- -- David Paleino da...@debian.org  Mon, 13 Sep 2010 19:31:24 +0200
+ -- David Paleino da...@debian.org  Sun, 10 Oct 2010 22:00:30 +0200
 
 josm-plugins (0.0.svn23040-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.svn22363-1-37-gb3d3d09

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 44005c607f46d8d48a8d828e02505a8f321e9d0c
Merge: 604fb92917eb541f16eab309f6d2e203e5b93c34 
e0c33cd7af8c5b517c5bc2541731368c30817b62
Author: David Paleino da...@debian.org
Date:   Sun Oct 10 22:01:16 2010 +0200

Merge branch 'master' into dh7

Conflicts:
debian/changelog

diff --combined debian/changelog
index dc87bbd,6a99760..770dcae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,13 @@@
- josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
+ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
  
+   * New upstream snapshot
* debian/control:
  - added two new packages: webkit-image-qt and webkit-image-gtk
 +- bump debhelper dependency to = 8~
 +  * debian/rules rewritten to use dh7
 +  * debian/compat bumped to 8
  
-  -- David Paleino da...@debian.org  Sun, 10 Oct 2010 21:48:51 +0200
+  -- David Paleino da...@debian.org  Sun, 10 Oct 2010 22:00:30 +0200
  
  josm-plugins (0.0.svn23040-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.svn22363-1-37-gb3d3d09

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 8100c1a7a6dacfb595bb1c103491b82e22ad1581
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 22:36:44 2010 +0200

Fix debian/control for new packages

diff --git a/debian/control b/debian/control
index 9471224..a15fe89 100644
--- a/debian/control
+++ b/debian/control
@@ -67,6 +67,8 @@ Description: Plugins for JOSM
 
 Package: webkit-image-qt
 Architecture: any
+Depends: ${shlibs:Depends}
+ , ${misc:Depends}
 Description: generate images from webpages - Qt version
  webkit-image is a small tool that lets you generate images
  from web page snapshots.
@@ -75,8 +77,10 @@ Description: generate images from webpages - Qt version
 
 Package: webkit-image-gtk
 Architecture: any
+Depends: ${shlibs:Depends}
+ , ${misc:Depends}
 Description: generate images from webpages - GTK version
  webkit-image is a small tool that lets you generate images
  from web page snapshots.
  .
- This package contains the Qt version
+ This package contains the GTK version

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit ef5f65f6a3f6104a0609f108040858ae3d6e114e
Author: David Paleino da...@debian.org
Date:   Sun Oct 10 22:02:29 2010 +0200

debian/control: bumped dependencies on JOSM to 3592

diff --git a/debian/changelog b/debian/changelog
index 6a99760..0078cfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
   * New upstream snapshot
   * debian/control:
 - added two new packages: webkit-image-qt and webkit-image-gtk
+- bumped dependencies on JOSM to 3592
 
- -- David Paleino da...@debian.org  Sun, 10 Oct 2010 22:00:30 +0200
+ -- David Paleino da...@debian.org  Sun, 10 Oct 2010 22:02:18 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3781995..9471224 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,11 @@ Build-Depends:
  , cdbs
  , debhelper (= 5)
  , default-jdk
- , josm (= 0.0.svn3514)
+ , josm (= 0.0.svn3592)
  , libmetadata-extractor-java
  , liblog4j1.2-java
  , libjgrapht0.8-java
-Build-Conflicts: josm (= 0.0.svn3515)
+Build-Conflicts: josm (= 0.0.svn3593)
 Standards-Version: 3.9.1
 Homepage: http://josm.openstreetmap.de/wiki/Plugins
 Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git
@@ -26,11 +26,11 @@ Package: josm-plugins
 Architecture: all
 Depends:
  ${misc:Depends}
- , josm (= 0.0.svn3514)
+ , josm (= 0.0.svn3592)
  , libmetadata-extractor-java
  , liblog4j1.2-java
  , libjgrapht0.8-java
-Breaks: josm (= 0.0.svn3515)
+Breaks: josm (= 0.0.svn3593)
 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.svn22363-1-37-gb3d3d09

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit db6ef113177fe2ee48eb007288e3489a427ed3ef
Merge: 44005c607f46d8d48a8d828e02505a8f321e9d0c 
8100c1a7a6dacfb595bb1c103491b82e22ad1581
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 22:37:25 2010 +0200

Merge branch 'master' into dh7

Conflicts:
debian/changelog

diff --combined debian/changelog
index 770dcae,f374fbd..26ad2fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,11 -3,10 +3,13 @@@ josm-plugins (0.0.svn23479-1) UNRELEASE
* New upstream snapshot
* debian/control:
  - added two new packages: webkit-image-qt and webkit-image-gtk
 +- bump debhelper dependency to = 8~
+ - bumped dependencies on JOSM to 3592
 +  * debian/rules rewritten to use dh7
 +  * debian/compat bumped to 8
+   * debian/patches/60_wmsplugin.diff refreshed to cleanly apply
  
-  -- David Paleino da...@debian.org  Sun, 10 Oct 2010 22:00:30 +0200
+  -- David Paleino da...@debian.org  Sun, 10 Oct 2010 22:04:33 +0200
  
  josm-plugins (0.0.svn23040-1) unstable; urgency=low
  
diff --combined debian/control
index 4a9a9b1,a15fe89..b5edc63
--- a/debian/control
+++ b/debian/control
@@@ -9,13 -9,14 +9,13 @@@ Uploaders
   , Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org
  Build-Depends:
   ant
 - , cdbs
 - , debhelper (= 5)
 + , debhelper (= 8~)
   , default-jdk
-  , josm (= 0.0.svn3514)
+  , josm (= 0.0.svn3592)
   , libmetadata-extractor-java
   , liblog4j1.2-java
   , libjgrapht0.8-java
- Build-Conflicts: josm (= 0.0.svn3515)
+ Build-Conflicts: josm (= 0.0.svn3593)
  Standards-Version: 3.9.1
  Homepage: http://josm.openstreetmap.de/wiki/Plugins
  Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git
@@@ -25,11 -26,11 +25,11 @@@ Package: josm-plugin
  Architecture: all
  Depends:
   ${misc:Depends}
-  , josm (= 0.0.svn3514)
+  , josm (= 0.0.svn3592)
   , libmetadata-extractor-java
   , liblog4j1.2-java
   , libjgrapht0.8-java
- Breaks: josm (= 0.0.svn3515)
+ Breaks: josm (= 0.0.svn3593)
  Suggests: gpsd
  Description: Plugins for JOSM
   JOSM (Java OpenStreetMap) plugin collection.
@@@ -66,6 -67,8 +66,8 @@@
  
  Package: webkit-image-qt
  Architecture: any
+ Depends: ${shlibs:Depends}
+  , ${misc:Depends}
  Description: generate images from webpages - Qt version
   webkit-image is a small tool that lets you generate images
   from web page snapshots.
@@@ -74,8 -77,10 +76,10 @@@
  
  Package: webkit-image-gtk
  Architecture: any
+ Depends: ${shlibs:Depends}
+  , ${misc:Depends}
  Description: generate images from webpages - GTK version
   webkit-image is a small tool that lets you generate images
   from web page snapshots.
   .
-  This package contains the Qt version
+  This package contains the GTK version

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 2df9c519944e94e9c3da072cb6f0f52bf60203b5
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 22:47:54 2010 +0200

Fix debian/rules

diff --git a/debian/rules b/debian/rules
index a74e686..f8a0b89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,10 @@ DESTDIR := ../tarballs/josm-plugins-${VERSION}
 DESTTGZ := ../tarballs/josm-plugins_${VERSION}.orig.tar.gz
 
 %:
-   dh $@ --with ant
+   dh $@
 
 override_dh_auto_build:
-   and -f $(CURDIR)/debian/master.xml build
+   ant -f $(CURDIR)/debian/master.xml build
 
 override_dh_auto_clean:
ant -f $(CURDIR)/debian/master.xml clean

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 750d9c835b8120557f8ede2320387bbedc4be0a3
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 23:02:07 2010 +0200

Added Build-Depends for webkit-image-*

diff --git a/debian/control b/debian/control
index b5edc63..97e6765 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,12 @@ Build-Depends:
  , libmetadata-extractor-java
  , liblog4j1.2-java
  , libjgrapht0.8-java
+# webkit-image dependencies
+ , libqt4-dev
+ , libqtwebkit-dev
+ , qt4-qmake
+ , libwebkit-dev
+ , libglib2.0-dev
 Build-Conflicts: josm (= 0.0.svn3593)
 Standards-Version: 3.9.1
 Homepage: http://josm.openstreetmap.de/wiki/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-plugins branch, master, updated. debian/0.0.svn22363-1-37-gb3d3d09

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit c735ef900a2cd0268146d89d53c6bd99b3a2a71f
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 23:25:25 2010 +0200

Add webkit-image-* compilation steps

diff --git a/debian/changelog b/debian/changelog
index 26ad2fa..e89e5a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,13 @@ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
 - added two new packages: webkit-image-qt and webkit-image-gtk
 - bump debhelper dependency to = 8~
 - bumped dependencies on JOSM to 3592
-  * debian/rules rewritten to use dh7
+  * debian/rules:
+- rewritten to use dh7
+- add necessary steps to compile webkit-image-*
   * debian/compat bumped to 8
   * debian/patches/60_wmsplugin.diff refreshed to cleanly apply
 
- -- David Paleino da...@debian.org  Sun, 10 Oct 2010 22:04:33 +0200
+ -- David Paleino da...@debian.org  Tue, 12 Oct 2010 23:26:09 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index f8a0b89..3819149 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,17 @@ DESTTGZ := ../tarballs/josm-plugins_${VERSION}.orig.tar.gz
dh $@
 
 override_dh_auto_build:
-   ant -f $(CURDIR)/debian/master.xml build
+   dh_auto_build -Sant -- -f $(CURDIR)/debian/master.xml build
+   ( cd wmsplugin  \
+   moc webkit-image.cpp webkit-image.h  \
+   g++ -o webkit-image-qt -W -O2 $(shell pkg-config --cflags QtCore QtGui 
QtWebKit QtNetwork) \
+   $(shell pkg-config --libs-only-L QtCore QtGui QtWebKit 
QtNetwork) \
+   webkit-image.cpp \
+   $(shell pkg-config --libs-only-l QtCore QtGui QtWebKit 
QtNetwork)  \
+   gcc -o webkit-image-gtk webkit-image-gtk.c $(shell pkg-config --cflags 
--libs webkit-1.0 gio-unix-2.0) )
 
 override_dh_auto_clean:
-   ant -f $(CURDIR)/debian/master.xml clean
+   dh_auto_clean -Sant -- -f $(CURDIR)/debian/master.xml
 
 get-orig-source:
dh_testdir

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit fccc7795fdd72ac0974aa08b2b1e9cdc062e65c9
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 23:26:56 2010 +0200

debian/clean added, remove webkit-image-* compilation files

diff --git a/debian/changelog b/debian/changelog
index e89e5a6..cd7b60e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
 - add necessary steps to compile webkit-image-*
   * debian/compat bumped to 8
   * debian/patches/60_wmsplugin.diff refreshed to cleanly apply
+  * debian/clean added, remove webkit-image-* compilation files
 
- -- David Paleino da...@debian.org  Tue, 12 Oct 2010 23:26:09 +0200
+ -- David Paleino da...@debian.org  Tue, 12 Oct 2010 23:26:40 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..141c150
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+wmsplugin/webkit-image-qt
+wmsplugin/webkit-image-gtk
+wmsplugin/webkit-image.h

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit af2280ca1dde014ce3fee1a7c857a464e88cf43d
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 23:27:31 2010 +0200

debian/webkit-image-gtk.install debian/webkit-image-qt.install added, 
correctly install binaries into the new packages

diff --git a/debian/changelog b/debian/changelog
index cd7b60e..7a6a18e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
   * debian/compat bumped to 8
   * debian/patches/60_wmsplugin.diff refreshed to cleanly apply
   * debian/clean added, remove webkit-image-* compilation files
+  * debian/webkit-image-gtk.install debian/webkit-image-qt.install
+added, correctly install binaries into the new packages
 
- -- David Paleino da...@debian.org  Tue, 12 Oct 2010 23:26:40 +0200
+ -- David Paleino da...@debian.org  Tue, 12 Oct 2010 23:27:10 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/webkit-image-gtk.install b/debian/webkit-image-gtk.install
new file mode 100644
index 000..9fe469d
--- /dev/null
+++ b/debian/webkit-image-gtk.install
@@ -0,0 +1 @@
+wmsplugin/webkit-image-gtk usr/bin/
diff --git a/debian/webkit-image-qt.install b/debian/webkit-image-qt.install
new file mode 100644
index 000..beb5212
--- /dev/null
+++ b/debian/webkit-image-qt.install
@@ -0,0 +1 @@
+wmsplugin/webkit-image-qt  usr/bin/

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 79e6608d60652a3c940f63ed18477e43ad17f5c8
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 23:30:24 2010 +0200

Remove libqtwebkit-dev

diff --git a/debian/control b/debian/control
index 97e6765..0f67cdc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
  , libjgrapht0.8-java
 # webkit-image dependencies
  , libqt4-dev
- , libqtwebkit-dev
  , qt4-qmake
  , libwebkit-dev
  , libglib2.0-dev

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

2010-10-12 Thread David Paleino 
The following commit has been merged in the master branch:
commit 24f4908ccb91e2be3f5c1443334c19888b58184f
Author: David Paleino da...@debian.org
Date:   Tue Oct 12 23:36:32 2010 +0200

Fix descriptions

diff --git a/debian/control b/debian/control
index 0f67cdc..efc343b 100644
--- a/debian/control
+++ b/debian/control
@@ -77,14 +77,14 @@ Description: generate images from webpages - Qt version
  webkit-image is a small tool that lets you generate images
  from web page snapshots.
  .
- This package contains the Qt version
+ This package contains the Qt version.
 
 Package: webkit-image-gtk
 Architecture: any
 Depends: ${shlibs:Depends}
  , ${misc:Depends}
-Description: generate images from webpages - GTK version
+Description: generate images from webpages - GTK+ version
  webkit-image is a small tool that lets you generate images
  from web page snapshots.
  .
- This package contains the GTK version
+ This package contains the GTK+ version.

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