Some work with new upstream release

9 files changed, 25 insertions, 97 deletions

diff --git a/debian/changelog b/debian/changelog
index 8e06c20..57021d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+xtrkcad (1:5.2.0Beta2.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * New debian/xtrkcad-common.lintian-overrides:
+    - Add national-encoding (xtr are data files).
+  * Remove file to use upstream ones:
+    - debian/xtrkcad.desktop
+    - xtrkcad.desktop
+  * debian/rules: 
+    - Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error
+      "multiple definition" (Closes: #958005).
+  * Refresh patches:
+    - debian/patches/0900-spelling-errors.patch.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 08 Aug 2020 11:53:23 +0200
+
 xtrkcad (1:5.1.2a-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f44f903..f9621c4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Uploaders:
 Build-Depends:
  cmake,
  debhelper-compat (= 13),
- libgtk2.0-dev
+ libgtk2.0-dev,
+ libzip-dev
 Rules-Requires-Root: no
 Standards-Version: 4.5.0
 Homepage: http://xtrkcad.org/
diff --git a/debian/info b/debian/info
deleted file mode 100644
index ddc57ff..0000000
--- a/debian/info
+++ /dev/null
@@ -1 +0,0 @@
-app/help/xtrkcad.info
diff --git a/debian/not-installed b/debian/not-installed
index b4f60d8..6e2f846 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,4 +1,5 @@
 usr/share/locale/pt_BR/LC_MESSAGES/xtrkcad.mo
+usr/share/locale/fr_FR/LC_MESSAGES/xtrkcad.mo
 usr/share/locale/fi/LC_MESSAGES/xtrkcad.mo
 usr/share/locale/de_DE/LC_MESSAGES/xtrkcad.mo
 usr/share/pixmaps/xtrkcad.png 
diff --git a/debian/patches/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch
index 681a034..39ac3e9 100644
--- a/debian/patches/0900-spelling-errors.patch
+++ b/debian/patches/0900-spelling-errors.patch
@@ -4,94 +4,11 @@ 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
-@@ -6985,7 +6985,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/csensor.c
 ===================================================================
 --- trunk.orig/app/bin/csensor.c
 +++ trunk/app/bin/csensor.c
-@@ -371,7 +371,7 @@ static paramData_t sensorEditPLs[] = {
+@@ -388,7 +388,7 @@ static paramData_t sensorEditPLs[] = {
  #define I_SENSORNAME (0)
      /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(sensorEditName)},
  #define I_ORIGX (1)
@@ -104,7 +21,7 @@ Index: trunk/app/bin/csignal.c
 ===================================================================
 --- trunk.orig/app/bin/csignal.c
 +++ trunk/app/bin/csignal.c
-@@ -491,7 +491,7 @@ static paramData_t signalEditPLs[] = {
+@@ -508,7 +508,7 @@ static paramData_t signalEditPLs[] = {
  #define I_SIGNALNAME (0)
      /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(signalEditName)},
  #define I_ORIGX (1)
diff --git a/debian/rules b/debian/rules
index 7bfa15d..fe59e52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 
 # hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND =  -Wl,--allow-multiple-definition 
 
 %:
 	dh $@
diff --git a/debian/xtrkcad-common.lintian-overrides b/debian/xtrkcad-common.lintian-overrides
new file mode 100644
index 0000000..362d6fb
--- /dev/null
+++ b/debian/xtrkcad-common.lintian-overrides
@@ -0,0 +1 @@
+national-encoding
diff --git a/debian/xtrkcad.desktop b/debian/xtrkcad.desktop
deleted file mode 100644
index 25c384c..0000000
--- a/debian/xtrkcad.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=XTrkCAD
-Comment=Model Railroad CAD
-Keywords=train;railroad;cad;model
-Icon=/usr/share/xtrkcad/logo.bmp
-Exec=xtrkcad
-Categories=Graphics
diff --git a/debian/xtrkcad.install b/debian/xtrkcad.install
index fee34e7..b7f9538 100644
--- a/debian/xtrkcad.install
+++ b/debian/xtrkcad.install
@@ -1,3 +1,4 @@
-debian/xtrkcad.desktop           usr/share/applications
+usr/share/xtrkcad/applications/xtrkcad.desktop           usr/share/applications
 usr/share/xtrkcad/logo.bmp       usr/share/doc/xtrkcad
+usr/share/xtrkcad/pixmaps/xtrkcad.png	usr/share/doc/xtrkcad
 usr/bin/*