[Python-modules-commits] r26032 - in packages/python-libdiscid/trunk/debian (7 files)

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Thu Oct 3 19:21:07 UTC 2013 

    Date: Thursday, October 3, 2013 @ 19:21:05
  Author: sramacher
Revision: 26032

New upstream release

Modified:
  packages/python-libdiscid/trunk/debian/changelog
  packages/python-libdiscid/trunk/debian/control
  packages/python-libdiscid/trunk/debian/patches/series
  packages/python-libdiscid/trunk/debian/patches/sphinx-documentation.patch
  packages/python-libdiscid/trunk/debian/python-libdiscid-doc.docs
  packages/python-libdiscid/trunk/debian/rules
Deleted:
  packages/python-libdiscid/trunk/debian/patches/skip-read-tests-if-not-available.patch

Modified: packages/python-libdiscid/trunk/debian/changelog
===================================================================
--- packages/python-libdiscid/trunk/debian/changelog	2013-10-03 10:18:10 UTC (rev 26031)
+++ packages/python-libdiscid/trunk/debian/changelog	2013-10-03 19:21:05 UTC (rev 26032)
@@ -1,3 +1,15 @@
+python-libdiscid (0.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/patches:
+    - skip-read-tests-if-not-available.patch: Removed, no longer needed.
+    - sphinx-documentation.patch: Refreshed.
+  * debian/control: Bump libdiscid0-dev to >= 0.6 for new features.
+  * debian/{rules,python-libdiscid-doc.docs}: Update for new path of the
+    documentation.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Thu, 03 Oct 2013 17:32:00 +0200
+
 python-libdiscid (0.3.1-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/python-libdiscid/trunk/debian/control
===================================================================
--- packages/python-libdiscid/trunk/debian/control	2013-10-03 10:18:10 UTC (rev 26031)
+++ packages/python-libdiscid/trunk/debian/control	2013-10-03 19:21:05 UTC (rev 26032)
@@ -5,7 +5,7 @@
 Uploaders: Sebastian Ramacher <sramacher at debian.org>
 Build-Depends:
  debhelper (>= 9),
- libdiscid0-dev (>= 0.5),
+ libdiscid0-dev (>= 0.6),
  python-all-dev (>= 2.6.3-3~),
  python-all-dev (>= 2.7.5) | python-unittest2,
  python-all-dbg,
@@ -33,7 +33,9 @@
  ${python:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Suggests: python-libdiscid-dbg, python-libdiscid-doc
+Suggests:
+ python-libdiscid-dbg,
+ python-libdiscid-doc
 Description: libdiscid binding for Python 2
  libdiscid allows one to create MusicBrainz DiscIDs from audio CDs. It reads a
  CD's table of contents and generates and identifier which can be used to
@@ -65,7 +67,9 @@
  ${python3:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Suggests: python3-libdiscid-dbg, python-libdiscid-doc
+Suggests:
+ python3-libdiscid-dbg,
+ python-libdiscid-doc
 Description: libdiscid binding for Python 3
  libdiscid allows one to create MusicBrainz DiscIDs from audio CDs. It reads a
  CD's table of contents and generates and identifier which can be used to

Modified: packages/python-libdiscid/trunk/debian/patches/series
===================================================================
--- packages/python-libdiscid/trunk/debian/patches/series	2013-10-03 10:18:10 UTC (rev 26031)
+++ packages/python-libdiscid/trunk/debian/patches/series	2013-10-03 19:21:05 UTC (rev 26032)
@@ -1,2 +1 @@
 sphinx-documentation.patch
-skip-read-tests-if-not-available.patch

Deleted: packages/python-libdiscid/trunk/debian/patches/skip-read-tests-if-not-available.patch
===================================================================
--- packages/python-libdiscid/trunk/debian/patches/skip-read-tests-if-not-available.patch	2013-10-03 10:18:10 UTC (rev 26031)
+++ packages/python-libdiscid/trunk/debian/patches/skip-read-tests-if-not-available.patch	2013-10-03 19:21:05 UTC (rev 26032)
@@ -1,89 +0,0 @@
-Description: Skip read tests if read is not supported
-Origin: upstream,
- https://github.com/sebastinas/python-libdiscid/commit/11a0cee9
-Last-Update: 2013-09-09
-
-diff --git a/libdiscid/tests/test_compat_discid.py b/libdiscid/tests/test_compat_discid.py
-index 60e85bd..f668ac7 100644
---- a/libdiscid/tests/test_compat_discid.py
-+++ b/libdiscid/tests/test_compat_discid.py
-@@ -24,13 +24,14 @@
- """
- 
- try:
--  from unittest2 import TestCase, main
-+  import unittest2 as unittest
- except ImportError:
--  from unittest import TestCase, main
-+  import unittest
-+import libdiscid
- from libdiscid.compat import discid
- from libdiscid.compat.discid import DiscError, TOCError
- 
--class TestCompatDiscID(TestCase):
-+class TestCompatDiscID(unittest.TestCase):
-   def test_default_device(self):
-     self.assertIsNotNone(discid.get_default_device())
- 
-@@ -51,12 +52,18 @@ def test_empty_is_none(self):
-     self.assertIsNone(disc.seconds)
-     self.assertEqual(len(disc.tracks), 0)
- 
-+  @unittest.skipIf(libdiscid.FEATURES_MAPPING[libdiscid.FEATURE_READ] not in
-+                   libdiscid.FEATURES, "not available on this platform")
-   def test_read_fail(self):
-     self.assertRaises(DiscError, discid.read, u'/does/not/exist')
- 
-+  @unittest.skipIf(libdiscid.FEATURES_MAPPING[libdiscid.FEATURE_READ] not in
-+                   libdiscid.FEATURES, "not available on this platform")
-   def test_encoded_device(self):
-     self.assertRaises(DiscError, discid.read, '/does/not/exist')
- 
-+  @unittest.skipIf(libdiscid.FEATURES_MAPPING[libdiscid.FEATURE_READ] not in
-+                   libdiscid.FEATURES, "not available on this platform")
-   def test_byte_device(self):
-     self.assertRaises(DiscError, discid.read, b'/does/not/exist')
- 
-@@ -131,4 +138,4 @@ def test_put_fail_3(self):
- 
- 
- if __name__ == '__main__':
--  main()
-+  unittest.main()
-diff --git a/libdiscid/tests/test_libdiscid.py b/libdiscid/tests/test_libdiscid.py
-index b0cf9d3..e138f62 100644
---- a/libdiscid/tests/test_libdiscid.py
-+++ b/libdiscid/tests/test_libdiscid.py
-@@ -24,13 +24,13 @@
- """
- 
- try:
--  from unittest2 import TestCase, main
-+  import unittest2 as unittest
- except ImportError:
--  from unittest import TestCase, main
-+  import unittest
- import libdiscid
- from libdiscid import DiscError
- 
--class TestLibDiscId(TestCase):
-+class TestLibDiscId(unittest.TestCase):
-   def test_version(self):
-     self.assertIsNotNone(libdiscid.__version__)
-     self.assertIsNotNone(libdiscid.__discid_version__)
-@@ -48,6 +48,8 @@ def test_features(self):
-     self.assertIsNotNone(libdiscid.FEATURE_ISRC)
-     self.assertIsNotNone(libdiscid.FEATURES_MAPPING)
- 
-+  @unittest.skipIf(libdiscid.FEATURES_MAPPING[libdiscid.FEATURE_READ] not in
-+                   libdiscid.FEATURES, "not available on this platform")
-   def test_read_fail(self):
-     self.assertRaises(DiscError, libdiscid.read, u'/does/not/exist')
- 
-@@ -123,4 +125,4 @@ def test_put_fail_3(self):
- 
- 
- if __name__ == '__main__':
--  main()
-+  unittest.main()
-

Modified: packages/python-libdiscid/trunk/debian/patches/sphinx-documentation.patch
===================================================================
--- packages/python-libdiscid/trunk/debian/patches/sphinx-documentation.patch	2013-10-03 10:18:10 UTC (rev 26031)
+++ packages/python-libdiscid/trunk/debian/patches/sphinx-documentation.patch	2013-10-03 19:21:05 UTC (rev 26032)
@@ -6,9 +6,9 @@
 Forwarded: not-needed
 Last-Update: 2013-07-04
 
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -255,7 +255,16 @@
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -182,7 +182,16 @@
    'musicbrainz': ('http://musicbrainz.org/doc/%s', ''),
  }
  
@@ -29,13 +29,13 @@
 +                      '/usr/share/doc/python%d.%d/html/objects.inv' % \
 +                       sys.version_info[:2]))
 +
---- a/docs/source/license.rst
-+++ b/docs/source/license.rst
+--- a/docs/license.rst
++++ b/docs/license.rst
 @@ -3,5 +3,5 @@
  License
  -------
  
--.. include:: ../../LICENSE
+-.. include:: ../LICENSE
 -   :literal:
 +The license is available `here
 +</usr/share/doc/python-libdiscid-doc/copyright>`_.

Modified: packages/python-libdiscid/trunk/debian/python-libdiscid-doc.docs
===================================================================
--- packages/python-libdiscid/trunk/debian/python-libdiscid-doc.docs	2013-10-03 10:18:10 UTC (rev 26031)
+++ packages/python-libdiscid/trunk/debian/python-libdiscid-doc.docs	2013-10-03 19:21:05 UTC (rev 26032)
@@ -1 +1 @@
-docs/build/html
+build/html

Modified: packages/python-libdiscid/trunk/debian/rules
===================================================================
--- packages/python-libdiscid/trunk/debian/rules	2013-10-03 10:18:10 UTC (rev 26031)
+++ packages/python-libdiscid/trunk/debian/rules	2013-10-03 19:21:05 UTC (rev 26032)
@@ -12,7 +12,6 @@
 
 override_dh_auto_clean:
 	rm -rf build
-	rm -rf docs/build
 
 build-%-stamp:
 	python$(*) setup.py build

More information about the Python-modules-commits mailing list