[Python-modules-commits] r25199 - in packages/moksha.common/trunk/debian (5 files)

[laarmen-guest at users.alioth.debian.org]

    Date: Tuesday, July 16, 2013 @ 20:10:15
  Author: laarmen-guest
Revision: 25199

Remove the moksha script following upstream advice

Added:
  packages/moksha.common/trunk/debian/patches/
  packages/moksha.common/trunk/debian/patches/rm-script
  packages/moksha.common/trunk/debian/patches/series
Modified:
  packages/moksha.common/trunk/debian/rules
Deleted:
  packages/moksha.common/trunk/debian/manpages

Deleted: packages/moksha.common/trunk/debian/manpages
===================================================================
--- packages/moksha.common/trunk/debian/manpages	2013-07-16 00:25:29 UTC (rev 25198)
+++ packages/moksha.common/trunk/debian/manpages	2013-07-16 20:10:15 UTC (rev 25199)
@@ -1 +0,0 @@
-debian/moksha.1

Added: packages/moksha.common/trunk/debian/patches/rm-script
===================================================================
--- packages/moksha.common/trunk/debian/patches/rm-script	                        (rev 0)
+++ packages/moksha.common/trunk/debian/patches/rm-script	2013-07-16 20:10:15 UTC (rev 25199)
@@ -0,0 +1,16 @@
+Description: Do not install the moksha script
+ According to upstream, it is a relic of the past and should be nuked.
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: not-needed
+
+--- moksha.common-1.2.0.orig/setup.py
++++ moksha.common-1.2.0/setup.py
+@@ -62,8 +62,4 @@ setup(
+     test_suite='nose.collector',
+     namespace_packages=['moksha'],
+     tests_require=tests_require,
+-    entry_points="""
+-    [console_scripts]
+-    moksha = moksha.common.commands.cli:main
+-    """,
+ )

Added: packages/moksha.common/trunk/debian/patches/series
===================================================================
--- packages/moksha.common/trunk/debian/patches/series	                        (rev 0)
+++ packages/moksha.common/trunk/debian/patches/series	2013-07-16 20:10:15 UTC (rev 25199)
@@ -0,0 +1 @@
+rm-script

Modified: packages/moksha.common/trunk/debian/rules
===================================================================
--- packages/moksha.common/trunk/debian/rules	2013-07-16 00:25:29 UTC (rev 25198)
+++ packages/moksha.common/trunk/debian/rules	2013-07-16 20:10:15 UTC (rev 25199)
@@ -1,12 +1,9 @@
 #!/usr/bin/make -f
 UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
+
 %:
 	dh $@ --with python2
 
-override_dh_installman:
-	help2man -n "moksha - Moksha CLI" --version-string="moksha $(UPSTREAM)" "python -c \"from moksha.common.commands.cli import main; import sys; sys.argv[0] = 'moksha';  main()\"" > debian/moksha.1
-	dh_installman
-
 override_dh_install:
-	dh_install
+	dh_install -Xusr/bin/moksha
 	rm debian/python-moksha.common/usr/lib/python*/dist-packages/moksha.common-*.egg-info/SOURCES.txt