Bug#752809: qt4-perl: diff for NMU version 4.8.4-1.1

2016-09-30 Thread gregor herrmann
On Fri, 30 Sep 2016 03:11:43 +0200, Andreas Beckmann wrote:

> >> Could this be fixed in experimental, too?
> > I guess that wouldn't work very well right now, since experimental
> > already has perl 5.24; so qt4-perl('s binary packages) would get a
> Now that the transition to perl 5.24 has finished, perhaps someone could
> take a look again at these packages ...

I took a look; some findings:

This needs also the fixes for #811672 and probably #765681.
I.e. all patches from 4.8.4-1.3.
All the patches apply cleanly for 4.10.2-1.
Which is good; but suspicious. So:

% debsnap qt4-perl 4.8.4-1
% debsnap qt4-perl --force 4.10.2-1
% debdiff source-qt4-perl/qt4-perl_4.8.4-1.dsc 
source-qt4-perl/qt4-perl_4.10.2-1.dsc
[..]
diff -Nru qt4-perl-4.8.4/debian/cdbs-install-list 
qt4-perl-4.10.2/debian/cdbs-install-list
--- qt4-perl-4.8.4/debian/cdbs-install-list 1970-01-01 01:00:00.0 +0100
+++ qt4-perl-4.10.2/debian/cdbs-install-list2013-04-07 18:01:31.0 
+0200
@@ -0,0 +1,66 @@
[..]
diff -Nru qt4-perl-4.8.4/debian/cdbs-package-list 
qt4-perl-4.10.2/debian/cdbs-package-list
--- qt4-perl-4.8.4/debian/cdbs-package-list 1970-01-01 01:00:00.0 +0100
+++ qt4-perl-4.10.2/debian/cdbs-package-list2013-04-07 18:01:31.0 
+0200
[..]
diff -Nru qt4-perl-4.8.4/debian/changelog qt4-perl-4.10.2/debian/changelog
--- qt4-perl-4.8.4/debian/changelog 2012-06-20 23:52:20.0 +0200
+++ qt4-perl-4.10.2/debian/changelog2013-04-13 16:23:25.0 +0200
@@ -1,3 +1,9 @@
+qt4-perl (4.10.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela   Sun, 07 Apr 2013 15:53:50 +
+
 qt4-perl (4.8.4-1) unstable; urgency=low
 
   * New upstream release
diff -Nru qt4-perl-4.8.4/debian/libqtgui4-perl.install 
qt4-perl-4.10.2/debian/libqtgui4-perl.install
--- qt4-perl-4.8.4/debian/libqtgui4-perl.install2010-07-13 
10:56:06.0 +0200
+++ qt4-perl-4.10.2/debian/libqtgui4-perl.install   2013-04-07 
18:03:47.0 +0200
@@ -1,3 +1,4 @@
 usr/lib/perl5/QtGui4.pm
 usr/lib/perl5/auto/QtGui4/QtGui4.so
 usr/bin/puic4
+usr/bin/prcc4_bin

So 4.10.2-1 adds debian/cdbs-install-list and
debian/cdbs-package-list, a changelog entry, and one binary to
debian/libqtgui4-perl.install. Besides that there are no changes. In
my view this doesn't look like a new upstream release.


To be honest, I'm not really sure what the purpose of 4.10.2 which is
really 4.8.4 in experimental is, and I'd rather see it removed than
spending more time on it. Still, if there is a purpose, I'm happy to
do an NMU since I already have everything locally. -- I could just as
well attach the debdiff, I guess ...


Cheers,
gregor

-- 
 .''`.  Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer -  https://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Soluna Samay: My Own Medicine
diff -Nru qt4-perl-4.10.2/debian/changelog qt4-perl-4.10.2/debian/changelog
--- qt4-perl-4.10.2/debian/changelog	2013-04-13 16:23:25.0 +0200
+++ qt4-perl-4.10.2/debian/changelog	2016-09-30 13:14:40.0 +0200
@@ -1,3 +1,29 @@
+qt4-perl (4.10.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Forward-port all changes in 4.8.4-1.{1,2,3}:
+
+  [ gregor herrmann ]
+  * Fix "hardcodes /usr/lib/perl5":
+dynamically create debian/*.install files with the correct path from
+debian/rules during build
+(Closes: #752809)
+
+  [ Scott Kitterman ]
+  * Fix perl 5.20 incompatiblities (Closes: #765681)
+- Add debian/patches/qtcore4.pmupdate.diff to update QtCore.pm to current
+  upstream for perl 5.18 compatibility
+- Add debian/patches/perl5.20.diff from Ubuntu for basic perl 5.20 compat
+- Add debian/patches/additionalperl5.20.diff from upstream to resolve the
+  final issue
+
+  [ gregor herrmann ]
+  * Fix "FTBFS with GCC 6: cannot convert x to y":
+add patch from upstream bug tracker to properly initialize
+smokeperl_object. (Closes: #811672)
+
+ -- gregor herrmann   Fri, 30 Sep 2016 13:14:40 +0200
+
 qt4-perl (4.10.2-1) experimental; urgency=low
 
   * New upstream release
diff -Nru qt4-perl-4.10.2/debian/libqtcore4-perl.install qt4-perl-4.10.2/debian/libqtcore4-perl.install
--- qt4-perl-4.10.2/debian/libqtcore4-perl.install	2010-07-07 15:46:05.0 +0200
+++ qt4-perl-4.10.2/debian/libqtcore4-perl.install	1970-01-01 01:00:00.0 +0100
@@ -1,7 +0,0 @@
-usr/lib/perl5/auto/QtCore4/QtCore4.so
-usr/lib/perl5/QtCore4/classinfo.pm
-usr/lib/perl5/QtCore4/isa.pm
-usr/lib/perl5/QtCore4/signals.pm
-usr/lib/perl5/QtCore4/debug.pm
-usr/lib/perl5/QtCore4/slots.pm
-usr/lib/perl5/QtCore4.pm
diff -Nru qt4-perl-4.10.2/debian/libqtcore4-perl.install.in qt4-perl-4.10.2/debian/libqtcore4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtcore4-perl.install.in	1970-01-01 01:00:00.0 +0100
+++ 

Bug#752809: qt4-perl: diff for NMU version 4.8.4-1.1

2016-09-29 Thread Andreas Beckmann
On 2016-05-25 10:36, gregor herrmann wrote:
> On Wed, 25 May 2016 10:30:19 +0200, Andreas Beckmann wrote:
> 
>> On Mon, 4 Aug 2014 15:33:04 +0300 Damyan Ivanov  wrote:
>>> I've uploaded an NMU by gregor for qt4-perl (versioned as 4.8.4-1.1) 
>>> to DELAYED/5. Please feel free to tell me if I should delay it longer.
>> Could this be fixed in experimental, too?
> 
> I guess that wouldn't work very well right now, since experimental
> already has perl 5.24; so qt4-perl('s binary packages) would get a

Now that the transition to perl 5.24 has finished, perhaps someone could
take a look again at these packages ...


Thanks

Andreas



Bug#752809: qt4-perl: diff for NMU version 4.8.4-1.1

2016-05-25 Thread gregor herrmann
On Wed, 25 May 2016 10:30:19 +0200, Andreas Beckmann wrote:

> On Mon, 4 Aug 2014 15:33:04 +0300 Damyan Ivanov  wrote:
> > I've uploaded an NMU by gregor for qt4-perl (versioned as 4.8.4-1.1) 
> > to DELAYED/5. Please feel free to tell me if I should delay it longer.
> Could this be fixed in experimental, too?

I guess that wouldn't work very well right now, since experimental
already has perl 5.24; so qt4-perl('s binary packages) would get a
dependency on perl(-api-)5.24 which makes them uninstallable in
unstable. And updating the whole system to 5.24 also doesn't work yet
since the usual 500-600 packages need to be rebuilt before.


Cheers,
gregor

-- 
 .''`.  Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer -  https://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   BOFH excuse #374:  It's the InterNIC's fault. 



Bug#752809: qt4-perl: diff for NMU version 4.8.4-1.1

2016-05-25 Thread Andreas Beckmann
On Mon, 4 Aug 2014 15:33:04 +0300 Damyan Ivanov  wrote:
> I've uploaded an NMU by gregor for qt4-perl (versioned as 4.8.4-1.1) 
> to DELAYED/5. Please feel free to tell me if I should delay it longer.

Could this be fixed in experimental, too?


Thanks,

Andreas



Bug#752809: qt4-perl: diff for NMU version 4.8.4-1.1

2014-08-04 Thread Damyan Ivanov
tags 752809 + pending
thanks

Dear maintainer,

I've uploaded an NMU by gregor for qt4-perl (versioned as 4.8.4-1.1) 
to DELAYED/5. Please feel free to tell me if I should delay it longer.

Regards,
dam
diff -Nru qt4-perl-4.8.4/debian/changelog qt4-perl-4.8.4/debian/changelog
--- qt4-perl-4.8.4/debian/changelog	2012-06-21 00:52:20.0 +0300
+++ qt4-perl-4.8.4/debian/changelog	2014-08-04 15:20:09.0 +0300
@@ -1,3 +1,14 @@
+qt4-perl (4.8.4-1.1) unstable; urgency=medium
+
+  [ gregor herrmann ]
+  * Non-maintainer upload.
+  * Fix hardcodes /usr/lib/perl5:
+dynamically create debian/*.install files with the correct path from
+debian/rules during build
+(Closes: #752809)
+
+ -- Damyan Ivanov d...@debian.org  Mon, 04 Aug 2014 12:20:06 +
+
 qt4-perl (4.8.4-1) unstable; urgency=low
 
   * New upstream release
diff -Nru qt4-perl-4.8.4/debian/libqtcore4-perl.install qt4-perl-4.8.4/debian/libqtcore4-perl.install
--- qt4-perl-4.8.4/debian/libqtcore4-perl.install	2010-07-07 16:46:05.0 +0300
+++ qt4-perl-4.8.4/debian/libqtcore4-perl.install	1970-01-01 02:00:00.0 +0200
@@ -1,7 +0,0 @@
-usr/lib/perl5/auto/QtCore4/QtCore4.so
-usr/lib/perl5/QtCore4/classinfo.pm
-usr/lib/perl5/QtCore4/isa.pm
-usr/lib/perl5/QtCore4/signals.pm
-usr/lib/perl5/QtCore4/debug.pm
-usr/lib/perl5/QtCore4/slots.pm
-usr/lib/perl5/QtCore4.pm
diff -Nru qt4-perl-4.8.4/debian/libqtcore4-perl.install.in qt4-perl-4.8.4/debian/libqtcore4-perl.install.in
--- qt4-perl-4.8.4/debian/libqtcore4-perl.install.in	1970-01-01 02:00:00.0 +0200
+++ qt4-perl-4.8.4/debian/libqtcore4-perl.install.in	2014-08-04 15:14:17.0 +0300
@@ -0,0 +1,7 @@
+@ARCHLIB@/auto/QtCore4/QtCore4.so
+@ARCHLIB@/QtCore4/classinfo.pm
+@ARCHLIB@/QtCore4/isa.pm
+@ARCHLIB@/QtCore4/signals.pm
+@ARCHLIB@/QtCore4/debug.pm
+@ARCHLIB@/QtCore4/slots.pm
+@ARCHLIB@/QtCore4.pm
diff -Nru qt4-perl-4.8.4/debian/libqtgui4-perl.install qt4-perl-4.8.4/debian/libqtgui4-perl.install
--- qt4-perl-4.8.4/debian/libqtgui4-perl.install	2010-07-13 11:56:06.0 +0300
+++ qt4-perl-4.8.4/debian/libqtgui4-perl.install	1970-01-01 02:00:00.0 +0200
@@ -1,3 +0,0 @@
-usr/lib/perl5/QtGui4.pm
-usr/lib/perl5/auto/QtGui4/QtGui4.so
-usr/bin/puic4
diff -Nru qt4-perl-4.8.4/debian/libqtgui4-perl.install.in qt4-perl-4.8.4/debian/libqtgui4-perl.install.in
--- qt4-perl-4.8.4/debian/libqtgui4-perl.install.in	1970-01-01 02:00:00.0 +0200
+++ qt4-perl-4.8.4/debian/libqtgui4-perl.install.in	2014-08-04 15:16:45.0 +0300
@@ -0,0 +1,3 @@
+@ARCHLIB@/QtGui4.pm
+@ARCHLIB@/auto/QtGui4/QtGui4.so
+usr/bin/puic4
diff -Nru qt4-perl-4.8.4/debian/libqtnetwork4-perl.install qt4-perl-4.8.4/debian/libqtnetwork4-perl.install
--- qt4-perl-4.8.4/debian/libqtnetwork4-perl.install	2010-07-13 11:56:10.0 +0300
+++ qt4-perl-4.8.4/debian/libqtnetwork4-perl.install	1970-01-01 02:00:00.0 +0200
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtNetwork4.pm
-usr/lib/perl5/auto/QtNetwork4/QtNetwork4.so
diff -Nru qt4-perl-4.8.4/debian/libqtnetwork4-perl.install.in qt4-perl-4.8.4/debian/libqtnetwork4-perl.install.in
--- qt4-perl-4.8.4/debian/libqtnetwork4-perl.install.in	1970-01-01 02:00:00.0 +0200
+++ qt4-perl-4.8.4/debian/libqtnetwork4-perl.install.in	2014-08-04 15:14:28.0 +0300
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtNetwork4.pm
+@ARCHLIB@/auto/QtNetwork4/QtNetwork4.so
diff -Nru qt4-perl-4.8.4/debian/libqttest4-perl.install qt4-perl-4.8.4/debian/libqttest4-perl.install
--- qt4-perl-4.8.4/debian/libqttest4-perl.install	2010-07-13 11:56:14.0 +0300
+++ qt4-perl-4.8.4/debian/libqttest4-perl.install	1970-01-01 02:00:00.0 +0200
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtTest4.pm
-usr/lib/perl5/auto/QtTest4/QtTest4.so
diff -Nru qt4-perl-4.8.4/debian/libqttest4-perl.install.in qt4-perl-4.8.4/debian/libqttest4-perl.install.in
--- qt4-perl-4.8.4/debian/libqttest4-perl.install.in	1970-01-01 02:00:00.0 +0200
+++ qt4-perl-4.8.4/debian/libqttest4-perl.install.in	2014-08-04 15:14:28.0 +0300
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtTest4.pm
+@ARCHLIB@/auto/QtTest4/QtTest4.so
diff -Nru qt4-perl-4.8.4/debian/libqtxml4-perl.install qt4-perl-4.8.4/debian/libqtxml4-perl.install
--- qt4-perl-4.8.4/debian/libqtxml4-perl.install	2010-07-13 11:56:17.0 +0300
+++ qt4-perl-4.8.4/debian/libqtxml4-perl.install	1970-01-01 02:00:00.0 +0200
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtXml4.pm
-usr/lib/perl5/auto/QtXml4/QtXml4.so
diff -Nru qt4-perl-4.8.4/debian/libqtxml4-perl.install.in qt4-perl-4.8.4/debian/libqtxml4-perl.install.in
--- qt4-perl-4.8.4/debian/libqtxml4-perl.install.in	1970-01-01 02:00:00.0 +0200
+++ qt4-perl-4.8.4/debian/libqtxml4-perl.install.in	2014-08-04 15:14:28.0 +0300
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtXml4.pm
+@ARCHLIB@/auto/QtXml4/QtXml4.so
diff -Nru qt4-perl-4.8.4/debian/rules qt4-perl-4.8.4/debian/rules
--- qt4-perl-4.8.4/debian/rules	2010-07-07 17:21:36.0 +0300
+++ qt4-perl-4.8.4/debian/rules	2014-08-04 15:19:09.0 +0300
@@ -3,3 +3,13 @@
 include