diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:42 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:42 +0200 |
| commit | 39afa51ee39ec2ca95c25aee31807c1032dd4249 (patch) | |
| tree | 5550610553d1b1d7236d052b6e956b22e0bb4883 | |
| parent | eea1d049dbbaf92013747c6803c6639c92fc629e (diff) | |
| parent | c120c7bcbcf115ecc2a6668f4c7f45b3d4a5bc86 (diff) | |
Merge tag 'debian/5.1.1-1' into develop
new upstream release
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/patches/0100-messages_h.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 35 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 834edb7..b6b6401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,23 @@ -xtrkcad (1:5.1.1-1) UNRELEASED; urgency=medium +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 artefacte. + - 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> Sat, 05 May 2018 18:22:45 +0200 + -- 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 diff --git a/debian/control b/debian/control index 5ff9bb0..ae0965a 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,9 @@ Build-Depends: libgtk2.0-dev 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/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/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 |