please merge libvncserver from debian

[Gianfranco Costamagna]

debdiff attached

[Gianfranco Costamagna (costamagnagianfranco)]

Maybe also something like this
Maintainer: Ubuntu Developers <email address hidden>
XSBC-Original-Maintainer: Luca Falavigna <email address hidden>

might be needed in control file, don't know why it wasn't there in the previous merge

[Martin Pitt (pitti)]

Thanks! Uploaded with adding bug ref to changelog, and running update-maintainer.

[Martin Pitt (pitti)]

This failed to build (discussed on IRC). Please re-subscribe sponsors if/once you have a fix. THanks!

[Gianfranco Costamagna (costamagnagianfranco)]

The fix is already in place and working, I'm talking with Luca on irc to get the package in debian and then plain sync here :)

[Gianfranco Costamagna (costamagnagianfranco)]

this is the first patch I sent to the debian maintainer
From 8f2a7c8d8b017463390964c2f3f50a73f3b40359 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <email address hidden>
Date: Fri, 1 Aug 2014 10:42:25 +0200
Subject: [PATCH 1/2] Use --without-png configure flag, instead of the
 build-conflict

---
 debian/changelog | 5 +++++
 debian/control | 2 --
 debian/rules | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab2e62d..91bf9f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 libvncserver (0.9.9+dfsg-6) UNRELEASED; urgency=medium

+ [ Luca Falavigna ]
   * debian/control:
     - (Build-)depends on libgnutls28-dev and libgcrypt20-dev instead of
       libgnutls-dev and libgcrypt11-dev (Closes: #753126).

+ [ Gianfranco Costamagna ]
+ * Drop the libpng12-dev build conflict, relying instead on a better
+ --without-png configure flag
+
  -- Luca Falavigna <email address hidden> Tue, 01 Jul 2014 21:05:18 +0200

 libvncserver (0.9.9+dfsg-5) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ba38482..9331f47 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,6 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                libgcrypt20-dev,
                zlib1g-dev
-Build-Conflicts: libpng12-0,
- libpng12-dev
 Standards-Version: 3.9.5
 Homepage: http://libvncserver.sourceforge.net
 Vcs-Git: git://anonscm.debian.org/collab-maint/libvncserver.git
diff --git a/debian/rules b/debian/rules
index 05d7707..dd16884 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ ifneq ($(DEB_HOST_ARCH_OS), linux)
 endif

 %:
- dh $@ $(EXTRA_DH_ARG) --with autoreconf
+ dh $@ $(EXTRA_DH_ARG) --with autoreconf --without-png

 override_dh_auto_configure:
  dh_auto_configure -- --disable-silent-rules
--
1.9.1

[Gianfranco Costamagna (costamagnagianfranco)]

And here the second one
From ade2b3f6f54eae4d94bb2e342e19f770566a5bf9 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <email address hidden>
Date: Fri, 1 Aug 2014 10:48:46 +0200
Subject: [PATCH 2/2] Cherry-pick ubuntu ppc64el patch

---
 debian/changelog | 4 ++++
 debian/patches/ppc64el.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series | 1 +
 3 files changed, 31 insertions(+)
 create mode 100644 debian/patches/ppc64el.patch

diff --git a/debian/changelog b/debian/changelog
index 91bf9f2..d2c4ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ libvncserver (0.9.9+dfsg-6) UNRELEASED; urgency=medium
   * Drop the libpng12-dev build conflict, relying instead on a better
     --without-png configure flag

+ [ Matthias Klose ]
+ * debian/patches/ppc64el.patch
+ - Patch acinclude.m4 for ppc64el.
+
  -- Luca Falavigna <email address hidden> Tue, 01 Jul 2014 21:05:18 +0200

 libvncserver (0.9.9+dfsg-5) unstable; urgency=medium
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
new file mode 100644
index 0000000..fde68ec
--- /dev/null
+++ b/debian/patches/ppc64el.patch
@@ -0,0 +1,26 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1137,7 +1137,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -1153,7 +1156,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*)
diff --git a/debian/patches/series b/debian/patches/series
index 1498448..aa2f426 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ no_x11vnc_subdir.patch
 format_string.patch
 multiarch.patch
 listenSock.patch
+ppc64el.patch
--
1.9.1

----

If we get all of them two accepted we can plain sync the package, otherwise another merge will be needed, and I'll provide it

[Launchpad Janitor (janitor)]

This bug was fixed in the package libvncserver - 0.9.9+dfsg-5ubuntu2

---------------
libvncserver (0.9.9+dfsg-5ubuntu2) utopic; urgency=medium

  * Drop the libpng12-dev build conflict, relying instead on a better
    --without-png configure flag.
 -- Gianfranco Costamagna <email address hidden> Fri, 01 Aug 2014 11:11:32 +0200