diff options
| author | Matthew Vernon <matthew@debian.org> | 2018-10-08 20:22:23 +0100 |
|---|---|---|
| committer | Matthew Vernon <matthew@debian.org> | 2018-10-08 20:22:23 +0100 |
| commit | e3a92cc3708c941f910cf9ce068c6ba4fdf9c09c (patch) | |
| tree | e2946993e110f0ffd7d7b8563628adb386b806aa | |
| parent | 223833ea3abf7e785b90f8b5242ec872ab9c58d4 (diff) | |
| parent | 69eafcb5ccb27da1f4eff6a2a90e6cd4cf4a3c49 (diff) | |
resolve changelog conflict
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control index e957201..f771e48 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Priority: optional Standards-Version: 3.9.5.0 Section: admin Homepage: http://www.greenend.org.uk/rjk/rsbackup/ -Build-Depends: lynx|lynx-cur,devscripts,sqlite3,libsqlite3-dev,libboost-system-dev,libboost-filesystem-dev,libboost-dev,pkg-config,libpangomm-1.4-dev,libcairomm-1.0-dev,xattr,acl,bash +Build-Depends: lynx|lynx-cur,devscripts,sqlite3,libsqlite3-dev,libboost-system-dev,libboost-filesystem-dev,libboost-dev,pkg-config,libpangomm-1.4-dev,libcairomm-1.0-dev,xattr,acl,bash,automake Package: rsbackup Architecture: any diff --git a/debian/rules b/debian/rules index 32fbc96..a14fdd9 100755 --- a/debian/rules +++ b/debian/rules @@ -65,7 +65,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/. |