[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.12-dfsg-1

[Felix Geyer]

The following commit has been merged in the master branch:
commit 81583b3d0ccfdd24904e6dbfbb63cbef686a8d07
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Apr 3 12:56:18 2012 +0200

    Drop 33-link-static-libgsoap.patch, fixed upstream.

diff --git a/debian/changelog b/debian/changelog
index 13887e9..3e81592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ virtualbox (4.1.12-dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Drop 36-ubuntu-pae.patch, applied upstream.
+  * Drop 33-link-static-libgsoap.patch, fixed upstream.
   * Make the vboxpci module buildable for a i386 kernel when running amd64.
     (Closes: #664730)
     - Update 12-make-module.patch
diff --git a/debian/patches/33-link-static-libgsoap.patch b/debian/patches/33-link-static-libgsoap.patch
deleted file mode 100644
index 4ef177a..0000000
--- a/debian/patches/33-link-static-libgsoap.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Link against the static gsoapssl++ library.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-Bug-Debian: http://bugs.debian.org/632368
-
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -2021,16 +2021,22 @@ check_gsoap()
-           fi
-         fi
-         if [ -f "$GSOAP_IMPORT/stlvector.h" ]; then
--          cnf_append "VBOX_GSOAP_INSTALLED"   "1"
--          cnf_append "VBOX_PATH_GSOAP"        "$GSOAP"
--          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 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"
-+            if [ -f "$GSOAP/share/gsoap/stdsoap2.cpp" ]; then
-+              cnf_append "VBOX_GSOAP_CXX_SOURCES" "$GSOAP/share/gsoap/stdsoap2.cpp"
-+            else
-+              cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
-+            fi
-+            cnf_append "VBOX_GSOAP_CXX_LIBS"    "$GSOAP_LIBDIR/libgsoapssl++.a"
-+            log_success "found"
-           else
--            cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
-+            log_failure "libgsoapssl++.a not found -- disabling webservice"
-+            cnf_append "VBOX_WITH_WEBSERVICES" ""
-           fi
--          cnf_append "VBOX_GSOAP_CXX_LIBS"    "libgsoap++"
--          log_success "found"
-         else
-           log_failure "stlvector.h not found -- disabling webservice"
-           cnf_append "VBOX_WITH_WEBSERVICES" ""
diff --git a/debian/patches/series b/debian/patches/series
index 76deb13..32a41e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,4 @@
 29-fix-ftbfs-as-needed.patch
 30-usb-warning-filters.patch
 32-disable-guest-version-check.patch
-33-link-static-libgsoap.patch
 35-libvdeplug-soname.patch

-- 
virtualbox Debian packaging