[Python-apps-commits] r6834 - in packages/mercurial/trunk/debian (4 files)

[vdanjean at users.alioth.debian.org]

    Date: Monday, March 28, 2011 @ 10:40:06
  Author: vdanjean
Revision: 6834

Enable default Debian root certificates

Added:
  packages/mercurial/trunk/debian/cacerts.hgrc
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/rules

Added: packages/mercurial/trunk/debian/cacerts.hgrc
===================================================================
--- packages/mercurial/trunk/debian/cacerts.hgrc	                        (rev 0)
+++ packages/mercurial/trunk/debian/cacerts.hgrc	2011-03-28 10:40:06 UTC (rev 6834)
@@ -0,0 +1,5 @@
+[web]
+# user can disable this Debian default by overriding this option in ~/.hgrc
+# and/or using the --insecure command line switch
+cacerts = /etc/ssl/certs/ca-certificates.crt
+

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2011-03-27 14:09:40 UTC (rev 6833)
+++ packages/mercurial/trunk/debian/changelog	2011-03-28 10:40:06 UTC (rev 6834)
@@ -1,3 +1,11 @@
+mercurial (1.8.1-2) UNRELEASED; urgency=low
+
+  * Set /etc/ssl/certs/ca-certificates.crt as default valid root
+    certificates and add a recommands to the ca-certificates package
+    (Closes: #619821)
+
+ -- Vincent Danjean <vdanjean at debian.org>  Mon, 28 Mar 2011 12:36:44 +0200
+
 mercurial (1.8.1-1) unstable; urgency=low
 
   * New upstream release 1.8.1 backs out a behavior change for so-called

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2011-03-27 14:09:40 UTC (rev 6833)
+++ packages/mercurial/trunk/debian/control	2011-03-28 10:40:06 UTC (rev 6834)
@@ -18,7 +18,7 @@
 Package: mercurial-common
 Architecture: all 
 Depends: ${misc:Depends}, ${python:Depends}
-Recommends: mercurial (= ${binary:Version})
+Recommends: mercurial (= ${binary:Version}), ca-certificates
 Suggests: wish,
  python-mysqldb, 
  python-pygments,

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2011-03-27 14:09:40 UTC (rev 6833)
+++ packages/mercurial/trunk/debian/rules	2011-03-28 10:40:06 UTC (rev 6834)
@@ -49,6 +49,9 @@
 	install -m 644 \
 		contrib/mergetools.hgrc \
 		$(CURDIR)/debian/mercurial/etc/mercurial/hgrc.d/mergetools.rc
+	install -m 644 \
+		debian/cacerts.hgrc \
+		$(CURDIR)/debian/mercurial/etc/mercurial/hgrc.d/cacerts.rc
 	# remove arch-independent python stuff
 	find debian/mercurial/usr/lib \
 		! -name '*.so' ! -type d -delete , \