Bug#803755: texmaker: diff for NMU version 4.4.1-1.1

[Andreas Bombe]

On Tue, Nov 24, 2015 at 08:36:23PM +0100, Andreas Tille wrote:
> Would you mind commiting your changes to Debian Science svn.  It has
> ACLs set to grant commit permissions to any DD.

Not quite correctly, it seems:

| Sendingdebian/changelog
| Adding debian/patches/fix-qtlocalpeer-compilation
| Sendingdebian/patches/series
| Transmitting file data ...done
| Committing transaction...
| svn: E13: Commit failed (details follow):
| svn: E13: Can't create directory 
'/svn/debian-science/db/transactions/47186-1.txn': Permission denied

Unless there's an error on my part — I haven't used svn in many years
and checked this out with debcheckout --auth.

Also, I assume this means it is accepted and I can move the NMU from
delayed to immediate?


Note, I have looked at the upstream 4.5 release and it already has the
same fix. My patch needs to be dropped again when the new version gets
packaged.

Bug#803755: texmaker: diff for NMU version 4.4.1-1.1

[Andreas Tille]

Hi Andreas,

On Wed, Nov 25, 2015 at 03:52:51AM +0100, Andreas Bombe wrote:
> On Tue, Nov 24, 2015 at 08:36:23PM +0100, Andreas Tille wrote:
> > Would you mind commiting your changes to Debian Science svn.  It has
> > ACLs set to grant commit permissions to any DD.
> 
> Not quite correctly, it seems:
> 
> | Sendingdebian/changelog
> | Adding debian/patches/fix-qtlocalpeer-compilation
> | Sendingdebian/patches/series
> | Transmitting file data ...done
> | Committing transaction...
> | svn: E13: Commit failed (details follow):
> | svn: E13: Can't create directory 
> '/svn/debian-science/db/transactions/47186-1.txn': Permission denied
> 
> Unless there's an error on my part — I haven't used svn in many years
> and checked this out with debcheckout --auth.

Whatever this means - I have committed the diff now.  Thanks for trying
anyway.  May be it is time to move the package to Git. :-) I did not
cared for texmaker for a while and thus I explicitly kept the other
uploaders of Debian Science in CC - just let me know about your plans.
If I do not hear from you in a couple of days I'll do the Git migration
to simplify things for other developers who want to contribute code.

> Also, I assume this means it is accepted and I can move the NMU from
> delayed to immediate?

I'm perfectly fine with low threshold NMUs (or also "Team upload"s).

> Note, I have looked at the upstream 4.5 release and it already has the
> same fix. My patch needs to be dropped again when the new version gets
> packaged.

Thanks for the pointer.  As I said I lost a bit track with texmaker
since I do not use it myself.  I would volunteer to do the SVN -> Git
migration and try to prepare the next version if nobody else is doing
this.

Kind regards

   Andreas.

-- 
http://fam-tille.de

Bug#803755: texmaker: diff for NMU version 4.4.1-1.1

[Andreas Tille]

Hi Andreas,

thanks a lot for caring!

Would you mind commiting your changes to Debian Science svn.  It has
ACLs set to grant commit permissions to any DD.

Thanks again

  Andreas.

On Sun, Nov 22, 2015 at 07:49:47PM +0100, Andreas Bombe wrote:
> Control: tags 803755 + patch
> Control: tags 803755 + pending
> 
> Dear maintainers,
> 
> I've prepared an NMU for texmaker (versioned as 4.4.1-1.1) and
> uploaded it to DELAYED/5. Please feel free to tell me if I
> should delay it longer.
...

-- 
http://fam-tille.de

Bug#803755: texmaker: diff for NMU version 4.4.1-1.1

[Andreas Bombe]

Control: tags 803755 + patch
Control: tags 803755 + pending

Dear maintainers,

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

Regards.
diff -Nru texmaker-4.4.1/debian/changelog texmaker-4.4.1/debian/changelog
--- texmaker-4.4.1/debian/changelog	2014-12-09 20:46:15.0 +0100
+++ texmaker-4.4.1/debian/changelog	2015-11-22 19:23:09.0 +0100
@@ -1,3 +1,11 @@
+texmaker (4.4.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch to add missing QDataStream include in singleapp/qtlocalpeer.cpp
+to fix compilation with current QT5. (Closes: #803755) 
+
+ -- Andreas Bombe   Sun, 22 Nov 2015 19:23:01 +0100
+
 texmaker (4.4.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru texmaker-4.4.1/debian/patches/fix-qtlocalpeer-compilation texmaker-4.4.1/debian/patches/fix-qtlocalpeer-compilation
--- texmaker-4.4.1/debian/patches/fix-qtlocalpeer-compilation	1970-01-01 01:00:00.0 +0100
+++ texmaker-4.4.1/debian/patches/fix-qtlocalpeer-compilation	2015-11-22 19:12:47.0 +0100
@@ -0,0 +1,12 @@
+Index: texmaker-4.4.1/singleapp/qtlocalpeer.cpp
+===
+--- texmaker-4.4.1.orig/singleapp/qtlocalpeer.cpp
 texmaker-4.4.1/singleapp/qtlocalpeer.cpp
+@@ -41,6 +41,7 @@
+ 
+ #include "qtlocalpeer.h"
+ #include 
++#include 
+ #include 
+ 
+ #if defined(Q_OS_WIN)
diff -Nru texmaker-4.4.1/debian/patches/series texmaker-4.4.1/debian/patches/series
--- texmaker-4.4.1/debian/patches/series	2014-12-09 20:08:23.0 +0100
+++ texmaker-4.4.1/debian/patches/series	2015-11-22 19:03:36.0 +0100
@@ -1,3 +1,4 @@
 10_spelling_dict.patch
 20-add-keywords-desktop-file.patch
 use-system-synctex.patch
+fix-qtlocalpeer-compilation