Merge debian/watchdebian/1_5.1.2a-1

11 files changed, 43 insertions, 69 deletions

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..cf83e69
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,7 @@
+xtrkcad (1:4.2.4a-1) unstable; urgency=medium
+
+  With this release xtrkcad are spilt into two packages.
+  The new xtrkcad-common contains the demos, examples and the params
+  directories. The new package also include the html documentation.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 02 Jan 2017 06:58:26 +0100
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644
index 1f018f3..0000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,7 +0,0 @@
-xtrkcad (1:4.2.4a-1) unstable; urgency=medium
-
- With this release xtrkcad are spilt into two packages.
- The new xtrkcad-common contains the demos, examples and the params
- directories. The new package also include the html documentation.
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 02 Jan 2017 06:58:26 +0100
diff --git a/debian/changelog b/debian/changelog
index 17ffbc4..8e06c20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+xtrkcad (1:5.1.2a-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Remove upstream applied debian/patches/0100-messages_h.patch.
+    - Refresh debian/patches/0900-spelling-errors.patch.
+  * Rename NEWS.Debian to NEWS.
+  * Declare compliance with Debian Policy 4.5.0 (No changes needed).
+  * Switch to debhelper-compat:
+    - debian/control: change to debhelper-compat (=13).
+    - remove debian/compat.
+  * debian/copyright:
+    - Remove File-Excluded.
+    - Add year 2020 to myself.
+  * debian/watch:
+    - Fix syntax.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 27 May 2020 22:14:59 +0200
+
 xtrkcad (1:5.1.1-2) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 482cb1c..f44f903 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,10 @@ Uploaders:
  Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  cmake,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  libgtk2.0-dev
-Standards-Version: 4.1.5
+Rules-Requires-Root: no
+Standards-Version: 4.5.0
 Homepage: http://xtrkcad.org/
 Vcs-Git: git://jff.email/opt/git/xtrkcad.git
 Vcs-Browser: https://jff.email/cgit/xtrkcad.git/
diff --git a/debian/copyright b/debian/copyright
index ea3ccd7..dcd7cfe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: XTrkCAD
 Upstream-Contact: XTrkCAD Developers <xtrkcad-fork-developers@lists.sourceforge.net>
 Source: http://sourceforge.net/projects/xtrkcad-fork/
-Files-Excluded: .hgtags .hgignore CMakeCache.txt cmake_install.cmake
- CPackConfig.cmake xtrkcad-config.h Makefile CTestTestfile.cmake
- compile_commands.json CPackSourceConfig.cmake CMakeFiles/feature_tests.bin
- CMakeFiles/3.6.2/CMakeDetermineCompilerABI_C.bin
- CMakeFiles/3.6.2/CMakeDetermineCompilerABI_CXX.bin
- CMakeFiles/3.6.2/CompilerIdC/a.out CMakeFiles/3.6.2/CompilerIdCXX/a.out
- CMakeFiles/CMakeTmp app/bin/unittest/CMakeFiles/dxfformattest.dir/__
- app/doc/html app/i18n/de_DE/LC_MESSAGES app/i18n/fi/LC_MESSAGES
- app/i18n/pt_BR/LC_MESSAGES app/i18n/de_DE app/i18n/fi app/i18n/pt_BR
 
 Files: *
 Copyright: 2003      Sillub Technology
@@ -84,7 +75,7 @@ License: public-domain
 
 Files: debian/*
 Copyright: 2015      Daniel E. Markle <dmarkle@ashtech.net>
-           2016-2018 Jörg Frings-Fürst <debian@jff.email>
+           2016-2020 Jörg Frings-Fürst <debian@jff.email>
            2016-2017 Mike Gabriel <sunweaver@debian.org>
 License: GPL-2+
 
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..b4f60d8
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,7 @@
+usr/share/locale/pt_BR/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 
+usr/share/applications/xtrkcad.desktop
+usr/share/xtrkcad/xdg-open 
+usr/share/xtrkcad/COPYING
diff --git a/debian/patches/0100-messages_h.patch b/debian/patches/0100-messages_h.patch
deleted file mode 100644
index 612288c..0000000
--- a/debian/patches/0100-messages_h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: correct include tag
-Author: Jörg Frings-Fürst <debian@jff.email>
-Forwarded: yes, via email
-Last-Update: 2018-07-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/app/bin/ctodesgn.c
-===================================================================
---- trunk.orig/app/bin/ctodesgn.c
-+++ trunk/app/bin/ctodesgn.c
-@@ -29,7 +29,7 @@
- #include <ctype.h>
- #include <math.h>
- #include <string.h>
--#include <messages.h>
-+#include "messages.h"
- 
- #include "ccurve.h"
- #include "compound.h"
diff --git a/debian/patches/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch
index e38b90b..681a034 100644
--- a/debian/patches/0900-spelling-errors.patch
+++ b/debian/patches/0900-spelling-errors.patch
@@ -34,16 +34,7 @@ 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"
+@@ -6985,7 +6985,7 @@ msgid "Copy objects from clipboard"
  msgstr "Objekte von der Zwischenablage kopieren"

  

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

@@ -96,26 +87,13 @@ Index: trunk/app/i18n/pt_BR.po
  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 | PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)sizeof(controlEditName) },
- #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[] = {
+@@ -371,7 +371,7 @@ static paramData_t sensorEditPLs[] = {
  #define I_SENSORNAME (0)
-     /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)sizeof(sensorEditName) },
+     /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(sensorEditName)},
  #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") },
@@ -126,9 +104,9 @@ 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[] = {
+@@ -491,7 +491,7 @@ static paramData_t signalEditPLs[] = {
  #define I_SIGNALNAME (0)
-     /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)sizeof(signalEditName) },
+     /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(signalEditName)},
  #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") },
diff --git a/debian/patches/series b/debian/patches/series
index 8725218..c6c3550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0900-spelling-errors.patch
-0100-messages_h.patch
diff --git a/debian/watch b/debian/watch
index f9a42df..30762c2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-#opts="downloadurlmangle=s/$/\//,filenamemangle=s/$//" \
-  https://sf.net/xtrkcad-fork/ xtrkcad-source-(\d\.\d\.\d)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+opts="downloadurlmangle=s/$/\//,filenamemangle=s/$//" \
+  https://sf.net/xtrkcad-fork/ xtrkcad-source-@ANY_VERSION@@ARCHIVE_EXT@