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

[David Paleino]

The following commit has been merged in the master branch:
commit c735ef900a2cd0268146d89d53c6bd99b3a2a71f
Author: David Paleino <dapal at 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 <dapal at debian.org>  Sun, 10 Oct 2010 22:04:33 +0200
+ -- David Paleino <dapal at 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