[Python-apps-commits] r9964 - in packages/mercurial/trunk/debian (changelog rules)

[vicho at users.alioth.debian.org]

    Date: Tuesday, August 13, 2013 @ 21:11:43
  Author: vicho
Revision: 9964

put system-wide conffiles in mercurial-common

In r9846 (install files in hgrc.d from debian/rules again) system-wide
conffiles were being put in the mercurial package but by the
install-archindep target, which was never run in buildds.

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/rules	(contents, properties)

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2013-08-13 19:55:01 UTC (rev 9963)
+++ packages/mercurial/trunk/debian/changelog	2013-08-13 21:11:43 UTC (rev 9964)
@@ -1,3 +1,10 @@
+mercurial (2.7-2) UNRELEASED; urgency=low
+
+  * Fix "conffiles not removed" by properly moving them to mercurial-common
+    (Closes: #718621)
+
+ -- Javi Merino <vicho at debian.org>  Tue, 13 Aug 2013 23:09:03 +0200
+
 mercurial (2.7-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2013-08-13 19:55:01 UTC (rev 9963)
+++ packages/mercurial/trunk/debian/rules	2013-08-13 21:11:43 UTC (rev 9964)
@@ -68,15 +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 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
+		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/mergetools.rc
 	install -m 644 \
 		debian/cacerts.hgrc \
-		$(CURDIR)/debian/mercurial/etc/mercurial/hgrc.d/cacerts.rc
+		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/cacerts.rc
 	# remove arch-dependent python stuff
 	find debian/mercurial-common/usr/lib \
 		-name '*.so' ! -type d -delete , \