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

[vicho at users.alioth.debian.org]

    Date: Thursday, July 4, 2013 @ 19:54:49
  Author: vicho
Revision: 9843

Move config files to mercurial-common

While we are at it, move use dh to install them instead of doing it
explicitly in debian/rules

Added:
  packages/mercurial/trunk/debian/hgrc
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	2013-07-04 19:54:43 UTC (rev 9842)
+++ packages/mercurial/trunk/debian/changelog	2013-07-04 19:54:49 UTC (rev 9843)
@@ -4,6 +4,7 @@
   * Remove preinst script as it's mostly checks for stuff that was fixed
     long ago
   * Remove old checks from postinst
+  * Move config files to mercurial-common
 
  -- Javi Merino <vicho at debian.org>  Tue, 02 Jul 2013 22:46:45 +0100
 

Added: packages/mercurial/trunk/debian/hgrc
===================================================================
--- packages/mercurial/trunk/debian/hgrc	                        (rev 0)
+++ packages/mercurial/trunk/debian/hgrc	2013-07-04 19:54:49 UTC (rev 9843)
@@ -0,0 +1,2 @@
+# system-wide mercurial configuration file
+# See hgrc(5) for more information

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2013-07-04 19:54:43 UTC (rev 9842)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2013-07-04 19:54:49 UTC (rev 9843)
@@ -9,3 +9,7 @@
 contrib/hgk usr/share/mercurial/
 
 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:54:43 UTC (rev 9842)
+++ packages/mercurial/trunk/debian/rules	2013-07-04 19:54:49 UTC (rev 9843)
@@ -66,17 +66,6 @@
 	install -m 644 \
 		contrib/bash_completion \
 		$(CURDIR)/debian/mercurial/etc/bash_completion.d/mercurial
-	# Install system-wide conffiles
-	echo "# system-wide mercurial configuration file" \
-		>  $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
-	echo "# See hgrc(5) for more information" \
-		>>  $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
-	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 , \