[Python-modules-commits] r17031 - in packages/pyfltk/trunk/debian (6 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Tue May 17 11:39:32 UTC 2011
Date: Tuesday, May 17, 2011 @ 11:39:29
Author: cjsmo-guest
Revision: 17031
added patch to correct linker problems, updated copyright to DEP5rev173, update patch header to DEP3
Added:
packages/pyfltk/trunk/debian/patches/opengl_fix
Modified:
packages/pyfltk/trunk/debian/changelog
packages/pyfltk/trunk/debian/copyright
packages/pyfltk/trunk/debian/patches/no_docs
packages/pyfltk/trunk/debian/patches/platform_startswith
packages/pyfltk/trunk/debian/patches/series
Modified: packages/pyfltk/trunk/debian/changelog
===================================================================
--- packages/pyfltk/trunk/debian/changelog 2011-05-17 04:32:07 UTC (rev 17030)
+++ packages/pyfltk/trunk/debian/changelog 2011-05-17 11:39:29 UTC (rev 17031)
@@ -1,3 +1,14 @@
+pyfltk (1.1.5-4) unstable; urgency=low
+
+ * Added debian/patches/opengl_fix. This corrects the inability to import
+ pyfltk when compiled with the new g++ linker. Thx Julian Taylor for the
+ patch. (Closes: #626120 LP: #779340)
+ * Updated debian/patches/platform_startswith, debian/patches/no_docs with
+ DEP3 info.
+ * Updated debian/copyright to DEP5 rev173
+
+ -- Charlie Smotherman <cjsmo at cableone.net> Mon, 17 May 2011 17:09:57 -0500
+
pyfltk (1.1.5-3) unstable; urgency=low
* debian/control:
Modified: packages/pyfltk/trunk/debian/copyright
===================================================================
--- packages/pyfltk/trunk/debian/copyright 2011-05-17 04:32:07 UTC (rev 17030)
+++ packages/pyfltk/trunk/debian/copyright 2011-05-17 11:39:29 UTC (rev 17031)
@@ -1,70 +1,78 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
Upstream-Name: pyFltk
-Upstream-Maintainer: Andreas Held <a.held at computer.org>
-Upstream-Source: http://pyfltk.sourceforge.net/
+Upstream-Contact: Andreas Held <a.held at computer.org>
+Source: http://pyfltk.sourceforge.net/
-
-
Files: contrib/*
-Copyright: Copyright 2002, Greg Ercolano
+Copyright: 2002, Greg Ercolano
+License: LGPL-2
-Files: contrib/Fl_Table.cxx, contrib/Fl_Table.H:
-Copyright: Copyright 2002, Greg Ercolano
-Copyright: Copyright 2004, O'ksi'D
+Files: contrib/Fl_Table.cxx
+ contrib/Fl_Table.H
+Copyright: 2002, Greg Ercolano
+Copyright: 2004, O'ksi'D
+License: LGPL-2
Files: fltk/docs/*
-Copyright: Copyright 1998-2006, Bill Spitzak, Michael Sweet, Craig P. Earls
+Copyright: 1998-2006, Bill Spitzak
+ 1998-2006, Michael Sweet
+ 1998-2006, Craig P. Earls
+License: LGPL-2
Files: fltk/test/*
-Copyright: Copyright 1998-2003, Bill Spitzak and others
-Copyright: Copyright 2003-2006, Andreas Held and others
+Copyright: 1998-2003, Bill Spitzak and others
+ 2003-2006, Andreas Held and others
+License: LGPL-2
-Files: fltk/test/fltk_threads.py, fltk/test/sudoku.py
-Copyright: Copyright 2005-2006, Michael Sweet.
-Copyright: Copyright 1998-1999, Bill Spitzak and others
-Copyright: Copyright 2003, Andreas Held and others
+Files: fltk/test/fltk_threads.py
+ fltk/test/sudoku.py
+Copyright: 2005-2006, Michael Sweet.
+ 1998-1999, Bill Spitzak and others
+ 2003, Andreas Held and others
+License: LGPL-2
-Files: fltk/test/simple_table.py, fltk/test/table.py
-Copyright: Copyright 2003, Greg Ercolano
-Copyright: Copyright 1998-1999, Bill Spitzak and others
-Copyright: Copyright 2003, Andreas Held and others
+Files: fltk/test/simple_table.py
+ fltk/test/table.py
+Copyright: 2003, Greg Ercolano
+ 2003, Andreas Held and others
+ 1998-1999, Bill Spitzak and others
+License: LGPL-2
-Files: fltk/test/TextEditor.py
-Copyright: Copyright 2004, Chris Green
-Copyright: Copyright 1998-1999, Bill Spitzak and others
-Copyright: Copyright 2003, Andreas Held and others
+File: fltk/test/TextEditor.py
+Copyright: 2004, Chris Green
+ 2003, Andreas Held and others
+ 1998-1999, Bill Spitzak and others
+License: LGPL-2
License: LGPL-2
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
-
+ .
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
-
+ .
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
-
+ .
On Debian systems, the complete text of the GNU Library General
Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-
-
Files: swig/*
-Copyright: Copyright 1995-1998, The University of Utah and the Regents
- of the University of California
-Copyright: Copyright 1998-2005, University of Chicago
-Copyright: Copyright 2005-2006, Arizona Board of Regents (University of Arizona)
+Copyright: 1995-1998, The University of Utah and the Regents of the University
+ of California
+ 1998-2005, University of Chicago
+ 2005-2006, Arizona Board of Regents (University of Arizona)
License:
I.
Copyright (c) 1995-1998
The University of Utah and the Regents of the University of California
All Rights Reserved
-
+ .
Permission is hereby granted, without written agreement and without
license or royalty fees, to use, copy, modify, and distribute this
software and its documentation for any purpose, provided that
@@ -75,30 +83,30 @@
copyrighted by their authors and need not follow the licensing terms
described here, provided that the new terms are clearly indicated in
all files where they apply.
-
+ .
IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE
UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY
PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION,
EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
-
+ .
THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH
SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE,
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
+ .
II.
This software includes contributions that are Copyright (c) 1998-2005
University of Chicago.
All rights reserved.
-
+ .
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
-
+ .
Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. Redistributions
in binary form must reproduce the above copyright notice, this list of
@@ -107,7 +115,7 @@
the University of Chicago nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF CHICAGO AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -119,12 +127,12 @@
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.
-
+ .
III.
This software includes contributions that are Copyright (c) 2005-2006
Arizona Board of Regents (University of Arizona).
All Rights Reserved
-
+ .
Permission is hereby granted, without written agreement and without
license or royalty fees, to use, copy, modify, and distribute this
software and its documentation for any purpose, provided that
@@ -135,7 +143,7 @@
copyrighted by their authors and need not follow the licensing terms
described here, provided that the new terms are clearly indicated in
all files where they apply.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF ARIZONA AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -148,24 +156,23 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
Files: debian/*
-Copyright: Copyright 2009, Luca Falavigna <dktrkranz at debian.org>
+Copyright: 2009, Luca Falavigna <dktrkranz at debian.org>
+ 2011, Charlie Smotherman <cjsmo at cableone.net>
License: GPL-3
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+ .
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
+ .
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-3'.
Modified: packages/pyfltk/trunk/debian/patches/no_docs
===================================================================
--- packages/pyfltk/trunk/debian/patches/no_docs 2011-05-17 04:32:07 UTC (rev 17030)
+++ packages/pyfltk/trunk/debian/patches/no_docs 2011-05-17 11:39:29 UTC (rev 17031)
@@ -1,4 +1,6 @@
-Do not install documentation files with distutils, ship them in a separate package.
+Description: Do not install documentation files with distutils, ship them in a
+ separate package.
+Author: Luca Falavigna <dktrkranz at ubuntu.com>
Index: pyfltk-1.1.3/setup.py
===================================================================
Added: packages/pyfltk/trunk/debian/patches/opengl_fix
===================================================================
--- packages/pyfltk/trunk/debian/patches/opengl_fix (rev 0)
+++ packages/pyfltk/trunk/debian/patches/opengl_fix 2011-05-17 11:39:29 UTC (rev 17031)
@@ -0,0 +1,16 @@
+Description: This corrects import error when compiled with new g++ linker.
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+
+Index: pyfltk-1.1.5/setup.py
+===================================================================
+--- pyfltk-1.1.5.orig/setup.py 2011-05-16 16:52:59.000000000 -0500
++++ pyfltk-1.1.5/setup.py 2011-05-16 16:53:44.000000000 -0500
+@@ -241,7 +241,7 @@
+ lowercase_item = item.lower()
+ if string.find(lowercase_item, "pthread") >= 0:
+ doMulti = True
+- if string.find(lowercase_item, "fltk") < 0 and string.find(lowercase_item, "gl") >= 0:
++ if string.find(lowercase_item, "fltk") >= 0 and string.find(lowercase_item, "gl") >= 0:
+ doOpenGL = True
+ if string.find(lowercase_item, "fltk") >= 0 and string.find(lowercase_item, "forms") >= 0:
+ doForms = True
Modified: packages/pyfltk/trunk/debian/patches/platform_startswith
===================================================================
--- packages/pyfltk/trunk/debian/patches/platform_startswith 2011-05-17 04:32:07 UTC (rev 17030)
+++ packages/pyfltk/trunk/debian/patches/platform_startswith 2011-05-17 11:39:29 UTC (rev 17031)
@@ -1,4 +1,5 @@
-Do not check only for "linux2" string when determining platform.
+Description: Do not check only for "linux2" string when determining platform.
+Author: Luca Falavigna <dktrkranz at debian.org>
Index: pyfltk-1.1.4/setup.py
===================================================================
Modified: packages/pyfltk/trunk/debian/patches/series
===================================================================
--- packages/pyfltk/trunk/debian/patches/series 2011-05-17 04:32:07 UTC (rev 17030)
+++ packages/pyfltk/trunk/debian/patches/series 2011-05-17 11:39:29 UTC (rev 17031)
@@ -1,2 +1,3 @@
no_docs
platform_startswith
+opengl_fix
More information about the Python-modules-commits
mailing list