[X2Go-Commits] [x2goclient] 01/139: debian/control: change apache2-dev | libc6-dev build dependency back to apache2-dev only.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit b49846ac046052be25f9c77e60b027748b816e0f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 13 08:33:59 2016 +0100

    debian/control: change apache2-dev | libc6-dev build dependency back to apache2-dev only.
    
    Otherwise, apache2-dev is not installed at all, even though
    theoretically available. The initial reasoning for this dependency type,
    apache2-dev not being available on all Ubuntu/Debian platforms, is not
    true anymore.
---
 debian/changelog |    6 ++++++
 debian/control   |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c788481..c63a51f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
     - onmainwindow.{cpp,h}: don't use a hardcoded path to xmodmap on OS X and
       handle errors more gracefully. Fixes: #487.
     - x2goclient.pro: fix typo --stdlib=... -> -stdlib=... Fixes: #973.
+  * debian/control:
+    - Change apache2-dev | libc6-dev build dependency back to apache2-dev
+      only. Otherwise, apache2-dev is not installed at all, even though
+      theoretically available. The initial reasoning for this dependency type,
+      apache2-dev not being available on all Ubuntu/Debian platforms, is not
+      true anymore.
 
   [ Oleksandr Shneyder ]
   * New upstream release (4.0.5.1):
diff --git a/debian/control b/debian/control
index 46f256b..8104403 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libx11-dev,
  libxpm-dev,
  man2html-base | man2html,
- apache2-dev | libc6-dev,
+ apache2-dev,
 Standards-Version: 3.9.5
 Homepage: http://code.x2go.org/releases/source/x2goclient
 Vcs-Git: git://code.x2go.org/x2goclient.git

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git