[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.8-dfsg-2-10-g5be51b6

[Felix Geyer]

The following commit has been merged in the master branch:
commit 1ff46d244f096cf1147befb50e33c77e80c2801a
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Mar 16 11:57:00 2012 +0100

    Link against libgsoapssl++ instead of libgsoap++.

diff --git a/debian/changelog b/debian/changelog
index e8635bd..d519980 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ virtualbox (4.1.10-dfsg-1) UNRELEASED; urgency=low
 
   * Build-depend on libpng-dev instead of libpng12-dev. (Closes: #662537)
   * Refresh 18-system-xorg.patch.
+  * Link against libgsoapssl++ instead of libgsoap++.
+    - Update 33-link-static-libgsoap.patch
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 05 Mar 2012 14:54:53 +0100
 
diff --git a/debian/patches/33-link-static-libgsoap.patch b/debian/patches/33-link-static-libgsoap.patch
index 923f8d3..4ef177a 100644
--- a/debian/patches/33-link-static-libgsoap.patch
+++ b/debian/patches/33-link-static-libgsoap.patch
@@ -1,4 +1,4 @@
-Description: Link against the static gsoap++ library.
+Description: Link against the static gsoapssl++ library.
 Author: Felix Geyer <debfx-pkg at fobos.de>
 Bug-Debian: http://bugs.debian.org/632368
 
@@ -14,8 +14,8 @@ diff --git a/configure b/configure
 -          cnf_append "VBOX_PATH_GSOAP_IMPORT" "$GSOAP_IMPORT"
 -          if [ -f "$GSOAP/share/gsoap/stdsoap2.cpp" ]; then
 -            cnf_append "VBOX_GSOAP_CXX_SOURCES" "$GSOAP/share/gsoap/stdsoap2.cpp"
-+          GSOAP_LIBDIR=`pkg-config --variable=libdir gsoap++`
-+          if [ $? -eq 0 ] && [ -f "$GSOAP_LIBDIR/libgsoap++.a" ]; then
++          GSOAP_LIBDIR=`pkg-config --variable=libdir gsoapssl++`
++          if [ $? -eq 0 ] && [ -f "$GSOAP_LIBDIR/libgsoapssl++.a" ]; then
 +            cnf_append "VBOX_GSOAP_INSTALLED"   "1"
 +            cnf_append "VBOX_PATH_GSOAP"        "$GSOAP"
 +            cnf_append "VBOX_PATH_GSOAP_IMPORT" "$GSOAP_IMPORT"
@@ -24,11 +24,11 @@ diff --git a/configure b/configure
 +            else
 +              cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
 +            fi
-+            cnf_append "VBOX_GSOAP_CXX_LIBS"    "$GSOAP_LIBDIR/libgsoap++.a"
++            cnf_append "VBOX_GSOAP_CXX_LIBS"    "$GSOAP_LIBDIR/libgsoapssl++.a"
 +            log_success "found"
            else
 -            cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
-+            log_failure "libgsoap++.a not found -- disabling webservice"
++            log_failure "libgsoapssl++.a not found -- disabling webservice"
 +            cnf_append "VBOX_WITH_WEBSERVICES" ""
            fi
 -          cnf_append "VBOX_GSOAP_CXX_LIBS"    "libgsoap++"

-- 
virtualbox Debian packaging