[SCM] laditools/master: Port from python-enum to python-enum34

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

The following commit has been merged in the master branch:
commit c2843bbf62df7aee0290036ecc2ab1da9fbef8d0
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Wed Mar 9 22:28:47 2016 +0100

    Port from python-enum to python-enum34

diff --git a/debian/changelog b/debian/changelog
index 0e60e67..7237a7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+laditools (1.1.0-2) unstable; urgency=medium
+
+  * Port from python-enum to python-enum34
+    (Closes: #800805) (LP: #1498345)
+
+ -- Ross Gammon <rossgammon at mail.dk>  Mon, 07 Mar 2016 23:55:46 +0100
+
 laditools (1.1.0-1) unstable; urgency=medium
 
   [ Sebastian Ramacher ]
diff --git a/debian/control b/debian/control
index 82d06a5..fc73896 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Architecture: all
 Depends:
  jackd2,
  python-dbus,
- python-enum,
+ python-enum34,
  python-gi,
  ${misc:Depends},
  ${python:Depends}
diff --git a/debian/patches/enum34.patch b/debian/patches/enum34.patch
new file mode 100644
index 0000000..aa4193a
--- /dev/null
+++ b/debian/patches/enum34.patch
@@ -0,0 +1,38 @@
+Description: Port laditools from python-enum to python-enum34
+ Python-enum and python-enum34 cannot co-exist and it is planned to
+ remove python-enum from Debian soon.
+ Python-enum34 is a backport of the enum now included within Python 3. 
+Author: Ross Gammon <rossgammon at mail.dk>
+Bug: https://bugs.launchpad.net/ubuntu/+source/laditools/+bug/1498345
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800805
+Forwarded: https://github.com/alessio/laditools/pull/1
+Applied-Upstream: Not Yet
+Last-Update: 2016-03-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- laditools-1.1.0.orig/laditools/ladish.py
++++ laditools-1.1.0/laditools/ladish.py
+@@ -28,10 +28,8 @@
+ studio_obj_path = "/org/ladish/Studio"
+ service_name = name_base
+ 
+-LadishStatusType = Enum("STUDIO_STOPPED",
+-                        "NOT_AVAILABLE",
+-                        "NO_STUDIO_LOADED",
+-                        "STUDIO_RUNNING")
++LadishStatusType = Enum("LadishStatusType",
++                        "STUDIO_STOPPED NOT_AVAILABLE NO_STUDIO_LOADED STUDIO_RUNNING")
+ 
+ class LadishProxyError(Exception): pass
+ class LadishStudioException(Exception): pass
+--- laditools-1.1.0.orig/INSTALL
++++ laditools-1.1.0/INSTALL
+@@ -29,7 +29,7 @@
+ Plus, the following dependencies must be satisfied:
+ 
+  - GTK+3            (>= 3.2.2,  http://www.gtk.org/)
+- - python-enum      (>= 0.4.4,  http://pypi.python.org/pypi/enum/)
++ - python-enum34    (>= 1.1.2,  https://pypi.python.org/pypi/enum34/)
+  - VTE              (>= 0.30.1, http://ftp.gnome.org/pub/GNOME/sources/vte/)
+ 
+ Here is a list of optional dependencies:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1ec462f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+enum34.patch

-- 
laditools packaging