Control: tags 795790 + pending Dear maintainer,
I've prepared an NMU for rdfind (versioned as 1.3.4-2.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. You can find the debdiff attached. I've done the work in git, and will push to the repository in collab-maint once the upload if accepted; otherwise, you can already see the commits in this temporary repository here: https://anonscm.debian.org/git/reproducible/rdfind.git/ Regards. -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for rdfind-1.3.4 rdfind-1.3.4 changelog | 15 +++++++++++++ compat | 2 - control | 9 +++----- patches/reproducible_build.patch | 42 +++++++++++++++++++++++++++++++++++++++ patches/series | 1 rules | 5 ---- 6 files changed, 64 insertions(+), 10 deletions(-) diff -Nru rdfind-1.3.4/debian/changelog rdfind-1.3.4/debian/changelog --- rdfind-1.3.4/debian/changelog 2014-04-30 07:51:54.000000000 +0000 +++ rdfind-1.3.4/debian/changelog 2016-06-20 16:20:27.000000000 +0000 @@ -1,3 +1,18 @@ +rdfind (1.3.4-2.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Reiner Herrmann ] + * Added patch to sort files before doing any operation. Closes: #795790 + + [ Mattia Rizzolo ] + * Use https in Vcs-* fields. + * Bump Standards-Version to 3.9.8, no changes needed. + * Bump debhelper compat level to 9. + * Drop obsolete build-dependency on dpkg-dev. + + -- Mattia Rizzolo <[email protected]> Mon, 20 Jun 2016 16:09:42 +0000 + rdfind (1.3.4-2) unstable; urgency=low [ Helmut Grohne ] diff -Nru rdfind-1.3.4/debian/compat rdfind-1.3.4/debian/compat --- rdfind-1.3.4/debian/compat 2014-04-30 07:51:54.000000000 +0000 +++ rdfind-1.3.4/debian/compat 2016-06-20 16:19:53.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru rdfind-1.3.4/debian/control rdfind-1.3.4/debian/control --- rdfind-1.3.4/debian/control 2014-04-30 07:51:54.000000000 +0000 +++ rdfind-1.3.4/debian/control 2016-06-20 16:20:09.000000000 +0000 @@ -2,12 +2,11 @@ Section: utils Priority: extra Maintainer: TANIGUCHI Takaki <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), dpkg-dev(>= 1.16.1~) - , autotools-dev, nettle-dev -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9), autotools-dev, nettle-dev +Standards-Version: 3.9.8 Homepage: http://rdfind.pauldreik.se/ -Vcs-Git: git://git.debian.org/collab-maint/rdfind.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/rdfind.git;a=summary +Vcs-Git: https://anonscm.debian.org/git/collab-maint/rdfind.git +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/rdfind.git Package: rdfind Architecture: any diff -Nru rdfind-1.3.4/debian/patches/reproducible_build.patch rdfind-1.3.4/debian/patches/reproducible_build.patch --- rdfind-1.3.4/debian/patches/reproducible_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ rdfind-1.3.4/debian/patches/reproducible_build.patch 2016-06-20 16:09:30.000000000 +0000 @@ -0,0 +1,42 @@ +Description: sort the filelist when it is complete to get reproducible behaviour +Author: Reiner Herrmann <[email protected]> +Bug-Debian: https://bugs.debian.org/795790 + +Index: rdfind-1.3.4/Fileinfo.hh +=================================================================== +--- rdfind-1.3.4.orig/Fileinfo.hh ++++ rdfind-1.3.4/Fileinfo.hh +@@ -189,6 +189,10 @@ public: + static bool compareondepth(const Fileinfo &a, const Fileinfo &b) + {return (a.depth() < b.depth());} + ++ //returns true if a has lower filename than b) ++ static bool compareonfilename(const Fileinfo &a, const Fileinfo &b) ++ {return (a.name().compare(b.name()) < 0);} ++ + //fills with bytes from the file. if lasttype is supplied, + //it is used to see if the file needs to be read again - useful if + //file is shorter than the length of the bytes field. +@@ -235,6 +239,10 @@ public: + static bool equaldepth(const Fileinfo &a, const Fileinfo &b) + {return (a.depth()==b.depth());} + ++ //returns true if filenames are equal ++ static bool equalfilename(const Fileinfo &a, const Fileinfo &b) ++ {return (a.name()==b.name());} ++ + //returns true if file is a regular file. call readfileinfo first! + bool isRegularFile() {return m_info.is_file;} + +Index: rdfind-1.3.4/rdfind.cc +=================================================================== +--- rdfind-1.3.4.orig/rdfind.cc ++++ rdfind-1.3.4/rdfind.cc +@@ -349,6 +349,7 @@ int main(int narg, char *argv[]) + cout<<dryruntext<<"Now have "<<filelist1.size()<<" files in total."<<endl; + + ++ gswd.sortlist(&Fileinfo::compareonfilename,&Fileinfo::equalfilename); + + //mark files with a unique number + gswd.markitems(); diff -Nru rdfind-1.3.4/debian/patches/series rdfind-1.3.4/debian/patches/series --- rdfind-1.3.4/debian/patches/series 2014-04-30 07:51:54.000000000 +0000 +++ rdfind-1.3.4/debian/patches/series 2016-06-20 16:08:41.000000000 +0000 @@ -0,0 +1 @@ +reproducible_build.patch diff -Nru rdfind-1.3.4/debian/rules rdfind-1.3.4/debian/rules --- rdfind-1.3.4/debian/rules 2014-04-30 07:51:54.000000000 +0000 +++ rdfind-1.3.4/debian/rules 2016-06-20 16:19:53.000000000 +0000 @@ -1,7 +1,4 @@ #!/usr/bin/make -f -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - %: - dh $@ + dh $@
signature.asc
Description: PGP signature
