Bug#746474: portalocker: diff for NMU version 0.5~ds0-0.1

2014-05-01 Thread Alessio Treglia
tags 746474 pending
thanks

Thanks, uploaded.

Cheers!

-- 
Alessio Treglia  | www.alessiotreglia.com
Debian Developer | ales...@debian.org
Ubuntu Core Developer|  quadris...@ubuntu.com
0416 0004 A827 6E40 BB98 90FB E8A4 8AE5 311D 765A


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#746474: portalocker: diff for NMU version 0.5~ds0-0.1

2014-04-30 Thread Alessio Treglia
Package: portalocker
Version: 0.4~ds0-2
Severity: normal
Tags: patch

Dear maintainer,

The new upstream release provides portalocker with Python 3 support.

I've prepared an NMU for portalocker (versioned as 0.5~ds0-0.1) and
I intend to upload it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
Alessio Treglia  | www.alessiotreglia.com
Debian Developer | ales...@debian.org
Ubuntu Core Developer|  quadris...@ubuntu.com
0416 0004 A827 6E40 BB98 90FB E8A4 8AE5 311D 765A
diff -Nru portalocker-0.4~ds0/CHANGELOG portalocker-0.5~ds0/CHANGELOG
--- portalocker-0.4~ds0/CHANGELOG	2013-11-16 01:22:37.0 +
+++ portalocker-0.5~ds0/CHANGELOG	2014-04-29 15:29:24.0 +0100
@@ -10,3 +10,15 @@
 
  * Now actually returning the file descriptor from the `Lock` class
 
