diff options
| author | Matthew Vernon <matthew@debian.org> | 2019-09-28 16:50:02 +0100 |
|---|---|---|
| committer | Matthew Vernon <matthew@debian.org> | 2019-09-28 16:50:02 +0100 |
| commit | 9489a7315b1fda4a374f508d15c72f1b1702e408 (patch) | |
| tree | c94a30c2421edf002bf11280a0ebc56f5a34187b | |
| parent | 686dab32fc92b6ad5ee4fecc9474df3abfb31a16 (diff) | |
| parent | 6295fc2ec50d6bb0e6b22304de72361c007746bd (diff) | |
Merge branch 'debian/5.1' into debian/6.0
Conflicts were around version numbers, essentially. Those in
debian/rules and debian/changelog should go upstream.
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 72fd246..c569c7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,18 @@ rsbackup (6.0) unstable; urgency=medium -- Richard Kettlewell <rjk@greenend.org.uk> Sat, 07 Sep 2019 09:38:31 +0100 +rsbackup (5.1-1) unstable; urgency=medium + + * New upstream version (Closes: #908644) + + -- Matthew Vernon <matthew@debian.org> Mon, 08 Oct 2018 20:26:07 +0100 + +rsbackup (5.1) stable; urgency=medium + + * Release 5.1 + + -- Richard Kettlewell <rjk@greenend.org.uk> Fri, 27 Jul 2018 18:34:15 +0100 + rsbackup (5.0-2) unstable; urgency=medium * Upstream patch to workaround sigc++ build failure on GCC 8 (Closes: diff --git a/debian/rules b/debian/rules index 47b1bd0..551ef71 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. INSTALL=install -VERSION=5.0 +VERSION=6.0 STRIPARGS=--strip-unneeded --remove-section=.comment --remove-section=.note export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -66,7 +66,7 @@ binary-rsbackup: build cp debian/changelog debian/rsbackup/usr/share/doc/rsbackup/changelog.Debian cp debian/doc.rsbackup debian/rsbackup/usr/share/doc-base/rsbackup cp README.md debian/rsbackup/usr/share/doc/rsbackup/. - lynx -dump -nolist doc/CHANGES.html > debian/rsbackup/usr/share/doc/rsbackup/changelog + LC_ALL=C.UTF-8 lynx -dump -nolist doc/CHANGES.html > debian/rsbackup/usr/share/doc/rsbackup/changelog gzip -9nv debian/rsbackup/usr/share/doc/rsbackup/* cp doc/*.html doc/*.css debian/rsbackup/usr/share/doc/rsbackup/. cp debian/copyright debian/rsbackup/usr/share/doc/rsbackup/. |