some unneedet work

8 files changed, 27 insertions, 114 deletions

diff --git a/debian/changelog b/debian/changelog
index bb75c0b..06bee36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ xtrkcad (1:4.3.0-1) unstable; urgency=medium
     - Add myself as uploader.
     - Use http for the homepage because https isn't available.
   * Declare compliance with Debian Policy 4.0.0. (No changes needed).
+  * New debian/patches/0001-webkit.patch (Closes: #790221):
+    - Change from outdated libwebkitgtk-1.0-0 to libwebkitgtk-3.0-0.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 24 Jun 2017 20:48:39 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 02 Jul 2017 17:36:42 +0200
 
 xtrkcad (1:4.2.4a-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index f800b3f..2c1f89d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Uploaders:
 Build-Depends:
  cmake,
  debhelper (>= 10),
- libgtk2.0-dev,
- libwebkitgtk-dev
+ libgtk-3-dev,
+# libwebkitgtk-3.0-dev
 Standards-Version: 4.0.0
 Homepage: http://xtrkcad.org/
 Vcs-Git: git://anonscm.debian.org/collab-maint/xtrkcad.git
diff --git a/debian/patches/0001-webkit.patch b/debian/patches/0001-webkit.patch
new file mode 100644
index 0000000..73338c1
--- /dev/null
+++ b/debian/patches/0001-webkit.patch
@@ -0,0 +1,19 @@
+Description: Change webkitgtk from 1 to 3.0.0
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790221
+Last-Update: 2017-07-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/CMakeLists.txt
+===================================================================
+--- trunk.orig/CMakeLists.txt
++++ trunk/CMakeLists.txt
+@@ -65,7 +65,7 @@ ENDIF(WIN32 AND NOT XTRKCAD_USE_GTK)
+ IF(XTRKCAD_USE_GTK)
+ 	INCLUDE(FindPkgConfig)
+ 	PKG_CHECK_MODULES(GTK REQUIRED "gtk+-2.0")
+-	PKG_CHECK_MODULES(GTK_WEBKIT REQUIRED "webkit-1.0")
++	PKG_CHECK_MODULES(GTK_WEBKIT REQUIRED "webkitgtk-3.0")
+ ENDIF(XTRKCAD_USE_GTK)
+ 
+ IF(XTRKCAD_USE_PACKAGEMAKER)
diff --git a/debian/patches/0700-info_file.patch b/debian/patches/0700-info_file.patch
deleted file mode 100644
index 4ccff25..0000000
--- a/debian/patches/0700-info_file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: add requested directory entry and INFO-DIR-SECTION
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/164/
-Last-Update: 2016-12-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/app/help/xtrkcad.info
-===================================================================
---- trunk.orig/app/help/xtrkcad.info
-+++ trunk/app/help/xtrkcad.info
-@@ -1,3 +1,8 @@
-+INFO-DIR-SECTION CAD
-+START-INFO-DIR-ENTRY
-+* xtrkcad: xtrkcad-4.2.4.   Model Train Track CAD Program
-+END-INFO-DIR-ENTRY
-+
- :Help
- Invokes on-line help for this dialog
- :cancel
-@@ -1099,3 +1104,4 @@ Layer
- :cmdLayerShow19
- Layer
- :
-+
diff --git a/debian/patches/0705-help_path.patch b/debian/patches/0705-help_path.patch
deleted file mode 100644
index ac5e463..0000000
--- a/debian/patches/0705-help_path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Change help html directory to the installation specific
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: not-needed
-Last-Update: 2017-01-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/app/wlib/gtklib/gtkhelp.c
-===================================================================
---- trunk.orig/app/wlib/gtklib/gtkhelp.c
-+++ trunk/app/wlib/gtklib/gtkhelp.c
-@@ -677,8 +677,12 @@ EXPORT void wHelp( const char * topic )
- 		directory = malloc( BUFSIZ );
- 		assert( directory != NULL );
- 			
--		sprintf( directory, "%s/html/", wGetAppLibDir());
--		
-+/*		sprintf( directory, "%s/html/", wGetAppLibDir());*/
-+/*
-+ * Change path for debian installation
-+ *
-+ */
-+		sprintf( directory, "%s/html/", "/usr/share/doc/xtrkcad-common");
- 		wHelpWindow = CreateHelpWindow();
- 		/* load the default content */
- 		load_into_view ("index.html", MAIN_VIEW);
diff --git a/debian/patches/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch
deleted file mode 100644
index 7570f18..0000000
--- a/debian/patches/0900-spelling-errors.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Correct some typos
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/165/
-Last-Update: 2016-12-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/app/help/genhelp.in
-===================================================================
---- trunk.orig/app/help/genhelp.in
-+++ trunk/app/help/genhelp.in
-@@ -346,7 +346,7 @@ draw-benchorient	Orientation of Benchwor
- draw-arrowsize	Size of Dimension Arrows	cmdDraw
- #
- easement-val	This controls the sharpness of the easement curve	cmdEasement
--easement-r	Minumum radius	cmdEasement
-+easement-r	Minimum radius	cmdEasement
- easement-x	Maximum offset	cmdEasement
- easement-l	Easement length	cmdEasement
- easement-radio	These radio buttons are a short-cut for Values of 0.0, 0.5, 1.0 and 2.0.  None turns Easements off	cmdEasement
-Index: trunk/app/i18n/fi.po
-===================================================================
---- trunk.orig/app/i18n/fi.po
-+++ trunk/app/i18n/fi.po
-@@ -5702,7 +5702,7 @@ msgid "Mint"
- msgstr "Loistava"
- 
- #: ../../../../build/xtrkcad/app/bin/bllnhlp.c:298
--msgid "Minumum radius"
-+msgid "Minimum radius"
- msgstr "Pienin karresäde"
- 
- #: ../../../../build/xtrkcad/app/i18n/custmsg.h:41
-Index: trunk/app/i18n/pt_BR.po
-===================================================================
---- trunk.orig/app/i18n/pt_BR.po
-+++ trunk/app/i18n/pt_BR.po
-@@ -7210,7 +7210,7 @@ msgid "This controls the sharpness of th
- msgstr ""
- 
- #: ../../../../xtrkcad-build/app/bin/bllnhlp.c:297
--msgid "Minumum radius"
-+msgid "Minimum radius"
- msgstr ""
- 
- #: ../../../../xtrkcad-build/app/bin/bllnhlp.c:298
-Index: trunk/app/i18n/de_DE.po
-===================================================================
---- trunk.orig/app/i18n/de_DE.po
-+++ trunk/app/i18n/de_DE.po
-@@ -6814,7 +6814,7 @@ msgid "This controls the sharpness of th
- msgstr "Steuert die Größe des Übergangsradius"
- 
- #: ../../../build/xtc_4-2-3dev/app/bin/bllnhlp.c:306
--msgid "Minumum radius"
-+msgid "Minimum radius"
- msgstr "Mindestgleisradius"
- 
- #: ../../../build/xtc_4-2-3dev/app/bin/bllnhlp.c:307
diff --git a/debian/patches/series b/debian/patches/series
index f47597d..73eb1c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-#0900-spelling-errors.patch
-#0700-info_file.patch
+#1.diff
 0100-gtk.patch
-#0705-help_path.patch
+#0001-webkit.patch
diff --git a/debian/watch b/debian/watch
index 57a7da5..9836eaa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
 #opts="downloadurlmangle=s/$/\//,filenamemangle=s/$//" \
-  http://sf.net/xtrkcad-fork/ xtrkcad-source-(\d\S+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+  http://sf.net/xtrkcad-fork/ xtrkcad-source-(\d\.\d\.\d)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))