[SCM] Packaging for pytango branch, master, updated. 27cfba732b9b5c10d7acf03f5920292a45308af0

Frédéric-Emmanuel PICCA picca at synchrotron-soleil.fr
Tue Aug 10 08:25:10 UTC 2010


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

    * update for the 7.1.2 version

diff --git a/debian/changelog b/debian/changelog
index 9fed5ca..43215e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-pytango (7.1.1-1) unstable; urgency=low
+pytango (7.1.2-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
- -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Sat, 20 Feb 2010 11:28:20 +0100
+ -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Mon, 09 Aug 2010 11:26:05 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..301160a 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 1c44482..6259707 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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-all-dev,
+	       python-dev,
 	       liblog4tango4-dev,
 	       libtango7-dev,
 	       libboost-python-dev,
diff --git a/debian/patches/debian-changes-7.1.1-1 b/debian/patches/debian-changes-7.1.1-1
deleted file mode 100644
index 0e24021..0000000
--- a/debian/patches/debian-changes-7.1.1-1
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index b12fe12..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes-7.1.1-1
diff --git a/debian/pyversions b/debian/pyversions
index b3dc41e..5154b3f 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.5-
+2.6

-- 
Packaging for pytango



More information about the debian-science-commits mailing list