[ros-genpy] 02/03: Remove Make-generated-__init__.py-files-reproduducible.patch, has been applied upstream

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-genpy.

commit b1e82ca446a9c6e1fbb3e79bce46c72638508f2a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jun 18 11:14:33 2016 +0200

    Remove Make-generated-__init__.py-files-reproduducible.patch, has been applied upstream
---
 ...enerated-__init__.py-files-reproduducible.patch | 31 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/0002-Make-generated-__init__.py-files-reproduducible.patch b/debian/patches/0002-Make-generated-__init__.py-files-reproduducible.patch
deleted file mode 100644
index 55d2ff1..0000000
--- a/debian/patches/0002-Make-generated-__init__.py-files-reproduducible.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Chris Lamb <chris at chris-lamb.co.uk>
-Date: Tue, 15 Dec 2015 12:21:23 +0000
-Subject: Make generated __init__.py files reproduducible
-
-Whilst working on the "reproducible builds" effort [0], we noticed that
-genpy generates output with a non-determistic order.
-
-The attached patch removes this randomness from the build system. Once
-applied, packages using python-genpy can be built reproducibly using our
-reproducible toolchain.
-
- [0] https://wiki.debian.org/ReproducibleBuilds
-
-Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
----
- src/genpy/generate_initpy.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/genpy/generate_initpy.py b/src/genpy/generate_initpy.py
-index 2774b18..a6bfecf 100644
---- a/src/genpy/generate_initpy.py
-+++ b/src/genpy/generate_initpy.py
-@@ -48,7 +48,7 @@ def write_modules(outdir):
-         return 0
-     types_in_dir = set([f[1:-3] for f in os.listdir(outdir)
-                      if f.endswith('.py') and f != '__init__.py'])
--    generated_modules = [_module_name(f) for f in types_in_dir]
-+    generated_modules = [_module_name(f) for f in sorted(types_in_dir)]
-     write_module(outdir, generated_modules)
-     return 0
- 
diff --git a/debian/patches/series b/debian/patches/series
index 990965d..de2d3ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Fix-location-of-genmsg_py.py.patch
-0002-Make-generated-__init__.py-files-reproduducible.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-genpy.git