[Python-modules-commits] r30807 - in packages/musicbrainzngs/trunk/debian (3 files)

[laarmen-guest at users.alioth.debian.org]

    Date: Sunday, September 28, 2014 @ 20:45:21
  Author: laarmen-guest
Revision: 30807

Drop remove_unused_data and fix_undefined_name patches, integrated upstream

Modified:
  packages/musicbrainzngs/trunk/debian/changelog
Deleted:
  packages/musicbrainzngs/trunk/debian/patches/fix_undefined_name
  packages/musicbrainzngs/trunk/debian/patches/remove_unused_data

Modified: packages/musicbrainzngs/trunk/debian/changelog
===================================================================
--- packages/musicbrainzngs/trunk/debian/changelog	2014-09-28 20:43:33 UTC (rev 30806)
+++ packages/musicbrainzngs/trunk/debian/changelog	2014-09-28 20:45:21 UTC (rev 30807)
@@ -5,6 +5,7 @@
 
   [ Simon Chopin ]
   * New upstream release
+    + Drop remove_unused_data and fix_undefined_name patches, integrated upstream
   * Update d/copyright to add musicbrainzngs/compat.py specifics.
   * Bump standards version to 3.9.6 (no change needed)
 

Deleted: packages/musicbrainzngs/trunk/debian/patches/fix_undefined_name
===================================================================
--- packages/musicbrainzngs/trunk/debian/patches/fix_undefined_name	2014-09-28 20:43:33 UTC (rev 30806)
+++ packages/musicbrainzngs/trunk/debian/patches/fix_undefined_name	2014-09-28 20:45:21 UTC (rev 30807)
@@ -1,25 +0,0 @@
-From: Simon Chopin <chopin.simon at gmail.com>
-Date: Sun, 26 May 2013 22:49:37 +0200
-Subject: [PATCH] musicbrainz.py: Fix undefined name in submit_barcodes
-Forwarded: https://github.com/alastair/python-musicbrainz-ngs/pull/109
-
----
- musicbrainzngs/musicbrainz.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/musicbrainzngs/musicbrainz.py b/musicbrainzngs/musicbrainz.py
-index 89145f9..f013a7d 100644
---- a/musicbrainzngs/musicbrainz.py
-+++ b/musicbrainzngs/musicbrainz.py
-@@ -964,7 +964,7 @@ def get_releases_in_collection(collection):
- 
- def submit_barcodes(release_barcode):
-     """Submits a set of {release_id1: barcode, ...}"""
--    query = mbxml.make_barcode_request(release2barcode)
-+    query = mbxml.make_barcode_request(release_barcode)
-     return _do_mb_post("release", query)
- 
- def submit_puids(recording_puids):
--- 
-1.7.10.4
-

Deleted: packages/musicbrainzngs/trunk/debian/patches/remove_unused_data
===================================================================
--- packages/musicbrainzngs/trunk/debian/patches/remove_unused_data	2014-09-28 20:43:33 UTC (rev 30806)
+++ packages/musicbrainzngs/trunk/debian/patches/remove_unused_data	2014-09-28 20:45:21 UTC (rev 30807)
@@ -1,24 +0,0 @@
-Description: Remove the unused package data in setup.py
-Author: Simon Chopin <chopin.simon at gmail.com>
-Forwarded: not-needed
-Applied-Upstream: 2013-05-24
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/setup.py
-+++ b/setup.py
-@@ -52,15 +52,6 @@
-     author_email="alastair at porter.net.nz",
-     url="https://github.com/alastair/python-musicbrainz-ngs",
-     packages=['musicbrainzngs'],
--    package_data={'musicbrainzngs': ['CHANGES',
--                                     '../docs/*',
--                                     '../examples/*',
--                                     '../test/data/*.xml',
--                                     '../test/data/artist/*',
--                                     '../test/data/label/*',
--                                     '../test/data/release/*',
--                                     '../test/data/release-group/*',
--                                     '../test/data/work/*']},
-     cmdclass={'test': test },
-     license='BSD 2-clause',
-     classifiers=[