[Python-apps-commits] r11689 - in packages/mercurial/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Saturday, January 31, 2015 @ 15:48:50
  Author: vicho
Revision: 11689

move the installation of mergetools.rc to mercurial-common.install

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/mercurial-common.install
  packages/mercurial/trunk/debian/rules	(contents, properties)

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2015-01-31 14:25:17 UTC (rev 11688)
+++ packages/mercurial/trunk/debian/changelog	2015-01-31 15:48:50 UTC (rev 11689)
@@ -1,6 +1,7 @@
 mercurial (3.3~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * move the installation of mergetools.rc to mercurial-common.install
 
  -- Javi Merino <vicho at debian.org>  Sat, 31 Jan 2015 15:22:03 +0100
 

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2015-01-31 14:25:17 UTC (rev 11688)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2015-01-31 15:48:50 UTC (rev 11689)
@@ -7,5 +7,7 @@
 
 contrib/hg-ssh usr/bin
 
+mercurial/default.d/mergetools.rc etc/mercurial/hgrc.d/
+
 debian/hgrc etc/mercurial/
 debian/cacerts.rc etc/mercurial/hgrc.d/

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2015-01-31 14:25:17 UTC (rev 11688)
+++ packages/mercurial/trunk/debian/rules	2015-01-31 15:48:50 UTC (rev 11689)
@@ -65,17 +65,6 @@
 		-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
-	# TODO: Move this to to mercurial-common.install with 
-	#
-	# mercurial/default.d/mergetools.rc etc/mercurial/hgrc.d/
-	#
-	# once mergtools is moved to default.d (in mercurial 3.3?)
-	install -m 644 \
-		contrib/mergetools.hgrc \
-		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/mergetools.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 \