Bug#786292: nicotine: diff for NMU version 1.2.16+dfsg-1.1

2015-08-23 Thread Josselin Mouette
Le dimanche 23 août 2015 à 16:28 +0500, Andrey Rahmatullin a écrit : 
 I've prepared an NMU for nicotine (versioned as 1.2.16+dfsg-1.1) and
 uploaded it to DELAYED/5. Please feel free to tell me if I
 should delay it longer.

Thanks for the NMU. Are you sure you’re not forgetting a
XB-Python-Version: (= 2.5) ?

-- 
 .''`.  Josselin Mouette
: :' :
`. `'
  `-



Bug#786292: nicotine: diff for NMU version 1.2.16+dfsg-1.1

2015-08-23 Thread Andrey Rahmatullin
On Sun, Aug 23, 2015 at 08:17:11PM +0200, Josselin Mouette wrote:
  I've prepared an NMU for nicotine (versioned as 1.2.16+dfsg-1.1) and
  uploaded it to DELAYED/5. Please feel free to tell me if I
  should delay it longer.
 
 Thanks for the NMU. Are you sure you’re not forgetting a
 XB-Python-Version: (= 2.5) ?

https://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html#s-specifying_versions
The use of XB-Python-Version in the binary package paragraphs of
debian/control file has been deprecated and should be removed in the
normal course of package updates. 

Also, we don't have 2.5 for quite some time.

-- 
WBR, wRAR


signature.asc
Description: Digital signature


Bug#786292: nicotine: diff for NMU version 1.2.16+dfsg-1.1

2015-08-23 Thread Andrey Rahmatullin
Control: tags 786292 + patch
Control: tags 786292 + pending

Dear maintainer,

I've prepared an NMU for nicotine (versioned as 1.2.16+dfsg-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
WBR, wRAR
diff -Nru nicotine-1.2.16+dfsg/debian/changelog nicotine-1.2.16+dfsg/debian/changelog
--- nicotine-1.2.16+dfsg/debian/changelog	2011-05-19 03:18:38.0 +0600
+++ nicotine-1.2.16+dfsg/debian/changelog	2015-08-23 16:19:15.0 +0500
@@ -1,3 +1,11 @@
+nicotine (1.2.16+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Port from python-support to dh-python (Closes: #786292)
+  * Drop debian/pyversions
+
+ -- Andrey Rahmatullin w...@debian.org  Sun, 23 Aug 2015 16:18:47 +0500
+
 nicotine (1.2.16+dfsg-1) unstable; urgency=low
 
   * New upstream release. Closes: #626887.
diff -Nru nicotine-1.2.16+dfsg/debian/control nicotine-1.2.16+dfsg/debian/control
--- nicotine-1.2.16+dfsg/debian/control	2011-05-19 01:39:41.0 +0600
+++ nicotine-1.2.16+dfsg/debian/control	2015-08-23 16:21:36.0 +0500
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Josselin Mouette j...@debian.org
-Build-Depends: debhelper (= 5), gettext, python-support (= 0.4)
+Build-Depends: debhelper (= 5), gettext, python-all, dh-python
 Standards-Version: 3.8.2
 Homepage: http://www.nicotine-plus.org/
 
diff -Nru nicotine-1.2.16+dfsg/debian/install nicotine-1.2.16+dfsg/debian/install
--- nicotine-1.2.16+dfsg/debian/install	2011-05-19 01:51:21.0 +0600
+++ nicotine-1.2.16+dfsg/debian/install	2015-08-23 16:26:39.0 +0500
@@ -2,4 +2,4 @@
 files/nicotine-plus.svg /usr/share/icons/hicolor/scalable/apps
 files/*.desktop /usr/share/applications
 nicotine.py nicotine-import-winconfig /usr/bin
-pynicotine /usr/share/python-support/nicotine
+pynicotine /usr/lib/python2.7/dist-packages
diff -Nru nicotine-1.2.16+dfsg/debian/pyversions nicotine-1.2.16+dfsg/debian/pyversions
--- nicotine-1.2.16+dfsg/debian/pyversions	2011-05-19 01:37:41.0 +0600
+++ nicotine-1.2.16+dfsg/debian/pyversions	1970-01-01 05:00:00.0 +0500
@@ -1 +0,0 @@
-2.5-
diff -Nru nicotine-1.2.16+dfsg/debian/rules nicotine-1.2.16+dfsg/debian/rules
--- nicotine-1.2.16+dfsg/debian/rules	2011-05-19 02:24:48.0 +0600
+++ nicotine-1.2.16+dfsg/debian/rules	2015-08-23 16:18:04.0 +0500
@@ -58,7 +58,7 @@
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_pysupport
+	dh_python2
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums


signature.asc
Description: Digital signature