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

Mon May 6 12:58:52 UTC 2013

Date: Monday, May 6, 2013 @ 12:58:51
  Author: laarmen-guest
Revision: 24156

Remove the Python3 version as the dependencies are not all Python3 ready

Added:
  packages/moksha.common/trunk/debian/docs
    (from rev 24009, packages/moksha.common/trunk/debian/python-moksha.common.docs)
  packages/moksha.common/trunk/debian/manpages
    (from rev 24009, packages/moksha.common/trunk/debian/python-moksha.common.manpages)
Modified:
  packages/moksha.common/trunk/debian/changelog
  packages/moksha.common/trunk/debian/clean
  packages/moksha.common/trunk/debian/control
  packages/moksha.common/trunk/debian/rules
Deleted:
  packages/moksha.common/trunk/debian/python-moksha.common.docs
  packages/moksha.common/trunk/debian/python-moksha.common.manpages
  packages/moksha.common/trunk/debian/python3-moksha.common.docs
  packages/moksha.common/trunk/debian/python3-moksha.common.manpages

Modified: packages/moksha.common/trunk/debian/changelog
===================================================================

--- packages/moksha.common/trunk/debian/changelog	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/changelog	2013-05-06 12:58:51 UTC (rev 24156)
@@ -6,4 +6,4 @@
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:17 +0200
+ -- Simon Chopin <chopin.simon at gmail.com>  Mon, 06 May 2013 14:57:06 +0200

Modified: packages/moksha.common/trunk/debian/clean
===================================================================
--- packages/moksha.common/trunk/debian/clean	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/clean	2013-05-06 12:58:51 UTC (rev 24156)
@@ -1 +1,2 @@
 moksha.common.egg-info/*
+debian/moksha.1

Modified: packages/moksha.common/trunk/debian/control
===================================================================
--- packages/moksha.common/trunk/debian/control	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/control	2013-05-06 12:58:51 UTC (rev 24156)
@@ -6,19 +6,15 @@
 Build-Depends:
  debhelper (>= 8),
  help2man,
- python (>= 2.6.6-3~),
+ python-all (>= 2.6.6-3~),
  python-decorator,
  python-kitchen,
  python-pkg-resources,
  python-setuptools,
  python-twisted-core,
  python-tz,
- python3,
- python3-pkg-resources,
- python3-setuptools
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.2
 Homepage: http://mokshaproject.net/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/moksha.common/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/moksha.common/trunk/
@@ -36,18 +32,3 @@
  0mq or TurboGears.
  .
  This package provides the core components for this framework.
-
-Package: python3-moksha.common
-Architecture: all
-Depends:
- python3-pkg-resources,
- python3-twisted-core,
- ${misc:Depends},
- ${python3:Depends}
-Description: Common components for the Moksha framework - Python3 package
- Moksha is a combination of Web framework and messaging hub that is
- written on top of widely-used and tested components such as Twisted,
- 0mq or TurboGears.
- .
- This package provides the core components for the Python3 version of this
- framework.

Copied: packages/moksha.common/trunk/debian/docs (from rev 24009, packages/moksha.common/trunk/debian/python-moksha.common.docs)
===================================================================
--- packages/moksha.common/trunk/debian/docs	                        (rev 0)
+++ packages/moksha.common/trunk/debian/docs	2013-05-06 12:58:51 UTC (rev 24156)
@@ -0,0 +1 @@
+README

Copied: packages/moksha.common/trunk/debian/manpages (from rev 24009, packages/moksha.common/trunk/debian/python-moksha.common.manpages)
===================================================================
--- packages/moksha.common/trunk/debian/manpages	                        (rev 0)
+++ packages/moksha.common/trunk/debian/manpages	2013-05-06 12:58:51 UTC (rev 24156)
@@ -0,0 +1 @@
+debian/moksha.1

Deleted: packages/moksha.common/trunk/debian/python-moksha.common.docs
===================================================================
--- packages/moksha.common/trunk/debian/python-moksha.common.docs	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/python-moksha.common.docs	2013-05-06 12:58:51 UTC (rev 24156)
@@ -1 +0,0 @@
-README

Deleted: packages/moksha.common/trunk/debian/python-moksha.common.manpages
===================================================================
--- packages/moksha.common/trunk/debian/python-moksha.common.manpages	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/python-moksha.common.manpages	2013-05-06 12:58:51 UTC (rev 24156)
@@ -1 +0,0 @@
-debian/tmp/moksha.1

Deleted: packages/moksha.common/trunk/debian/python3-moksha.common.docs
===================================================================
--- packages/moksha.common/trunk/debian/python3-moksha.common.docs	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/python3-moksha.common.docs	2013-05-06 12:58:51 UTC (rev 24156)
@@ -1 +0,0 @@
-README

Deleted: packages/moksha.common/trunk/debian/python3-moksha.common.manpages
===================================================================
--- packages/moksha.common/trunk/debian/python3-moksha.common.manpages	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/python3-moksha.common.manpages	2013-05-06 12:58:51 UTC (rev 24156)
@@ -1 +0,0 @@
-debian/tmp/moksha-3.1

Modified: packages/moksha.common/trunk/debian/rules
===================================================================
--- packages/moksha.common/trunk/debian/rules	2013-05-06 12:44:19 UTC (rev 24155)
+++ packages/moksha.common/trunk/debian/rules	2013-05-06 12:58:51 UTC (rev 24156)
@@ -1,22 +1,12 @@
 #!/usr/bin/make -f
 UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
 %:
-	dh $@ --with python2,python3
+	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/tmp/moksha.1
-	cp debian/tmp/moksha.1 debian/tmp/moksha-3.1
+	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:
-	# Only install for the default versions.
-	python setup.py install --skip-build --no-compile \
-							--root debian/python-moksha.common/ \
-							--install-layout=deb
-	python3 setup.py install --skip-build --no-compile \
-							 --root debian/python3-moksha.common/ \
-							 --install-layout=deb
-	mv debian/python3-moksha.common/usr/bin/moksha debian/python3-moksha.common/usr/bin/moksha-3
-	rm debian/python3-moksha.common/usr/lib/python3/dist-packages/moksha.common-$(UPSTREAM).egg-info/SOURCES.txt
-	rm debian/python-moksha.common/usr/lib/$(shell pyversions -d)/dist-packages/moksha.common-$(UPSTREAM).egg-info/SOURCES.txt
 	dh_install
+	rm debian/python-moksha.common/usr/lib/python*/dist-packages/moksha.common-*.egg-info/SOURCES.txt


