7 files changed, 78 insertions, 7 deletions
diff --git a/debian/README.source b/debian/README.source
index 987a1c4..0c2750a 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,3 +4,24 @@ xtrkcad for Debian sources
 Note that as this project uses cmake, the package uses a separate intermediary
 folder, build, for actual construction. This directory is then removed in
 the clean step. Be careful to make any changes above this temporary directory.
+
+##########################
+
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 02 Jun 2017 19:00:40 +0200
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
diff --git a/debian/changelog b/debian/changelog
index 0b0ca17..b6b6401 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xtrkcad (1:5.1.1-2) UNRELEASED; urgency=medium
+
+  * New debian/patches/0100-messages_h.patch:
+    - Fix FTBFS at mipsel.
+  * debian/control:
+    - Switch Vcs-* to new location.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Tue, 10 Jul 2018 22:48:28 +0200
+
+xtrkcad (1:5.1.1-1) unstable; urgency=medium
+
+  [ Jörg Frings-Fürst ]
+  * New upstream release.
+    - Refresh patches.
+    - Remove upstream build artefacts.
+  * Declare compliance with Debian Policy 4.1.4 (No changes needed).
+  * README.source:
+    - Add section to explain the branching model used.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 06 May 2018 10:26:16 +0200
+
 xtrkcad (1:5.1.0-1) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
diff --git a/debian/control b/debian/control
index 67ab54b..ae0965a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,11 @@ Build-Depends:
  cmake,
  debhelper (>= 11),
  libgtk2.0-dev
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Homepage: http://xtrkcad.org/
-Vcs-Git: git://anonscm.debian.org/collab-maint/xtrkcad.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xtrkcad.git
+Vcs-Git: git://jff.email/opt/git/xtrkcad.git
+Vcs-Browser: https://jff.email/cgit/xtrkcad.git/
+
 
 Package: xtrkcad
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 1fa90d6..ea3ccd7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,15 @@ 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
+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
diff --git a/debian/patches/0100-messages_h.patch b/debian/patches/0100-messages_h.patch
new file mode 100644
index 0000000..612288c
--- /dev/null
+++ b/debian/patches/0100-messages_h.patch
@@ -0,0 +1,19 @@
+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 e3cef33..e38b90b 100644
--- a/debian/patches/0900-spelling-errors.patch
+++ b/debian/patches/0900-spelling-errors.patch
@@ -102,7 +102,7 @@ Index: trunk/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") },
+     /*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") },
@@ -115,7 +115,7 @@ Index: trunk/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") },
+     /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)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") },
@@ -128,7 +128,7 @@ Index: trunk/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") },
+     /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)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 c6c3550..8725218 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0900-spelling-errors.patch
+0100-messages_h.patch