this is the first patch I sent to the debian maintainer
>From 8f2a7c8d8b017463390964c2f3f50a73f3b40359 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <[email protected]>
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 protected]> 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
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1349386
Title:
please merge libvncserver from debian
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/libvncserver/+bug/1349386/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
