From: Bdale Garbee <bdale@gag.com>
Date: Mon, 8 Oct 2012 23:48:35 +0000 (-0600)
Subject: Merge tag 'upstream/3.3.2'
X-Git-Tag: debian/3.3.3-1~13
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=109540caa4e37a3663b3dcfb9a205b9609e3f561;p=debian%2Famanda

Merge tag 'upstream/3.3.2'

Upstream version 3.3.2

Conflicts:
	common-src/glib-util.c
	perl/Amanda/Header.pm
---

109540caa4e37a3663b3dcfb9a205b9609e3f561
diff --cc common-src/glib-util.c
index 99f55f7,9fd8ced..a20d745
--- a/common-src/glib-util.c
+++ b/common-src/glib-util.c
@@@ -38,8 -95,14 +95,13 @@@ glib_init(void) 
      if (did_glib_init) return;
      did_glib_init = TRUE;
  
 -    /* set up libcurl (this must happen before threading 
 -     * is initialized) */
 +    /* set up libcurl */
  #ifdef HAVE_LIBCURL
+ # ifdef G_THREADS_ENABLED
+ #  if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31))
+     g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
+ #  endif
+ # endif
      g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
  #endif
  
diff --cc debian/patches/series
index 9394693,0000000..de4e07d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
 +dumpdates-path
 +glib-2.32.patch
 +kfreebsd-ftbfs.diff
- VTAPES-access.diff