diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fdc6fb..1771e7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ build:x86_64: - git checkout debian - git merge master --no-edit - git am ../0001-Updated-to-3.5.1.patch + - git am ../0002-Debian-fixes-for-3.5.x.patch - git archive --format=tar HEAD |gzip -9 > ../${CI_PROJECT_NAME}_${VERSION}.orig.tar.gz - dpkg-buildpackage -us -uc - cd .. diff --git a/0001-Updated-to-3.5.1.patch b/0001-Updated-to-3.5.1.patch index 1953ab1..a01bcfc 100644 --- a/0001-Updated-to-3.5.1.patch +++ b/0001-Updated-to-3.5.1.patch @@ -1,14 +1,14 @@ -From 29ab248dd545a59c29347b4df97d174624c22a89 Mon Sep 17 00:00:00 2001 +From fda085d85fb1f2a97239244831d3c2da7916e344 Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 20 Aug 2019 13:00:00 +1000 -Subject: [PATCH] Updated to 3.5.1 +Subject: [PATCH 1/2] Updated to 3.5.1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog -index 7b3c09a..09362e8 100644 +index 0e3ca8a..6aeac82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ @@ -23,5 +23,5 @@ index 7b3c09a..09362e8 100644 TODO: -- -2.11.0 +2.16.5 diff --git a/0002-Debian-fixes-for-3.5.x.patch b/0002-Debian-fixes-for-3.5.x.patch new file mode 100644 index 0000000..3fc4b88 --- /dev/null +++ b/0002-Debian-fixes-for-3.5.x.patch @@ -0,0 +1,62 @@ +From 8254120d35dd64860211efab8f12c8d09d6da810 Mon Sep 17 00:00:00 2001 +From: Deon George +Date: Tue, 20 Aug 2019 14:10:36 +1000 +Subject: [PATCH 2/2] Debian fixes for 3.5.x + +--- + debian/makenl.docs | 5 +++-- + debian/makenl.examples | 21 ++++++++++----------- + debian/makenl.install | 4 ---- + 3 files changed, 13 insertions(+), 17 deletions(-) + +diff --git a/debian/makenl.docs b/debian/makenl.docs +index fbc04fd..dc00a88 100644 +--- a/debian/makenl.docs ++++ b/debian/makenl.docs +@@ -1,3 +1,4 @@ + debian/NEWS.Debian +-docs/makenl.txt +-docs/whatsnew.txt ++docs/makenl.md ++docs/whatsnew.md ++docs/readme.md +diff --git a/debian/makenl.examples b/debian/makenl.examples +index 2901818..110aba9 100644 +--- a/debian/makenl.examples ++++ b/debian/makenl.examples +@@ -1,11 +1,10 @@ +-docs/cpyright.txt +-docs/distrib.ctl +-docs/epilog.txt +-docs/hub.ctl +-docs/net-l.ctl +-docs/net-s.ctl +-docs/node.ctl +-docs/prolog.txt +-docs/read.me +-docs/regional.ctl +-docs/zone.ctl ++examples/cpyright.txt ++examples/distrib.ctl ++examples/epilog.txt ++examples/hub.ctl ++examples/net-l.ctl ++examples/net-s.ctl ++examples/node.ctl ++examples/prolog.txt ++examples/regional.ctl ++examples/zone.ctl +diff --git a/debian/makenl.install b/debian/makenl.install +index 41fccbc..2920928 100644 +--- a/debian/makenl.install ++++ b/debian/makenl.install +@@ -1,6 +1,2 @@ + debian/tmp/usr/bin/makenl usr/bin +-docs/felten.txt usr/share/doc/makenl/history +-docs/karcher.* usr/share/doc/makenl/history +-docs/read.me usr/share/doc/makenl/history +-docs/makenl.prn usr/share/doc/makenl/history + docs/fts-5000.txt usr/share/doc/makenl/history +-- +2.16.5 +