[python-fabio] 22/31: fix the packaging with cme and alphabetic order
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Dec 27 19:05:48 UTC 2013
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository python-fabio.
commit 8262f7518d7b651df29cbd53bc51010bc604b7ff
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sat Nov 2 19:18:27 2013 +0100
fix the packaging with cme and alphabetic order
---
debian/control | 19 +++++++++++++------
debian/copyright | 56 ++++++++++++++++++++++++++++----------------------------
2 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/debian/control b/debian/control
index 441ccb3..9e18d28 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,11 @@ Maintainer: Jerome Kieffer <jerome.kieffer at esrf.fr>
Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
Section: python
Priority: optional
-Build-Depends: python-setuptools, python-all-dev (>= 2.6.6-3~), debhelper (>= 8), python-numpy
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8),
+ python-all-dev,
+ python-numpy,
+ python-setuptools
+Standards-Version: 3.9.4
Vcs-Browser: http://git.epn-campus.eu/projects/fabio/repository
Vcs-Git: git://git@git.epn-campus.eu:python-fabio
Homepage: http://git.epn-campus.eu/projects/fabio
@@ -12,9 +15,14 @@ X-Python-Version: >= 2.5
Package: python-fabio
Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
-Recommends: python-matplotlib, python-imaging, python-lxml
-Suggests: pymca, pyfai
+Depends: ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends: python-imaging,
+ python-lxml,
+ python-matplotlib
+Suggests: pyfai,
+ pymca
Description: I/O library for images produced by 2D X-ray detector
FabIO is an I/O library for images produced by 2D X-ray detectors and written
in Python. FabIO support images detectors from a dozen of companies
@@ -22,4 +30,3 @@ Description: I/O library for images produced by 2D X-ray detector
20 different file formats (like CBF, EDF, TIFF, ...) and offers an unified
interface to their headers (as a python dictionary) and datasets (as a
numpy ndarray of integers or floats)
-
diff --git a/debian/copyright b/debian/copyright
index 1fcee9f..b2656e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: fabio
Source: http://sourceforge.net/projects/fable/files/fabio/0.0.8/
@@ -50,6 +50,33 @@ Files: debian/*
Copyright: 2011 Jerome Kieffer <jerome.kieffer at esrf.fr>
License: GPL-2.0+
+Files: src/stdint.h
+Copyright: 22006-2008 Alexander Chemeris
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. The name of the author may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
License: GPL-2.0+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -117,30 +144,3 @@ License: LGPL-3.0+
.
On Debian systems, the complete text of the GNU Lesser General
Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
-
-Files: src/stdint.h
-Copyright: 22006-2008 Alexander Chemeris
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- 3. The name of the author may be used to endorse or promote products
- derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-fabio.git
More information about the debian-science-commits
mailing list