[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-48-g8c8c94f

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8c8c94f5163e539f473588b7471aa1921f355265
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Wed Jun 23 23:25:43 2010 +0100

    Use configure option instead of patching

diff --git a/debian/patches/101_certificates_paths.diff b/debian/patches/101_certificates_paths.diff
deleted file mode 100644
index 849228b..0000000
--- a/debian/patches/101_certificates_paths.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Add the certificates from the ca-certificates package to the path where gnutls
-look for certificates
-
-
-Index: debian.git/modules/misc/gnutls.c
-===================================================================
---- debian.git.orig/modules/misc/gnutls.c	2010-06-23 00:46:41.955476182 +0200
-+++ debian.git/modules/misc/gnutls.c	2010-06-23 00:46:50.164226478 +0200
-@@ -699,6 +699,10 @@
-         sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
-         gnutls_Addx509File (VLC_OBJECT (p_session),
-                             p_sys->x509_cred, path, false);
-+    gnutls_Addx509File( VLC_OBJECT(p_session),
-+                        p_sys->x509_cred,
-+                        "/etc/ssl/certs/ca-certificates.crt",false );
-+
-     }
-     p_session->pf_handshake = gnutls_HandshakeAndValidate;
-     /*p_session->pf_handshake = gnutls_ContinueHandshake;*/
diff --git a/debian/patches/series b/debian/patches/series
index 8ac3692..1e529a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 052_as-needed.diff
-101_certificates_paths.diff
 102_dejavu_font.diff
 104_notify.diff
 200_osdmenu_paths.diff
diff --git a/debian/rules b/debian/rules
index d426fd4..2cbf929 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ confflags += \
 	--enable-fast-install \
 	--enable-release \
 	--prefix=/usr \
+	--sysconfdir=/etc \
 	--with-binary-version=$(DEBIAN_VERSION) \
 	$(NULL)
 # configure features

-- 
VLC media player packaging