[Python-modules-commits] r8668 - in packages/scipy/trunk/debian (4 files)

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

    Date: Monday, June 1, 2009 @ 12:36:59
  Author: gilir-guest
Revision: 8668

Merge changes from Ubuntu for the Python 2.6 transition
Add missing copyright holders

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/control
  packages/scipy/trunk/debian/copyright
  packages/scipy/trunk/debian/rules

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2009-06-01 09:53:43 UTC (rev 8667)
+++ packages/scipy/trunk/debian/changelog	2009-06-01 12:36:59 UTC (rev 8668)
@@ -1,3 +1,16 @@
+python-scipy (0.7.0-2) UNRELEASED; urgency=medium
+
+  * debian/copyright : Update Copyright holders (Closes: #524131)
+  * From Ubuntu, prepare for the future python transition:
+   - debian/rules: 
+    + Include /usr/share/python/python.mk
+    + Add $(py_setup_install_args) to setup.py install
+    + Replace site-packages by *-packages
+   - debian/control: 
+    + Bump build-depends to python-all-dev (>= 2.5.4-1~)
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Fri, 29 May 2009 20:10:22 +0200
+
 python-scipy (0.7.0-1) unstable; urgency=low
 
   [ Ondrej Certik ]

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2009-06-01 09:53:43 UTC (rev 8667)
+++ packages/scipy/trunk/debian/control	2009-06-01 12:36:59 UTC (rev 8668)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Alexandre Fayolle <afayolle at debian.org>, Marco Presi (Zufus) <zufus at debian.org>, Ondrej Certik <ondrej at certik.cz>, David Cournapeau <cournape at gmail.com>
 Build-Depends: debhelper (>= 5.0.37.2), dpkg-dev (>= 1.13.19), quilt,
- python-all-dev, python-central (>= 0.5), python-numpy (>= 1:1.2.0), gfortran,
+ python-all-dev (>= 2.5.4-1~), python-central (>= 0.5), python-numpy (>= 1:1.2.0), gfortran,
  sharutils, swig, libsuitesparse-dev (>= 3.1.0-3),
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev
 XS-Python-Version: all

Modified: packages/scipy/trunk/debian/copyright
===================================================================
--- packages/scipy/trunk/debian/copyright	2009-06-01 09:53:43 UTC (rev 8667)
+++ packages/scipy/trunk/debian/copyright	2009-06-01 12:36:59 UTC (rev 8668)
@@ -8,9 +8,13 @@
 Copyright:
 
 Copyright (c) 2001, 2002 Enthought, Inc.
+All rights reserved.
 
+Copyright (c) 2003-2009 SciPy Developers.
 All rights reserved.
 
+All rights reserved.
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2009-06-01 09:53:43 UTC (rev 8667)
+++ packages/scipy/trunk/debian/rules	2009-06-01 12:36:59 UTC (rev 8668)
@@ -8,6 +8,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
+
 unexport LDFLAGS
 export FFLAGS="-fPIC"
 export ATLAS=None
@@ -44,8 +46,9 @@
 		d=$(BASE)/python-scipy;                                  \
 		mkdir -m 755 -p $$d/usr/share/doc/python-scipy;          \
 		python$$v setup.py config_fc --noarch build;             \
-		python$$v setup.py install --prefix $$d/usr --no-compile;\
-		rm $$d/usr/lib/python$$v/site-packages/scipy/LICENSE.txt;\
+		python$$v setup.py install --prefix $$d/usr              \
+			--no-compile $(py_setup_install_args);           \
+		rm -f $$d/usr/lib/python$$v/*-packages/scipy/LICENSE.txt;\
 		python$$v setup.py clean --all;                          \
 	done
 
@@ -53,7 +56,7 @@
 	#rm $(BASE)/python-scipy/usr/share/doc/python-scipy/weave/examples/*.so
 	#mv Lib/weave/doc $(BASE)/python-scipy/usr/share/doc/python-scipy/weave
 
-	rm -fr $(BASE)/python-scipy/usr/lib/python2.*/site-packages/scipy/weave/examples/
+	rm -fr $(BASE)/python-scipy/usr/lib/python2.*/*-packages/scipy/weave/examples/
 
 # Build architecture-independent files here.
 binary-indep: