[Python-apps-commits] r9846 - in packages/mercurial/trunk/debian (2 files)

[vicho at users.alioth.debian.org]

    Date: Thursday, July 4, 2013 @ 22:07:52
  Author: vicho
Revision: 9846

install files in hgrc.d from debian/rules again

In r9843 (Move config files to mercurial-common) I let dh_install
install them from mercurial-common.install but that doesn't support
renaming and files in /etc/mercurial/hgrc.d/ are only parsed if their
extension is .rc

Modified:
  packages/mercurial/trunk/debian/mercurial-common.install
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2013-07-04 19:57:02 UTC (rev 9845)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2013-07-04 22:07:52 UTC (rev 9846)
@@ -11,5 +11,3 @@
 contrib/hg-ssh usr/bin
 
 debian/hgrc etc/mercurial/
-contrib/mergetools.hgrc etc/mercurial/hgrc.d/
-debian/cacerts.hgrc etc/mercurial/hgrc.d/

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2013-07-04 19:57:02 UTC (rev 9845)
+++ packages/mercurial/trunk/debian/rules	2013-07-04 22:07:52 UTC (rev 9846)
@@ -68,6 +68,15 @@
 		-type d -empty -delete
 
 install-archindep:
+        # Install system-wide conffiles.  Note the rename from .hgrc
+        # to .rc, which dh_install can't do if you list the file in
+        # mercurial-common.install
+	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-dependent python stuff
 	find debian/mercurial-common/usr/lib \
 		-name '*.so' ! -type d -delete , \