[Python-apps-commits] r11559 - in packages/mercurial/trunk/debian (5 files)

[vicho at users.alioth.debian.org]

    Date: Saturday, November 8, 2014 @ 11:54:18
  Author: vicho
Revision: 11559

Simplify installation of /etc/mercurial/hgrc.d/cacerts.rc

Added:
  packages/mercurial/trunk/debian/cacerts.rc
    (from rev 11556, packages/mercurial/trunk/debian/cacerts.hgrc)
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/mercurial-common.install
  packages/mercurial/trunk/debian/rules
Deleted:
  packages/mercurial/trunk/debian/cacerts.hgrc

Deleted: packages/mercurial/trunk/debian/cacerts.hgrc
===================================================================
--- packages/mercurial/trunk/debian/cacerts.hgrc	2014-11-08 11:38:54 UTC (rev 11558)
+++ packages/mercurial/trunk/debian/cacerts.hgrc	2014-11-08 11:54:18 UTC (rev 11559)
@@ -1,5 +0,0 @@
-[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
-

Copied: packages/mercurial/trunk/debian/cacerts.rc (from rev 11556, packages/mercurial/trunk/debian/cacerts.hgrc)
===================================================================
--- packages/mercurial/trunk/debian/cacerts.rc	                        (rev 0)
+++ packages/mercurial/trunk/debian/cacerts.rc	2014-11-08 11:54:18 UTC (rev 11559)
@@ -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	2014-11-08 11:38:54 UTC (rev 11558)
+++ packages/mercurial/trunk/debian/changelog	2014-11-08 11:54:18 UTC (rev 11559)
@@ -9,6 +9,7 @@
     as it is now included upstream
   * Bump standards-version to 3.9.6 (no change needed)
   * Build-depend on dh-python
+  * Simplify installation of /etc/mercurial/hgrc.d/cacerts.rc
 
  -- Javi Merino <vicho at debian.org>  Sun, 02 Nov 2014 12:55:06 +0000
 

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2014-11-08 11:38:54 UTC (rev 11558)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2014-11-08 11:54:18 UTC (rev 11559)
@@ -8,3 +8,4 @@
 contrib/hg-ssh usr/bin
 
 debian/hgrc etc/mercurial/
+debian/cacerts.rc etc/mercurial/hgrc.d/

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2014-11-08 11:38:54 UTC (rev 11558)
+++ packages/mercurial/trunk/debian/rules	2014-11-08 11:54:18 UTC (rev 11559)
@@ -76,9 +76,6 @@
 	install -m 644 \
 		contrib/mergetools.hgrc \
 		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/mergetools.rc
-	install -m 644 \
-		debian/cacerts.hgrc \
-		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/cacerts.rc
 	# Move templates and help installed by setup.py to their FHS-correct location
 	mv $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/templates \
 	   $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/help \