--- rsbackup-10.0.orig/debian/changelog +++ rsbackup-10.0/debian/changelog @@ -1,3 +1,35 @@ +rsbackup (10.0-3build2) questing; urgency=medium + + * No-change rebuild for boost 1.88. + + -- Matthias Klose Wed, 06 Aug 2025 17:12:43 +0200 + +rsbackup (10.0-3build1) questing; urgency=medium + + * No-change rebuild for boost 1.88. + + -- Matthias Klose Wed, 06 Aug 2025 17:02:18 +0200 + +rsbackup (10.0-3) unstable; urgency=medium + + * Take upstream fix to fix parsing issues with rsync output + + -- Matthew Vernon Sat, 01 Feb 2025 13:07:34 +0000 + +rsbackup (10.0-2) unstable; urgency=medium + + * Specify source format (Closes: #1007293) + * Correct permissions of rsbackup-manual.html + * Update Build-Depends pkg-config -> pkgconf + + -- Matthew Vernon Fri, 31 Jan 2025 08:43:23 +0000 + +rsbackup (10.0-1) unstable; urgency=medium + + * New upstream version + + -- Matthew Vernon Sat, 25 Jan 2025 15:33:36 +0000 + rsbackup (10.0) stable; urgency=medium * Release 10.0 @@ -10,6 +42,20 @@ -- Richard Kettlewell Sat, 12 Nov 2022 12:04:18 +0000 +rsbackup (8.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove requirement for root when building the package. + (Closes: #1089421) + + -- Niels Thykier Wed, 01 Jan 2025 19:06:43 +0000 + +rsbackup (8.0-2) unstable; urgency=medium + + * Patch from wuruilong for loong64 support (Closes: #1070106) + + -- Matthew Vernon Wed, 21 Aug 2024 18:51:43 +0100 + rsbackup (8.0-1) unstable; urgency=medium * New upstream version (Closes: #1010487) --- rsbackup-10.0.orig/debian/control +++ rsbackup-10.0/debian/control @@ -2,11 +2,12 @@ Maintainer: Debian rsbackup maintainers Uploaders: Matthew Vernon Priority: optional +Rules-Requires-Root: no Standards-Version: 3.9.6.0 Section: admin Homepage: https://www.greenend.org.uk/rjk/rsbackup/ Vcs-Git: https://github.com/ewxrjk/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 +Build-Depends: lynx|lynx-cur,devscripts,sqlite3,libsqlite3-dev,libboost-system-dev,libboost-filesystem-dev,libboost-dev,pkgconf,libpangomm-1.4-dev,libcairomm-1.0-dev,xattr,acl,debhelper Package: rsbackup Architecture: any --- rsbackup-10.0.orig/debian/rules +++ rsbackup-10.0/debian/rules @@ -31,6 +31,8 @@ build-arch: build build-indep: build build: + dh_update_autotools_config + dh_autoreconf [ -e configure ] || autoreconf -si ./configure --prefix=/usr --mandir=/usr/share/man --disable-silent-rules ${CONFIGURE_EXTRA} $(MAKE) @@ -90,11 +92,10 @@ | sort | xargs md5sum > DEBIAN/md5sums dpkg-gencontrol -isp -prsbackup -Pdebian/rsbackup \ -Tdebian/substvars.rsbackup - chown -R root:root debian/rsbackup chmod -R g-ws debian/rsbackup find debian/rsbackup -newermt "@$$SOURCE_DATE_EPOCH" -print0 | \ xargs -0r touch --no-dereference --date="@$$SOURCE_DATE_EPOCH" - dpkg --build debian/rsbackup .. + dpkg-deb --root-owner-group --build debian/rsbackup .. clean-rsbackup-graph: rm -rf debian/rsbackup-graph @@ -121,11 +122,10 @@ | xargs md5sum > DEBIAN/md5sums dpkg-gencontrol -isp -prsbackup-graph -Pdebian/rsbackup-graph \ -Tdebian/substvars.rsbackup-graph - chown -R root:root debian/rsbackup-graph chmod -R g-ws debian/rsbackup-graph find debian/rsbackup-graph -newermt "@$$SOURCE_DATE_EPOCH" -print0 | \ xargs -0r touch --no-dereference --date="@$$SOURCE_DATE_EPOCH" - dpkg --build debian/rsbackup-graph .. + dpkg-deb --root-owner-group --build debian/rsbackup-graph .. binary: binary-arch binary-indep binary-arch: binary-rsbackup binary-rsbackup-graph --- rsbackup-10.0.orig/debian/source/format +++ rsbackup-10.0/debian/source/format @@ -0,0 +1 @@ +1.0 --- rsbackup-10.0.orig/doc/Makefile.am +++ rsbackup-10.0/doc/Makefile.am @@ -28,7 +28,7 @@ rsbackup-manual.html: rsbackup-manual.in.html Makefile rm -f $@.new sed 's/_version_/${VERSION}/g' < ${srcdir}/rsbackup-manual.in.html > $@.new - chmod 444 $@.new + chmod 644 $@.new mv -f $@.new $@ %.html: % --- rsbackup-10.0.orig/doc/rsbackup.5 +++ rsbackup-10.0/doc/rsbackup.5 @@ -552,7 +552,7 @@ .TP .B rsync\-base\-options \fIOPTIONS \fR... The options to supply to the rsync command. -The default is \fB--archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats\fR. +The default is \fB--archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable\fR. .TP .B rsync\-extra\-options \fIOPTIONS \fR... Additional options to supply to the rsync command. --- rsbackup-10.0.orig/src/ConfBase.h +++ rsbackup-10.0/src/ConfBase.h @@ -106,13 +106,14 @@ // --owner preserve user IDs // --devices preserve device files // --specials preserve special files - "--sparse", // handle spare files efficiently - "--numeric-ids", // don't remap UID/GID by name - "--compress", // compress during file transfer - "--fuzzy", // look for similar files - "--hard-links", // preserve hard links - "--delete", // delete extra files in destination - "--stats", // generate file transfer stats + "--sparse", // handle spare files efficiently + "--numeric-ids", // don't remap UID/GID by name + "--compress", // compress during file transfer + "--fuzzy", // look for similar files + "--hard-links", // preserve hard links + "--delete", // delete extra files in destination + "--stats", // generate file transfer stats + "--no-human-readable", // suppress localization of transfer stats }; /** @brief rsync extra options */ --- rsbackup-10.0.orig/tests/expect/empty.txt +++ rsbackup-10.0/tests/expect/empty.txt @@ -3,7 +3,7 @@ prune-policy age ssh-timeout 1m rsync-command rsync -rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats +rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh public false --- rsbackup-10.0.orig/tests/expect/include.txt +++ rsbackup-10.0/tests/expect/include.txt @@ -3,7 +3,7 @@ prune-policy age ssh-timeout 1m rsync-command rsync -rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats +rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh public false @@ -42,7 +42,7 @@ prune-policy age ssh-timeout 1m rsync-command rsync - rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats + rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh hostname a @@ -55,7 +55,7 @@ prune-policy age ssh-timeout 1m rsync-command rsync - rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats + rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh hostname z --- rsbackup-10.0.orig/tests/expect/outdent.txt +++ rsbackup-10.0/tests/expect/outdent.txt @@ -4,7 +4,7 @@ backup-job-timeout 2h ssh-timeout 2m rsync-command rsync -rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats +rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh public false @@ -44,7 +44,7 @@ backup-job-timeout 2h ssh-timeout 1m rsync-command rsync - rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats + rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh hostname alpha @@ -58,7 +58,7 @@ backup-job-timeout 2h ssh-timeout 1m rsync-command rsync - rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats + rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime devices * traverse false @@ -71,7 +71,7 @@ backup-job-timeout 2h ssh-timeout 1m rsync-command rsync - rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats + rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime devices * traverse false @@ -84,7 +84,7 @@ backup-job-timeout 2h ssh-timeout 1m rsync-command rsync - rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats + rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh hostname beta --- rsbackup-10.0.orig/tests/expect/pruneparam.txt +++ rsbackup-10.0/tests/expect/pruneparam.txt @@ -6,7 +6,7 @@ prune-parameter e f ssh-timeout 1m rsync-command rsync -rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats +rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh public false @@ -48,7 +48,7 @@ prune-parameter --remove c ssh-timeout 1m rsync-command rsync - rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats + rsync-base-options --archive --sparse --numeric-ids --compress --fuzzy --hard-links --delete --stats --no-human-readable rsync-extra-options --xattrs --acls --open-noatime host-check ssh hostname spong