Your message dated Thu, 03 Sep 2015 18:19:29 +0000
with message-id <e1zxz6f-0002yw...@franck.debian.org>
and subject line Bug#796196: fixed in diffoscope 32
has caused the Debian Bug report #796196,
regarding strip .py suffix from diffoscope within sources repo as well
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
796196: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796196
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 30
Severity: wishlist
Tags: upstream patch

For various reasons there should be no .py in diffoscope shipped within
the source VCS (let me know if I need to elaborate).

Attahed is the patch which should accomplish the mission I guess

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (900, 'testing'), (600, 'unstable'), (300, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.17-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages diffoscope depends on:
ii  python               2.7.9-1
ii  python-debian        0.1.27
ii  python-libarchive-c  2.1-1
ii  python-magic         1:5.22+15-2
ii  python-rpm           4.12.0.1+dfsg1-3
ii  python-ssdeep        3.1+dfsg-1
pn  python:any           <none>

Versions of packages diffoscope recommends:
ii  acl                       2.2.52-2
ii  binutils-multiarch        2.25.1-1
ii  bzip2                     1.0.6-8
ii  cpio                      2.11+dfsg-4.1
ii  default-jdk [java-sdk]    2:1.7-52
ii  fontforge-extras          0.3-4
ii  genisoimage               9:1.1.11-3
ii  gettext                   0.19.4-1
ii  ghc                       7.8.4-9
ii  gnupg                     1.4.19-3
ii  mono-utils                3.2.8+dfsg-10
ii  openjdk-7-jdk [java-sdk]  7u75-2.5.4-2
ii  pdftk                     2.02-3
ii  poppler-utils             0.26.5-2
ii  rpm2cpio                  4.12.0.1+dfsg1-3
ii  sng                       1.0.6-2
ii  sqlite3                   3.8.11.1-1
ii  squashfs-tools            1:4.2+20130409-2.1
ii  unzip                     6.0-17
ii  vim-common                2:7.4.712-3
ii  xz-utils                  5.1.1alpha+20120614-2.1

diffoscope suggests no packages.

-- no debconf information
>From 13a9076393bddbc9689069a0ff1dd6803691bf0c Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <deb...@onerussian.com>
Date: Thu, 20 Aug 2015 10:49:45 +0200
Subject: [PATCH] RF: diffoscope.py -> diffoscope  (implementation language is
 irrelevant)

---
 README                   |   4 +-
 debian/rules             |   6 +--
 diffoscope.py            | 118 -----------------------------------------------
 diffoscope/diffoscope.py | 118 +++++++++++++++++++++++++++++++++++++++++++++++
 setup.py                 |   2 +-
 5 files changed, 122 insertions(+), 126 deletions(-)
 delete mode 100755 diffoscope.py
 create mode 100755 diffoscope/diffoscope.py
 mode change 100644 => 100755 setup.py

diff --git a/README b/README
index c08d152..7bad538 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ debbindiff.
 Example
 -------
 
-    $ ./diffoscope.py --html output.html build1.changes build2.changes
+    $ ./diffoscope --html output.html build1.changes build2.changes
 
 This will compare `build1.changes` and `build2.changes` and create
 `output.html` if there are differences between the two files.
@@ -35,7 +35,7 @@ External dependencies
 The various comparators rely on external commands being available. To
 get a list of them, please run:
 
-    $ ./diffoscope.py --list-tools
+    $ ./diffoscope --list-tools
 
 Contributors
 ------------
diff --git a/debian/rules b/debian/rules
index 78ea5ce..8236beb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,10 @@ override_dh_auto_build:
 	dh_auto_build -O--buildsystem=pybuild
 
 override_dh_gencontrol:
-	echo "diffoscope:Recommends=$$(./diffoscope.py --list-tools | tail -n 1 | \
+	echo "diffoscope:Recommends=$$(./diffoscope --list-tools | tail -n 1 | \
 		sed -e 's/\(^\| \)\(coreutils\|diffutils\|e2fsprogs\|findutils\|gzip\)\(,\|$$\)//g')" >> debian/diffoscope.substvars
 	dh_gencontrol -O--buildsystem=pybuild
 
-override_dh_install:
-	dh_install -O--buildsystem=pybuild
-	mv debian/diffoscope/usr/bin/diffoscope.py debian/diffoscope/usr/bin/diffoscope
-
 debian/diffoscope.1: debian/diffoscope.1.rst
 	rst2man $< $@
 
diff --git a/diffoscope.py b/diffoscope.py
deleted file mode 100755
index a1a8ccc..0000000
--- a/diffoscope.py
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# diffoscope: in-depth comparison of files, archives, and directories
-#
-# Copyright © 2014-2015 Jérémy Bobbio <lu...@debian.org>
-#
-# diffoscope is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# diffoscope is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with diffoscope.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import print_function
-
-import argparse
-from contextlib import contextmanager
-import logging
-import codecs
-import os
-import sys
-import traceback
-from diffoscope import logger, VERSION, set_locale
-import diffoscope.comparators
-from diffoscope.config import Config
-from diffoscope.presenters.html import output_html
-from diffoscope.presenters.text import output_text
-
-
-def create_parser():
-    parser = argparse.ArgumentParser(
-        description='Highlight differences between two builds '
-                    'of Debian packages')
-    parser.add_argument('--version', action='version',
-                        version='diffoscope %s' % VERSION)
-    parser.add_argument('--list-tools', nargs=0, action=ListToolsAction,
-                        help='show external tools required and exit')
-    parser.add_argument('--debug', dest='debug', action='store_true',
-                        default=False, help='display debug messages')
-    parser.add_argument('--html', metavar='output', dest='html_output',
-                        help='write HTML report to given file (use - for stdout)')
-    parser.add_argument('--text', metavar='output', dest='text_output',
-                        help='write plain text output to given file (use - for stdout)')
-    parser.add_argument('--max-report-size', metavar='BYTES',
-                        dest='max_report_size', type=int,
-                        help='maximum bytes written in report')
-    parser.add_argument('--max-diff-block-lines', dest='max_diff_block_lines', type=int,
-                        help='maximum number of lines per diff block')
-    parser.add_argument('--max-diff-input-lines', dest='max_diff_input_lines', type=int,
-                        help='maximum number of lines fed to diff')
-    parser.add_argument('--css', metavar='url', dest='css_url',
-                        help='link to an extra CSS for the HTML report')
-    parser.add_argument('file1', help='first file to compare')
-    parser.add_argument('file2', help='second file to compare')
-    return parser
-
-
-@contextmanager
-def make_printer(path):
-    if path == '-':
-        output = sys.stdout
-        if not sys.stdout.isatty():
-            output = codecs.getwriter(sys.stdin.encoding)(sys.stdout)
-    else:
-        output = codecs.open(path, 'w', encoding='utf-8')
-    def print_func(*args, **kwargs):
-        kwargs['file'] = output
-        print(*args, **kwargs)
-    yield print_func
-    if path != '-':
-        output.close()
-
-
-class ListToolsAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
-        from diffoscope import tool_required, RequiredToolNotFound
-        print("External tools required:")
-        print(', '.join(tool_required.all))
-        print()
-        print("Available in packages:")
-        print(', '.join(sorted(set([RequiredToolNotFound.PROVIDERS[k]["debian"] for k in tool_required.all]))))
-        sys.exit(0)
-
-
-def main():
-    parser = create_parser()
-    parsed_args = parser.parse_args(sys.argv[1:])
-    Config.config().max_diff_block_lines = parsed_args.max_diff_block_lines
-    Config.config().max_diff_input_lines = parsed_args.max_diff_input_lines
-    Config.config().max_report_size = parsed_args.max_report_size
-    if parsed_args.debug:
-        logger.setLevel(logging.DEBUG)
-    set_locale()
-    difference = diffoscope.comparators.compare_root_paths(
-        parsed_args.file1, parsed_args.file2)
-    if difference:
-        if parsed_args.html_output:
-            with make_printer(parsed_args.html_output) as print_func:
-                output_html(difference, css_url=parsed_args.css_url, print_func=print_func)
-        if (parsed_args.text_output and parsed_args.text_output != parsed_args.html_output) or not parsed_args.html_output:
-            with make_printer(parsed_args.text_output or '-') as print_func:
-                output_text(difference, print_func=print_func)
-        return 1
-    return 0
-
-if __name__ == '__main__':
-    try:
-        sys.exit(main())
-    except (Exception, KeyboardInterrupt):
-        traceback.print_exc()
-        sys.exit(2)
diff --git a/diffoscope/diffoscope.py b/diffoscope/diffoscope.py
new file mode 100755
index 0000000..a1a8ccc
--- /dev/null
+++ b/diffoscope/diffoscope.py
@@ -0,0 +1,118 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# diffoscope: in-depth comparison of files, archives, and directories
+#
+# Copyright © 2014-2015 Jérémy Bobbio <lu...@debian.org>
+#
+# diffoscope is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# diffoscope is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with diffoscope.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import print_function
+
+import argparse
+from contextlib import contextmanager
+import logging
+import codecs
+import os
+import sys
+import traceback
+from diffoscope import logger, VERSION, set_locale
+import diffoscope.comparators
+from diffoscope.config import Config
+from diffoscope.presenters.html import output_html
+from diffoscope.presenters.text import output_text
+
+
+def create_parser():
+    parser = argparse.ArgumentParser(
+        description='Highlight differences between two builds '
+                    'of Debian packages')
+    parser.add_argument('--version', action='version',
+                        version='diffoscope %s' % VERSION)
+    parser.add_argument('--list-tools', nargs=0, action=ListToolsAction,
+                        help='show external tools required and exit')
+    parser.add_argument('--debug', dest='debug', action='store_true',
+                        default=False, help='display debug messages')
+    parser.add_argument('--html', metavar='output', dest='html_output',
+                        help='write HTML report to given file (use - for stdout)')
+    parser.add_argument('--text', metavar='output', dest='text_output',
+                        help='write plain text output to given file (use - for stdout)')
+    parser.add_argument('--max-report-size', metavar='BYTES',
+                        dest='max_report_size', type=int,
+                        help='maximum bytes written in report')
+    parser.add_argument('--max-diff-block-lines', dest='max_diff_block_lines', type=int,
+                        help='maximum number of lines per diff block')
+    parser.add_argument('--max-diff-input-lines', dest='max_diff_input_lines', type=int,
+                        help='maximum number of lines fed to diff')
+    parser.add_argument('--css', metavar='url', dest='css_url',
+                        help='link to an extra CSS for the HTML report')
+    parser.add_argument('file1', help='first file to compare')
+    parser.add_argument('file2', help='second file to compare')
+    return parser
+
+
+@contextmanager
+def make_printer(path):
+    if path == '-':
+        output = sys.stdout
+        if not sys.stdout.isatty():
+            output = codecs.getwriter(sys.stdin.encoding)(sys.stdout)
+    else:
+        output = codecs.open(path, 'w', encoding='utf-8')
+    def print_func(*args, **kwargs):
+        kwargs['file'] = output
+        print(*args, **kwargs)
+    yield print_func
+    if path != '-':
+        output.close()
+
+
+class ListToolsAction(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string=None):
+        from diffoscope import tool_required, RequiredToolNotFound
+        print("External tools required:")
+        print(', '.join(tool_required.all))
+        print()
+        print("Available in packages:")
+        print(', '.join(sorted(set([RequiredToolNotFound.PROVIDERS[k]["debian"] for k in tool_required.all]))))
+        sys.exit(0)
+
+
+def main():
+    parser = create_parser()
+    parsed_args = parser.parse_args(sys.argv[1:])
+    Config.config().max_diff_block_lines = parsed_args.max_diff_block_lines
+    Config.config().max_diff_input_lines = parsed_args.max_diff_input_lines
+    Config.config().max_report_size = parsed_args.max_report_size
+    if parsed_args.debug:
+        logger.setLevel(logging.DEBUG)
+    set_locale()
+    difference = diffoscope.comparators.compare_root_paths(
+        parsed_args.file1, parsed_args.file2)
+    if difference:
+        if parsed_args.html_output:
+            with make_printer(parsed_args.html_output) as print_func:
+                output_html(difference, css_url=parsed_args.css_url, print_func=print_func)
+        if (parsed_args.text_output and parsed_args.text_output != parsed_args.html_output) or not parsed_args.html_output:
+            with make_printer(parsed_args.text_output or '-') as print_func:
+                output_text(difference, print_func=print_func)
+        return 1
+    return 0
+
+if __name__ == '__main__':
+    try:
+        sys.exit(main())
+    except (Exception, KeyboardInterrupt):
+        traceback.print_exc()
+        sys.exit(2)
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 7ffac88..ba229a2
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ setup(name='diffoscope',
       packages=find_packages(),
       tests_require=['pytest'],
       cmdclass = {'test': PyTest},
-      scripts=['diffoscope.py'],
+      scripts=['diffoscope'],
       install_requires=[
           'python-debian',
           'magic',
-- 
2.4.3.573.g4eafbef


--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 32

We believe that the bug you reported is fixed in the latest version of
diffoscope, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 796...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jérémy Bobbio <lu...@debian.org> (supplier of updated diffoscope package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Thu, 03 Sep 2015 20:00:45 +0200
Source: diffoscope
Binary: diffoscope debbindiff
Architecture: source all
Version: 32
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks 
<reproducible-builds@lists.alioth.debian.org>
Changed-By: Jérémy Bobbio <lu...@debian.org>
Description:
 debbindiff - transitional package
 diffoscope - in-depth comparison of files, archives, and directories
Closes: 788568 796039 796196 796202 796262 796288 797164 797557 797560 797561
Changes:
 diffoscope (32) unstable; urgency=medium
 .
   [ Jérémy Bobbio ]
   * Add `--fuzzy-threshold` option. This allows one to specify the TLSH score
     used as cut-off for fuzzy matching. Specifying 0 will disable
     fuzzy-matching entirely. Thanks Jakub Wilk for prompting me to implement
     this. (Closes: #797557)
   * Add `--new-file` to treat absent files as empty. Thanks Jakub Wilk for the
     suggestion. (Closes: #797560)
   * Enable comparisons of symlinks and devices given on the command line.
     (Closes: #796262)
   * Fix comparisons of device files. (Closes: #796288)
   * Perform comparisons of file metadata in directories using original path.
     (Closes: #796202)
   * Display default values in `--help`.
   * Stop unpacking Tar directories. Thanks h01ger for the report.
     (Closes: #797164)
   * Make directory comparison work again.
   * Fix and document required Python modules. Thanks plntyk for the feedback on
     IRC.
   * Pass `--force-local`. to cpio. We don't want filenames with ':' to trigger
     remote copies.
   * Mark that get_ar_content() as requiring the 'ar' executable.
   * Rework how diffoscope main() is run. Thanks Yaroslav Halchenko for the
     report and suggestions. (Closes: #796196)
   * Assume UTF-8 output if stdin does not advertise any encoding.
   * Give proper error message when run on non-existing files.
   * Output differences in directory test to ease debugging.
   * Update manpage. Thanks Jakub Wilk for reporting the issue.
     (Closes: #797561)
   * Properly handle SIGTERM and do cleanup temp files. Thanks Mattia Rizzolo
     for reporting this and how he did work around this deficiency.
     (Closes: #788568)
   * Fix handling of GHC .hi file (Closes: #796039)
   * Add a test on how Ctrl+C is handled.
   * Minor code improvements.
 .
   [ Chris Lamb ]
   * Correct "comment" on Device comparator.
Checksums-Sha1:
 9c939d279f6086b773310436f151e4db2b5ccfc4 1945 diffoscope_32.dsc
 b1f184345515c4c260ec0fd10bdad795513425fc 255982 diffoscope_32.tar.gz
 3a664c066c3ae25f1fef65c3bbfc94e38eb7d5d9 8870 debbindiff_32_all.deb
 faf6ca456748b4414e40d9d6131ec64904749c2e 40172 diffoscope_32_all.deb
Checksums-Sha256:
 7d5c96ec9c09b0c99f6f95245b9c1e049390fbef0f92aa40af27176987da296a 1945 
diffoscope_32.dsc
 f4da44bdef494a73ed0c3cde02adc308e2a6317b023c2347395add2a68616666 255982 
diffoscope_32.tar.gz
 d46d2a695e68d9c321fe2e15e1adaa64ec50dd0f3958a63095190f3ed17e2cbe 8870 
debbindiff_32_all.deb
 2333db280f248f682256ba18d71e9ee488ef65e1a1f864467551f5636cd37fe9 40172 
diffoscope_32_all.deb
Files:
 8faf53fde63cc64d2bc7c0f855bbd373 1945 devel optional diffoscope_32.dsc
 5f56d96b147e5dde40a26c50476c546c 255982 devel optional diffoscope_32.tar.gz
 27e9776f15d2ae1f3f69115a7a6689e2 8870 oldlibs extra debbindiff_32_all.deb
 81adf701074e89e3d298ec6929a10af5 40172 devel optional diffoscope_32_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJV6ItUAAoJEEAsIlA9Nuk2BVcP/2brsVIZkEvFzAOOnw+42x+7
VPS9l4kheJ+76NMTLx8ZD42AoWHMwdcvKYsL/c+ihn7IFwfZlorXOpdcubRxo1KF
Pu7OoIbsmLrndTNKKgbQohb91FjwifX7EKaYFRaAlQIEqp2gl65PeUk8sAx45rw/
5VP36vmzzRbO4TpAbx0cXUaehJHoJMCm/rmsNsq8rvxAp+m8CNojXcweqVSizSwL
GNPcUFpShvW6xYHdVgKCgsPp7FzTxbrDpAhFI63YMFSPTmzElaaTT7yTkAn6IIRA
hMcHK8ybNGXtswhu0agMGZvt19D2ytOglPgNLW0YCXYvegMMqMkyzuwTzC/8yvS0
aJa5he5lNLZeTadMYHRMY8h918uQTsUQFGL1f//4EOQLAy8IVTjiWgkyYtmVtRaI
ESH5bgNk1ipLItZlTi8U4RWKCrdIEYRXvex9rhDS6UX8efWG/11ednGlcTbo2c8L
dRYmfQ3al2FWjDLIS4Lg4vqJFOu7jj2bqzQqZpoipL5wDcMiRJYt35qd1lt3WXhU
CXXJFpTcyLxf7QVqPqylj6y6Ijg8gf0FTbLJ3XD/1eqEto6b78Epft0KSDpZcsWg
1J9HgNdriTKJvjr8WX4SxmJVhx/M6dR8FErW6SbyLJecWrQvT4a7Ujr6g4WSYP1Y
LfGZT/tII3hy0Qs5lY0Y
=x3PE
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Reply via email to