[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn24632-1-17-g3ebfe73

[David Paleino]

The following commit has been merged in the master branch:
commit bd253a205d4ed31344aafad029232e25cddd2af5
Author: David Paleino <dapal at debian.org>
Date:   Sat Jan 1 23:22:49 2011 +0100

    debian/patches/170-fix_webkitimagegtk.patch removed

diff --git a/debian/changelog b/debian/changelog
index 5090be4..ba56f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ josm-plugins (0.0.svn24925-1) UNRELEASED; urgency=low
   * debian/webkit-image* removed, they're being moved to a new source
     package
   * debian/control: removed any reference to webkit-image-*
+  * debian/patches/170-fix_webkitimagegtk.patch removed
 
- -- David Paleino <dapal at debian.org>  Sat, 01 Jan 2011 23:21:48 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 01 Jan 2011 23:22:39 +0100
 
 josm-plugins (0.0.svn24632-1) unstable; urgency=low
 
diff --git a/debian/patches/170-fix_webkitimagegtk.patch b/debian/patches/170-fix_webkitimagegtk.patch
deleted file mode 100644
index 8e6e1a5..0000000
--- a/debian/patches/170-fix_webkitimagegtk.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: don't use a fixed width/height for the output
-Origin: vendor
-Forwarded: no
-
----
- wmsplugin/webkit-image-gtk.c |    3 ---
- 1 file changed, 3 deletions(-)
-
---- josm-plugins.orig/wmsplugin/webkit-image-gtk.c
-+++ josm-plugins/wmsplugin/webkit-image-gtk.c
-@@ -5,8 +5,6 @@
- #include <gio/gunixoutputstream.h>
- #include <webkit/webkit.h>
- 
--#define WIDTH 2000
--
- /* compile with:
-  * gcc -o webkit-image-gtk webkit-image-gtk.c `pkg-config --cflags --libs webkit-1.0 gio-unix-2.0`
-  * Requires GTK+ 2.20 and WebKitGtk+ 1.1.1
-@@ -44,7 +42,6 @@ main (int    argc,
- 
- 	view = webkit_web_view_new ();
- 	webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view), argv[1]);
--	gtk_widget_set_size_request (view, WIDTH, WIDTH);
- 	gtk_container_add (GTK_CONTAINER (window), view);
- 
- 	gtk_widget_show_all (window);
diff --git a/debian/patches/series b/debian/patches/series
index 9caa9c1..10a41f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
 80_measurement.diff
 20_livegps.diff
 10_colorscheme.diff
-170-fix_webkitimagegtk.patch

-- 
Plugins for josm