[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-180-g393bf19



The following commit has been merged in the debian-experimental-4.0 branch:
commit 393bf1992f75d34ce85c63a452bcf13dc853d831
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Dec 10 19:36:17 2012 +0100

    we don't need wget anymore..

diff --git a/patches/series b/patches/series
index 874b44c..f98b090 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ ignore-sc_cellrangesbase-fails.diff
 build-dont-run-checks.diff
 disable-flaky-unoapi-tests.diff
 dont-touch-urd.diff
+we-dont-need-wget.diff
diff --git a/patches/we-dont-need-wget.diff b/patches/we-dont-need-wget.diff
new file mode 100644
index 0000000..2343757
--- /dev/null
+++ b/patches/we-dont-need-wget.diff
@@ -0,0 +1,36 @@
+ configure.ac |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+New commits:
+commit 3c64d866379c3ae78b95b68fffe62685037da707
+Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date:   Mon Dec 10 19:06:48 2012 +0100
+
+    no need for wget/curl when not fetching anything
+    
+    Change-Id: I097675450a0eed87eccf90356c81657485609d13
+
+diff --git a/configure.ac b/configure.ac
+index caac659..2b12bca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11753,6 +11753,10 @@ AC_SUBST(SCPDEFS)
+ #
+ WGET=
+ MD5SUM=
++CURL=
++
++if test "$enable_fetch_external" != "no"; then
++
+ CURL=`which curl 2>/dev/null`
+ 
+ for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
+@@ -11794,6 +11798,8 @@ if test -z "$MD5SUM"; then
+     add_warning "no md5sum: found!"
+ fi
+ 
++fi
++
+ AC_SUBST(WGET)
+ AC_SUBST(CURL)
+ AC_SUBST(MD5SUM)

-- 
LibreOffice packaging repository


Reply to: