[SCM] Packaging for pytango branch, master, updated. ce571221d6744bc557714a4a0ebd5dae057459c1

[Frédéric-Emmanuel PICCA]

The following commit has been merged in the master branch:
commit fa5a796f717f354180f576b3e806067b3c3d3ab6
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Mon Aug 9 10:32:29 2010 +0200

    * first 7.1.1 working version

diff --git a/debian/changelog b/debian/changelog
index dd92ad4..9fed5ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pytango (7.1.0-1) unstable; urgency=low
+pytango (7.1.1-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
diff --git a/debian/control b/debian/control
index cc9a87e..1c44482 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: extra
 Maintainer: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
 Build-Depends: debhelper (>= 7.0.50),
 	       python-support (>= 0.7.6),
-	       python-dev,
+	       python-all-dev,
 	       liblog4tango4-dev,
 	       libtango7-dev,
 	       libboost-python-dev,
 	       python-sphinx
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://www.tango-controls.org
 
 Package: python-pytango
diff --git a/debian/docs b/debian/docs
index 4e65f81..8ed30c1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-build_doc/html
\ No newline at end of file
+build/sphinx/html
\ No newline at end of file
diff --git a/debian/patches/debian-changes-7.1.1-1 b/debian/patches/debian-changes-7.1.1-1
new file mode 100644
index 0000000..0e24021
--- /dev/null
+++ b/debian/patches/debian-changes-7.1.1-1
@@ -0,0 +1,57 @@
+Description: Upstream changes introduced in version 7.1.1-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ pytango (7.1.1-1) unstable; urgency=low
+ .
+   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- pytango-7.1.1.orig/setup.py
++++ pytango-7.1.1/setup.py
+@@ -1,4 +1,4 @@
+-import os, sys
++import os, sys, platform
+ 
+ from distutils.core import setup, Extension
+ from distutils.dist import Distribution
+@@ -159,7 +159,6 @@ else:
+     
+     include_dirs += [ os.path.join(BOOST_ROOT, 'include') ]
+     libraries += [
+-        'boost_python',
+         'pthread',
+         'rt',
+         'dl',
+@@ -168,6 +167,15 @@ else:
+         'omnithread',
+         'COS4',
+     ]
++    # when building with multiple version of python on debian we need
++    # to link against boost_python-py25/-py26 etc...
++    if platform.dist()[0] in ['debian']:
++        if distutils.sysconfig.get_python_version() == '2.5':
++            libraries += ['boost_python-py25']
++        elif distutils.sysconfig.get_python_version() == '2.6':
++            libraries += ['boost_python-py26']
++    else:
++        libraries += ['boost_python']
+ 
+     # Note for PyTango developers:
+     # Compilation time can be greatly reduced by compiling the file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b12fe12
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-7.1.1-1
diff --git a/debian/pyversions b/debian/pyversions
index 95e3ba8..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.5
+2.5-
diff --git a/debian/rules b/debian/rules
index 03b84b7..22702da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 override_dh_clean:
-	rm -rf build_doc
+	rm -rf build/sphinx
 	dh_clean
 
 %:

-- 
Packaging for pytango