[Pkg-e-commits] [SCM] Python bindings for Ecore and Ecore-Evas branch, master, updated. debian/0.2.1-2-129-g729d15d

Mon May 18 11:36:21 UTC 2009

The following commit has been merged in the master branch:
commit 729d15db20c97b7cdf5be1f610d113b5a8b835b6
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Sat May 16 15:56:01 2009 +0200

    Merge Nikita's work and prepare a new SVN snapshot

diff --git a/debian/changelog b/debian/changelog
index e4dbeb8..703b88b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+python-ecore (0.3.1+svn20090515-1) UNRELEASED; urgency=low
+
+  * New SVN snapshot
+  * Bump Standards-Version to 3.8.1, no change required
+  * Tighten build-dep on libecore-dev
+  * Add debian/patches/01-remove-software-gdi-engine.diff
+    - Compile without the software-gdi engine support, as this would require
+      a more recent ecore
+  * debian/copyright:
+    - Update for new upstream license
+    - [lintian] fix copyright-with-old-dh-make-debian-copyright
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Sat, 16 May 2009 14:42:40 +0200
+
+python-ecore (0.3.1+svn20081220-0.2) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Updated libecore-dev dependency to follow package rename. 
+
+ -- Nikita V. Youshchenko <yoush at debian.org>  Thu, 08 Jan 2009 16:17:32 +0300
+
+python-ecore (0.3.1+svn20081220-0.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream SVN snapshot.
+    + Should fix issues with newer cython. Closes: #493239.
+  * Build-Depend on python-setuptools (>= 0.6c9) since now setup.py requires
+    at least that version.
+  * Build-Depend on libecore-0.9.9.050a-dev, it will pull in other versioned
+    deps.
+  * Remove debian/docs - file mentioned there is no longer provided.
+
+ -- Nikita V. Youshchenko <yoush at debian.org>  Sun, 04 Jan 2009 18:44:56 +0300
+
 python-ecore (0.2.1-2) experimental; urgency=low
 
   * debian/control
diff --git a/debian/control b/debian/control
index e4693d3..672d6dd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: python-ecore
 Section: python
 Priority: extra
 Maintainer: Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
-Uploaders: Jan Lübbe <jluebbe at debian.org>
+Uploaders: Jan Lübbe <jluebbe at debian.org>, Albin Tonnerre <albin.tonnerre at gmail.com>
 Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.49),
- python-all-dev (>= 2.3.5-11), python-support (>= 0.5.3), python-setuptools,
- cython, python-pyrex, python-evas, libecore-dev, libevas-dev
-Standards-Version: 3.7.3
+ python-all-dev (>= 2.3.5-11), python-support (>= 0.5.3),
+ python-setuptools (>= 0.6c9), cython, python-pyrex,
+ python-evas (>= 0.3.1+svn20081220), libecore-dev (>= 0.9.9.060)
+Standards-Version: 3.8.1
 Vcs-Browser: http://git.debian.org/?p=pkg-e/proto/python-efl/python-ecore.git
 Vcs-Git: git://git.debian.org/pkg-e/proto/python-efl/python-ecore.git
 Homepage: http://enlightenment.org
diff --git a/debian/copyright b/debian/copyright
index 56b0864..071eab3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,40 +3,30 @@ Sat, 01 Mar 2008 23:16:17 +0100.
 
 It was downloaded from git://staff.get-e.org/e17/proto/python-efl/python-ecore.git
 
-Upstream Authors: 
+Upstream Authors:
  Gustavo Sverzut Barbieri <barbieri at gmail.com>
 
-Copyright: 
+Copyright:
  Copyright (C) 2007 Gustavo Sverzut Barbieri
- 
+
 License:
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies of the Software and its Copyright notices. In addition publicly
- documented acknowledgment must be given that this software has been used if no
- source code of this software is made available publicly. This includes
- acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
- documents or any documentation provided with any product containing this
- software. This License does not apply to any software that links to the
- libraries provided by this software (statically or dynamically), but only to
- the software provided.
- 
- Please see the COPYING.PLAIN for a plain-english explanation of this notice
- and it's intent.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The Debian packaging is (C) 2008 Jan Luebbe <jluebbe at debian.org> and
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This package 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+The Debian packaging is © 2008 Jan Luebbe <jluebbe at debian.org> and
 is licensed under the same license as the upstream package.
 
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index d9bf9a8..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-COPYING-PLAIN
diff --git a/debian/patches/01-remove-software-gdi-engine.diff b/debian/patches/01-remove-software-gdi-engine.diff
new file mode 100644
index 0000000..a124750
--- /dev/null
+++ b/debian/patches/01-remove-software-gdi-engine.diff
@@ -0,0 +1,20 @@
+diff --git a/ecore/evas/ecore.evas.c_ecore_evas.pyx b/ecore/evas/ecore.evas.c_ecore_evas.pyx
+index d7a15e1..3ab1daa 100644
+--- a/ecore/evas/ecore.evas.c_ecore_evas.pyx
++++ b/ecore/evas/ecore.evas.c_ecore_evas.pyx
+@@ -36,7 +36,6 @@ engines[<int>ECORE_EVAS_ENGINE_XRENDER_X11] = "xrender_x11"
+ engines[<int>ECORE_EVAS_ENGINE_OPENGL_X11] = "opengl_x11"
+ engines[<int>ECORE_EVAS_ENGINE_SOFTWARE_XCB] = "software_xcb"
+ engines[<int>ECORE_EVAS_ENGINE_XRENDER_XCB] = "xrender_xcb"
+-engines[<int>ECORE_EVAS_ENGINE_SOFTWARE_GDI] = "software_gdi"
+ engines[<int>ECORE_EVAS_ENGINE_SOFTWARE_DDRAW] = "software_ddraw"
+ engines[<int>ECORE_EVAS_ENGINE_DIRECT3D] = "direct3d"
+ engines[<int>ECORE_EVAS_ENGINE_OPENGL_GLEW] = "opengl_glew"
+@@ -60,7 +59,6 @@ engine_mapping = {
+   "software_16_x11": SoftwareX11_16,
+ #  "directfb": DirectFB,
+   "fb": FB,
+-#  "software_gdi": ,
+ #  "software_ddraw": ,
+ #  "direct3d": ,
+ #  "opengl_glew": ,
diff --git a/debian/rules b/debian/rules
index dc1cb76..814d55d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,5 @@
 DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-

-- 
Python bindings for Ecore and Ecore-Evas