+0.4:
+
+ * Fixing a few bugs, added coveralls support, switched to py.test and added 100% test coverage.
+
+- Fixing exception thrown when fail_when_locked is true
+- Fixing exception Lock object has no attribute '_release_lock' when
+  fail_when_locked is true due to the call to Lock._release_lock() which fails
+  because _release_lock is not defined.
+
+0.5:
+
+ * Python 3 support
diff -Nru portalocker-0.4~ds0/debian/changelog portalocker-0.5~ds0/debian/changelog
--- portalocker-0.4~ds0/debian/changelog	2014-01-05 22:37:03.0 +
+++ portalocker-0.5~ds0/debian/changelog	2014-04-30 11:41:45.0 +0100
@@ -1,3 +1,12 @@
+portalocker (0.5~ds0-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release:
+- Python3 support.
+  * Add Python3 package.
+
+ -- Alessio Treglia ales...@debian.org  Wed, 30 Apr 2014 11:31:17 +0100
+
 portalocker (0.4~ds0-2) unstable; urgency=low
 
   * New Maintainer (Closes: #726634).
diff -Nru portalocker-0.4~ds0/debian/control portalocker-0.5~ds0/debian/control
--- portalocker-0.4~ds0/debian/control	2014-01-05 22:34:57.0 +
+++ portalocker-0.5~ds0/debian/control	2014-04-30 11:34:04.0 +0100
@@ -4,9 +4,15 @@
 Maintainer: Josue Ortega josueort...@debian.org.gt
 Build-Depends:
  debhelper (= 9~),
+ dh-python,
  python-all,
- python-setuptools
+ python-pytest,
+ python-setuptools,
+ python3-all,
+ python3-pytest,
+ python3-setuptools
 X-Python-Version: = 2.6
+X-Python3-Version: = 3.2
 Standards-Version: 3.9.5
 Homepage: https://github.com/WoLpH/portalocker
 
@@ -21,13 +27,13 @@
  .
  This is the Python 2 version of the package.
 
-#Package: python3-portalocker
-#Architecture: all
-#Depends:
-# ${misc:Depends},
-# ${python3:Depends}
-#Description: easy API to file locking (Python 3)
-# Portalocker is a cross-platform library to provide
-# an easy API to file locking.
-# .
-# This is the Python 3 version of the package.
+Package: python3-portalocker
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python3:Depends}
+Description: easy API to file locking (Python 3)
+ Portalocker is a cross-platform library to provide
+ an easy API to file locking.
+ .
+ This is the Python 3 version of the package.
diff -Nru portalocker-0.4~ds0/debian/python-portalocker.install portalocker-0.5~ds0/debian/python-portalocker.install
--- portalocker-0.4~ds0/debian/python-portalocker.install	1970-01-01 01:00:00.0 +0100
+++ portalocker-0.5~ds0/debian/python-portalocker.install	2013-03-24 17:57:42.0 +
@@ -0,0 +1 @@
+usr/lib/python2*
diff -Nru portalocker-0.4~ds0/debian/python-portalocker.install.off portalocker-0.5~ds0/debian/python-portalocker.install.off
--- portalocker-0.4~ds0/debian/python-portalocker.install.off	2013-03-24 17:57:42.0 +
+++ portalocker-0.5~ds0/debian/python-portalocker.install.off	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-usr/lib/python2*
diff -Nru portalocker-0.4~ds0/debian/rules portalocker-0.5~ds0/debian/rules
--- portalocker-0.4~ds0/debian/rules	2014-04-12 10:25:04.0 +0100
+++ portalocker-0.5~ds0/debian/rules	2014-04-30 11:39:05.0 +0100
@@ -2,13 +2,32 @@
 
 export REPACK_SH=$(CURDIR)/debian/repack.sh
 
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
+
+
+# Skipping tests as upstream doesn't provide them along with the tarball
+override_dh_auto_test:
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build
 	rm -rf *.egg-info
 
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
+
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+	dh_auto_install
+
 get-orig-source:
 	uscan --force-download
diff -Nru portalocker-0.4~ds0/debian/rules.python3 portalocker-0.5~ds0/debian/rules.python3
--- portalocker-0.4~ds0/debian/rules.python3	2013-03-24 18:34:39.0 +
+++ portalocker-0.5~ds0/debian/rules.python3	1970-01-01 01:00:00.0 +0100
@@ -1,36 +0,0 @@
-#!/usr/bin/make -f
-
-export 

Bug#746474: portalocker: diff for NMU version 0.5~ds0-0.1

2014-04-30 Thread Alessio Treglia
Hello again,

I'm attaching a patch showing the differences between the debian/
directories only as well.

Cheers.

-- 
Alessio Treglia  | www.alessiotreglia.com
Debian Developer | ales...@debian.org
Ubuntu Core Developer|  quadris...@ubuntu.com
0416 0004 A827 6E40 BB98 90FB E8A4 8AE5 311D 765A
 changelog  |9 +
 control|   28 +---
 python-portalocker.install |1 +
 python-portalocker.install.off |1 -
 rules  |   21 -
 rules.python3  |   36 
 6 files changed, 47 insertions(+), 49 deletions(-)
diff -Nru portalocker-0.4~ds0/debian/changelog portalocker-0.5~ds0.orig/debian/changelog
--- portalocker-0.4~ds0/debian/changelog	2014-01-05 22:37:03.0 +
+++ portalocker-0.5~ds0.orig/debian/changelog	2014-04-30 11:41:45.863815966 +0100
@@ -1,3 +1,12 @@
+portalocker (0.5~ds0-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release:
+- Python3 support.
+  * Add Python3 package.
+
+ -- Alessio Treglia ales...@debian.org  Wed, 30 Apr 2014 11:31:17 +0100
+
 portalocker (0.4~ds0-2) unstable; urgency=low
 
   * New Maintainer (Closes: #726634).
diff -Nru portalocker-0.4~ds0/debian/control portalocker-0.5~ds0.orig/debian/control
--- portalocker-0.4~ds0/debian/control	2014-01-05 22:34:57.0 +
+++ portalocker-0.5~ds0.orig/debian/control	2014-04-30 11:34:04.447028708 +0100
@@ -4,9 +4,15 @@
 Maintainer: Josue Ortega josueort...@debian.org.gt
 Build-Depends:
  debhelper (= 9~),
+ dh-python,
  python-all,
- python-setuptools
+ python-pytest,
+ python-setuptools,
+ python3-all,
+ python3-pytest,
+ python3-setuptools
 X-Python-Version: = 2.6
+X-Python3-Version: = 3.2
 Standards-Version: 3.9.5
 Homepage: https://github.com/WoLpH/portalocker
 
@@ -21,13 +27,13 @@
  .
  This is the Python 2 version of the package.
 
-#Package: python3-portalocker
-#Architecture: all
-#Depends:
-# ${misc:Depends},
-# ${python3:Depends}
-#Description: easy API to file locking (Python 3)
-# Portalocker is a cross-platform library to provide
-# an easy API to file locking.
-# .
-# This is the Python 3 version of the package.
+Package: python3-portalocker
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python3:Depends}
+Description: easy API to file locking (Python 3)
+ Portalocker is a cross-platform library to provide
+ an easy API to file locking.
+ .
+ This is the Python 3 version of the package.
diff -Nru portalocker-0.4~ds0/debian/python-portalocker.install portalocker-0.5~ds0.orig/debian/python-portalocker.install
--- portalocker-0.4~ds0/debian/python-portalocker.install	1970-01-01 01:00:00.0 +0100
+++ portalocker-0.5~ds0.orig/debian/python-portalocker.install	2013-03-24 17:57:42.0 +
@@ -0,0 +1 @@
+usr/lib/python2*
diff -Nru portalocker-0.4~ds0/debian/python-portalocker.install.off portalocker-0.5~ds0.orig/debian/python-portalocker.install.off
--- portalocker-0.4~ds0/debian/python-portalocker.install.off	2013-03-24 17:57:42.0 +
+++ portalocker-0.5~ds0.orig/debian/python-portalocker.install.off	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-usr/lib/python2*
diff -Nru portalocker-0.4~ds0/debian/rules portalocker-0.5~ds0.orig/debian/rules
--- portalocker-0.4~ds0/debian/rules	2014-04-12 10:25:04.0 +0100
+++ portalocker-0.5~ds0.orig/debian/rules	2014-04-30 11:39:05.272759344 +0100
@@ -2,13 +2,32 @@
 
 export REPACK_SH=$(CURDIR)/debian/repack.sh
 
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
+
+
+# Skipping tests as upstream doesn't provide them along with the tarball
+override_dh_auto_test:
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build
 	rm -rf *.egg-info
 
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
+
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+	dh_auto_install
+
 get-orig-source:
 	uscan --force-download
diff -Nru portalocker-0.4~ds0/debian/rules.python3 portalocker-0.5~ds0.orig/debian/rules.python3
--- portalocker-0.4~ds0/debian/rules.python3	2013-03-24 18:34:39.0 +
+++ portalocker-0.5~ds0.orig/debian/rules.python3	1970-01-01 01:00:00.0 +0100
@@ -1,36 +0,0 @@
-#!/usr/bin/make -f
-
-export REPACK_SH=$(CURDIR)/debian/repack.sh
-
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
-
-%:
-	dh $@ --with python2,python3
-
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
-	python$* setup.py test -vv
-
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-endif
-
-build-python%:
-	python$* setup.py build
-
-override_dh_auto_build: $(PYTHON3:%=build-python%)
-	dh_auto_build
-
-install-python%:
-	python$* setup.py 

Bug#746474: portalocker: diff for NMU version 0.5~ds0-0.1

2014-04-30 Thread Josué Ortega
Hi Alessio

I don't see any problem with your intent to upload. Feel free to upload it
:)
And thanks for adding the Python 3 support.

-- 
Josue Ortega
Happy Hacking
http://josueortega.org
PGP key 4096R/AB4AFD3F 2012-08-20
Fingerprint = 7733 B328 D279 5F5B E232  5ADD 0150 9D5C AB4A FD3F