# HG changeset patch
# User catherine.devlin@gmail.com
# Date 1278545241 14400
# Node ID fbd780b5994b6c047a3765fe4e9379af4806ddcf
# Parent  be4194f41916d56dda7365e711047463ab5aaa57# Parent  49bd3dc5c2054e58d2868faca04266bcdb0836c9
including deb packaging changes from Jens

diff -r be4194f41916 -r fbd780b5994b debian/changelog
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/changelog	Wed Jul 07 19:27:21 2010 -0400
@@ -0,0 +1,7 @@
+python-cmd2 (0.6.1) unstable; urgency=low
+
+  * Debian package
+  * Source: http://hg.assembla.com/python-cmd2
+
+ -- Jens Braeuer <jens.braeuer@gmx.net>  Tue, 18 May 2010 20:35:13 +0200
+ 
\ No newline at end of file
diff -r be4194f41916 -r fbd780b5994b debian/compat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/compat	Wed Jul 07 19:27:21 2010 -0400
@@ -0,0 +1,1 @@
+5
diff -r be4194f41916 -r fbd780b5994b debian/control
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/control	Wed Jul 07 19:27:21 2010 -0400
@@ -0,0 +1,14 @@
+Source: python-cmd2
+Section: contrib/misc
+Priority: standard
+Maintainer: Jens Braeuer <jens.braeuer@gmx.net>
+Build-Depends: debhelper, cdbs, debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11),
+XS-Python-Version: >= 2.5
+
+Package: python-cmd2
+Section: contrib/misc
+Priority: standard
+Architecture: all
+Depends: ${python:Depends}, python-pyparsing (>= 1.5.1), xclip
+Description: Cmd2
+XB-Python-Version: ${python:Versions}
diff -r be4194f41916 -r fbd780b5994b debian/pycompat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/pycompat	Wed Jul 07 19:27:21 2010 -0400
@@ -0,0 +1,1 @@
+2
diff -r be4194f41916 -r fbd780b5994b debian/rules
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/rules	Wed Jul 07 19:27:21 2010 -0400
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM := pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
diff -r be4194f41916 -r fbd780b5994b setup.py
--- a/setup.py	Wed Jul 07 19:24:15 2010 -0400
+++ b/setup.py	Wed Jul 07 19:27:21 2010 -0400
@@ -10,13 +10,14 @@
 python3 = sys.version_info[0] > 2
 if python3:
     install_requires = [] # will rely on local pyparsing_py3 copy
+    extra_modules = "pyparsing_py3"
 else:
     install_requires = ['pyparsing>=1.5.1']
-    
+    extra_modules = []
 setup(
     name="cmd2",
     version="0.6.1",
-    py_modules=["cmd2","pyparsing_py3"],
+    py_modules=["cmd2"]+extra_modules,
     use_2to3=True,
     
     # metadata for upload to PyPI