summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-05-27 18:38:21 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-05-27 18:38:21 +0200
commitbcd29e56b59af7d73cf8792d854458cbf2917923 (patch)
tree607684fa2e32cb5c485db7888e78928953d25336
parent2eff044b4d1b11fec49c1e44812cde1cb844b6a9 (diff)
Refresh and remove patches
-rw-r--r--.pc/.quilt_patches1
-rw-r--r--.pc/.quilt_series1
-rw-r--r--.pc/.version1
-rw-r--r--debian/NEWS6
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
-rw-r--r--debian/not-installed7
-rw-r--r--debian/patches/0100-messages_h.patch19
-rw-r--r--debian/patches/0900-spelling-errors.patch32
-rw-r--r--debian/patches/series3
10 files changed, 22 insertions, 52 deletions
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/NEWS b/debian/NEWS
index 1f018f3..cf83e69 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,7 +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.
+ 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 356f8da..bddf858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xtrkcad (1:5.1.2a-1) UNRELEASED; 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:
diff --git a/debian/control b/debian/control
index 3aa4e39..7eb615f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Jörg Frings-Fürst <debian@jff.email>
Build-Depends:
cmake,
- debhelper-compat (>= 13),
+ debhelper-compat (= 13),
libgtk2.0-dev
Standards-Version: 4.5.0
Homepage: http://xtrkcad.org/
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 01c701e..c6c3550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-#0900-spelling-errors.patch
-#0100-messages_h.patch
+0900-spelling-errors.patch