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

[vdanjean at users.alioth.debian.org]

    Date: Monday, April 14, 2008 @ 12:44:27
  Author: vdanjean
Revision: 959

Remove Suggest on wish in mercurial-common and add a lintian override

Added:
  packages/mercurial/trunk/debian/mercurial-common.lintian-overrides
Modified:
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/mercurial-common.dirs
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2008-04-14 12:44:23 UTC (rev 958)
+++ packages/mercurial/trunk/debian/control	2008-04-14 12:44:27 UTC (rev 959)
@@ -45,7 +45,6 @@
 Recommends: mercurial
 Conflicts: mercurial (<< 1.0)
 Replaces: mercurial (<< 1.0)
-Suggests: tk8.4 | wish, 
 Description: Scalable distributed version control system (Common files)
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.

Modified: packages/mercurial/trunk/debian/mercurial-common.dirs
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.dirs	2008-04-14 12:44:23 UTC (rev 958)
+++ packages/mercurial/trunk/debian/mercurial-common.dirs	2008-04-14 12:44:27 UTC (rev 959)
@@ -1 +1,2 @@
 usr/share/doc/mercurial
+usr/share/lintian/overrides

Added: packages/mercurial/trunk/debian/mercurial-common.lintian-overrides
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.lintian-overrides	                        (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-common.lintian-overrides	2008-04-14 12:44:27 UTC (rev 959)
@@ -0,0 +1 @@
+mercurial-common: wish-script-but-no-wish-dep

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2008-04-14 12:44:23 UTC (rev 958)
+++ packages/mercurial/trunk/debian/rules	2008-04-14 12:44:27 UTC (rev 959)
@@ -40,12 +40,18 @@
 	sed -i 's,^\([\\]\?[.][*][\\]\?[.]swp\),\\\&\1,' doc/hgignore.5
 
 binary-install/mercurial-common::
+	# web templates are symlinked from python-support to /u/s/mercurial
 	rm -rf $(CURDIR)/debian/mercurial-common/usr/share/python-support/mercurial-common/mercurial/templates
 	ln -sf ../../../mercurial/templates \
 		$(CURDIR)/debian/mercurial-common/usr/share/python-support/mercurial-common/mercurial/templates
 	
+	# Examples must go in the /usr/share/doc/mercurial directory
 	mv $(CURDIR)/debian/mercurial-common/usr/share/doc/mercurial-common/examples \
 		$(CURDIR)/debian/mercurial-common/usr/share/doc/mercurial
+	
+	# Install lintian override file
+	cp debian/mercurial-common.lintian-overrides \
+		$(CURDIR)/debian/mercurial-common/usr/share/lintian/overrides/mercurial-common
 
 clean::
 	$(MAKE) clean