Refresh patches; add missing .gitignore

8 files changed, 143 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0ff0ae9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.pc
+debian/files
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/changelog b/debian/changelog
index 4544c7f..793ac11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ xtrkcad (1:5.1.0-1) unstable; urgency=medium
   [ Jörg Frings-Fürst ]
   * New upstream release.
     - Remove from the upstream applied patches:
-      + debian/patches/0900-spelling-errors.patch
       + debian/patches/0700-info_file.patch
       + debian/patches/0705-help_path.patch
       + debian/patches/0100-gtk.patch
+    - Refresh patches:
+      + debian/patches/0900-spelling-errors.patch
     - Refresh debian/copyright.
     - debian/xtrkcad.docs: Rename Readme.txt to Readme.md.
     - debian/xtrkcad.install: Remove Readme.txt.
diff --git a/debian/control b/debian/control
index a39b35d..93b2e91 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Uploaders:
 Build-Depends:
  cmake,
  debhelper (>= 11),
- libgtk2.0-dev,
-#libwebkitgtk-3.0-dev
+ libgtk2.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/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch
new file mode 100644
index 0000000..e3cef33
--- /dev/null
+++ b/debian/patches/0900-spelling-errors.patch
@@ -0,0 +1,137 @@
+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: 2018-03-19
+---
+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
+@@ -112,7 +112,7 @@ cmdPan	Pan or Zoom the Layout
+ cmdParallel	Create a parallel track
+ cmdParameter	Register	register
+ cmdPaste	Copy objects from clipboard
+-cmdPref	Perferences dialog
++cmdPref	Preferences dialog
+ cmdPricelist	Display prices of turnouts, sectional tracks and structures
+ cmdPrint	Print the layout
+ cmdPrmfile	Loads and unloads parameter files
+Index: trunk/app/help/xtrkcad.info
+===================================================================
+--- trunk.orig/app/help/xtrkcad.info
++++ trunk/app/help/xtrkcad.info
+@@ -176,7 +176,7 @@ Register
+ :cmdPaste
+ Copy objects from clipboard
+ :cmdPref
+-Perferences dialog
++Preferences dialog
+ :cmdPricelist
+ Display prices of turnouts, sectional tracks and structures
+ :cmdPrint
+Index: trunk/app/i18n/de_DE.po
+===================================================================
+--- trunk.orig/app/i18n/de_DE.po
++++ trunk/app/i18n/de_DE.po
+@@ -390,7 +390,7 @@ msgid "Control"
+ msgstr "Steuerung"

+ 

+ #: ../bin/ccontrol.c:386 ../bin/csensor.c:358 ../bin/csignal.c:486

+-msgid "Orgin X"

++msgid "Origin X"

+ msgstr "Ausgangspunkt: X"

+ 

+ #: ../bin/ccontrol.c:388 ../bin/csensor.c:360 ../bin/csignal.c:488

+@@ -6977,7 +6977,7 @@ msgid "Copy objects from clipboard"
+ msgstr "Objekte von der Zwischenablage kopieren"

+ 

+ #: ../../../../build/work/app/bin/bllnhlp.c:100

+-msgid "Perferences dialog"

++msgid "Preferences dialog"

+ msgstr "Einstellungen"

+ 

+ #: ../../../../build/work/app/bin/bllnhlp.c:101

+Index: trunk/app/i18n/fi.po
+===================================================================
+--- trunk.orig/app/i18n/fi.po
++++ trunk/app/i18n/fi.po
+@@ -390,7 +390,7 @@ msgstr "Junien hallinta"
+ 
+ #: ../bin/ccontrol.c:386 ../bin/csensor.c:358 ../bin/csignal.c:486
+ #, fuzzy
+-msgid "Orgin X"
++msgid "Origin X"
+ msgstr "Marginaali"
+ 
+ #: ../bin/ccontrol.c:388 ../bin/csensor.c:360 ../bin/csignal.c:488
+@@ -6843,7 +6843,7 @@ msgid "Copy objects from clipboard"
+ msgstr "Liitä objektit leikepöydältä"
+ 
+ #: ../../../../build/work/app/bin/bllnhlp.c:99
+-msgid "Perferences dialog"
++msgid "Preferences dialog"
+ msgstr "Ominaisuudet"
+ 
+ #: ../../../../build/work/app/bin/bllnhlp.c:100
+Index: trunk/app/i18n/pt_BR.po
+===================================================================
+--- trunk.orig/app/i18n/pt_BR.po
++++ trunk/app/i18n/pt_BR.po
+@@ -389,7 +389,7 @@ msgstr "Controle de trem"
+ 
+ #: ../bin/ccontrol.c:386 ../bin/csensor.c:358 ../bin/csignal.c:486
+ #, fuzzy
+-msgid "Orgin X"
++msgid "Origin X"
+ msgstr "Margem"
+ 
+ #: ../bin/ccontrol.c:388 ../bin/csensor.c:360 ../bin/csignal.c:488
+@@ -6680,7 +6680,7 @@ msgid "Copy objects from clipboard"
+ msgstr "Copia objetos da área de transferencia"
+ 
+ #: ../../../../build/work/app/bin/bllnhlp.c:99
+-msgid "Perferences dialog"
++msgid "Preferences dialog"
+ msgstr "Caixa de diálogo de preferências"
+ 
+ #: ../../../../build/work/app/bin/bllnhlp.c:100
+Index: trunk/app/bin/ccontrol.c
+===================================================================
+--- trunk.orig/app/bin/ccontrol.c
++++ trunk/app/bin/ccontrol.c
+@@ -383,7 +383,7 @@ static paramData_t controlEditPLs[] = {
+ #define I_CONTROLNAME (0)
+     /*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF, (void*)200, N_("Name") },
+ #define I_ORIGX (1)
+-    /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, 
++    /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") },
+ #define I_ORIGY (2)
+     /*2*/ { PD_FLOAT, &controlEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") },
+ #define I_CONTROLONSCRIPT (3)
+Index: trunk/app/bin/csensor.c
+===================================================================
+--- trunk.orig/app/bin/csensor.c
++++ trunk/app/bin/csensor.c
+@@ -355,7 +355,7 @@ static paramData_t sensorEditPLs[] = {
+ #define I_SENSORNAME (0)
+     /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF, (void*)200, N_("Name") },
+ #define I_ORIGX (1)
+-    /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, 
++    /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") },
+ #define I_ORIGY (2)
+     /*2*/ { PD_FLOAT, &sensorEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") },
+ #define I_SENSORSCRIPT (3)
+Index: trunk/app/bin/csignal.c
+===================================================================
+--- trunk.orig/app/bin/csignal.c
++++ trunk/app/bin/csignal.c
+@@ -483,7 +483,7 @@ static paramData_t signalEditPLs[] = {
+ #define I_SIGNALNAME (0)
+     /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF, (void*)200, N_("Name") },
+ #define I_ORIGX (1)
+-    /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, 
++    /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") },
+ #define I_ORIGY (2)
+     /*2*/ { PD_FLOAT, &signalEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") },
+ #define I_ANGLE (3)
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c6c3550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0900-spelling-errors.patch