[Python-modules-commits] r16599 - in packages/pyme/trunk (8 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Mon Apr 18 04:17:22 UTC 2011
Date: Monday, April 18, 2011 @ 04:17:11
Author: arnau
Revision: 16599
* debian/control:
+ Bump Standards-Version to 3.9.2. No changes needed.
* Switch to dpkg-source 3.0 (quilt) format.
+ Update debian/source/format accordingly.
+ No need to remove manually debian/ from the upstream source tarball.
+ Add debian/patches/fix_setup_dash_ftbfs.patch including changes on
setup.py previously found in diff.gz.
+ debian/control:
- Remove Build-Depends on quilt.
+ debian/rules:
- Do not include patchsys-quilt.mk anymore.
* Use dh_python2 rather than now deprecated dh_pycentral. Closes: #616934.
+ debian/control:
- Rename now deprecated XS-Python-Version to X-Python-Version.
- Remove now deprecated XB-Python-Version.
- Bump cdbs version to 0.4.90-1~.
- Bump python-all-dev version to 2.6.6-3~.
- Remove Build-Depends on python-central.
+ debian/rules:
- Remove DEB_PYTHON_SYSTEM.
Added:
packages/pyme/trunk/debian/patches/fix_setup_dash_ftbfs.patch
Modified:
packages/pyme/trunk/debian/changelog
packages/pyme/trunk/debian/control
packages/pyme/trunk/debian/patches/series
packages/pyme/trunk/debian/rules
packages/pyme/trunk/debian/source/format
packages/pyme/trunk/debian/watch
Deleted:
packages/pyme/trunk/setup.py
Modified: packages/pyme/trunk/debian/changelog
===================================================================
--- packages/pyme/trunk/debian/changelog 2011-04-17 21:20:36 UTC (rev 16598)
+++ packages/pyme/trunk/debian/changelog 2011-04-18 04:17:11 UTC (rev 16599)
@@ -1,3 +1,28 @@
+pyme (1:0.8.1-2) unstable; urgency=low
+
+ * debian/control:
+ + Bump Standards-Version to 3.9.2. No changes needed.
+ * Switch to dpkg-source 3.0 (quilt) format.
+ + Update debian/source/format accordingly.
+ + No need to remove manually debian/ from the upstream source tarball.
+ + Add debian/patches/fix_setup_dash_ftbfs.patch including changes on
+ setup.py previously found in diff.gz.
+ + debian/control:
+ - Remove Build-Depends on quilt.
+ + debian/rules:
+ - Do not include patchsys-quilt.mk anymore.
+ * Use dh_python2 rather than now deprecated dh_pycentral. Closes: #616934.
+ + debian/control:
+ - Rename now deprecated XS-Python-Version to X-Python-Version.
+ - Remove now deprecated XB-Python-Version.
+ - Bump cdbs version to 0.4.90-1~.
+ - Bump python-all-dev version to 2.6.6-3~.
+ - Remove Build-Depends on python-central.
+ + debian/rules:
+ - Remove DEB_PYTHON_SYSTEM.
+
+ -- Arnaud Fontaine <arnau at miyumi> Mon, 18 Apr 2011 10:39:58 +0900
+
pyme (0.8.1+clean-4) unstable; urgency=low
* Team upload.
@@ -11,7 +36,7 @@
-- Jakub Wilk <jwilk at debian.org> Mon, 23 Aug 2010 16:27:23 +0200
pyme (0.8.1+clean-3) unstable; urgency=low
-
+
* debian/patches:
+ Add add_missing_check_version.patch to fix breakage in signing.
Thanks to Marek Hulán. Closes: #550596.
@@ -108,7 +133,7 @@
-- Arnaud Fontaine <arnaud at andesi.org> Sat, 24 Jun 2006 16:23:45 +0200
pyme (0.7.0-2) unstable; urgency=low
-
+
* Add debian/patches/01_gpgme.patch in order to fix FTBFS issue
due to swig version 1.3.28. Closes: #358648.
* Move swig stuff from pre-build rules to post-patches in order to
@@ -118,7 +143,7 @@
pyme (0.7.0-1) unstable; urgency=low
- * New upstream release. Thanks to Igor Belyi and John Goerzen for
+ * New upstream release. Thanks to Igor Belyi and John Goerzen for
maintaining unofficial debian package. Closes: #322168.
-- Arnaud Fontaine <arnaud at andesi.org> Thu, 12 Jan 2006 13:57:34 +0100
Modified: packages/pyme/trunk/debian/control
===================================================================
--- packages/pyme/trunk/debian/control 2011-04-17 21:20:36 UTC (rev 16598)
+++ packages/pyme/trunk/debian/control 2011-04-18 04:17:11 UTC (rev 16599)
@@ -5,23 +5,20 @@
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
Gustavo Franco <stratus at debian.org>
Build-Depends: debhelper (>= 5.0.37.2),
- cdbs (>= 0.4.42),
- python-all-dev (>= 2.3.5-11),
- python-central (>= 0.4.17),
- quilt,
+ cdbs (>= 0.4.90-1~),
+ python-all-dev (>= 2.6.6-3~),
libgpgme11-dev,
swig
Homepage: http://pyme.sourceforge.net
-XS-Python-Version: all
+X-Python-Version: all
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyme/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyme/trunk/
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Package: python-pyme
Architecture: any
Provides: ${python:Provides}
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-XB-Python-Version: ${python:Versions}
Suggests: python-pyme-doc
Description: Python interface to the GPGME GnuPG encryption library
Pyme is, for the most part, a direct interface to the C GPGME
Added: packages/pyme/trunk/debian/patches/fix_setup_dash_ftbfs.patch
===================================================================
--- packages/pyme/trunk/debian/patches/fix_setup_dash_ftbfs.patch (rev 0)
+++ packages/pyme/trunk/debian/patches/fix_setup_dash_ftbfs.patch 2011-04-18 04:17:11 UTC (rev 16599)
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with dash as /bin/sh.
+Author: Adrien Cunin <adri2000 at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/493110
+
+--- a/setup.py
++++ b/setup.py
+@@ -31,7 +31,7 @@ sys.path.append("pyme")
+ import version
+
+ def getconfig(what):
+- cmd = os.popen("sh gpgme-config --%s" % what, "r")
++ cmd = os.popen("sh -c 'gpgme-config --%s'" % what, "r")
+ confdata = cmd.read()
+ confdata = confdata.replace("\n", " ")
+ assert cmd.close() == None, "error getting GPG config"
Modified: packages/pyme/trunk/debian/patches/series
===================================================================
--- packages/pyme/trunk/debian/patches/series 2011-04-17 21:20:36 UTC (rev 16598)
+++ packages/pyme/trunk/debian/patches/series 2011-04-18 04:17:11 UTC (rev 16599)
@@ -1,3 +1,4 @@
+fix_setup_dash_ftbfs.patch
fix_docs_building.patch
build_with_lfs.patch
add_missing_check_version.patch
Modified: packages/pyme/trunk/debian/rules
===================================================================
--- packages/pyme/trunk/debian/rules 2011-04-17 21:20:36 UTC (rev 16598)
+++ packages/pyme/trunk/debian/rules 2011-04-18 04:17:11 UTC (rev 16599)
@@ -1,13 +1,10 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-DEB_PYTHON_SYSTEM=pycentral
-
# Common rules
include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# In order to run `make swig' one time only for the build
STAMP_MAKE_SWIG=debian/stamp-make-swig
Modified: packages/pyme/trunk/debian/source/format
===================================================================
--- packages/pyme/trunk/debian/source/format 2011-04-17 21:20:36 UTC (rev 16598)
+++ packages/pyme/trunk/debian/source/format 2011-04-18 04:17:11 UTC (rev 16599)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
Modified: packages/pyme/trunk/debian/watch
===================================================================
--- packages/pyme/trunk/debian/watch 2011-04-17 21:20:36 UTC (rev 16598)
+++ packages/pyme/trunk/debian/watch 2011-04-18 04:17:11 UTC (rev 16599)
@@ -1,2 +1,2 @@
version=3
-http://qa.debian.org/watch/sf.php/pyme/ pyme-([\d.]*).tar.gz
+http://qa.debian.org/watch/sf.php/pyme/ pyme-([\d.]*)\.tar\.gz
Deleted: packages/pyme/trunk/setup.py
===================================================================
--- packages/pyme/trunk/setup.py 2011-04-17 21:20:36 UTC (rev 16598)
+++ packages/pyme/trunk/setup.py 2011-04-18 04:17:11 UTC (rev 16599)
@@ -1,99 +0,0 @@
-#!/usr/bin/env python
-
-# $Id: setup.py,v 1.8 2008/11/24 21:44:30 belyi Exp $
-
-# Module: installer
-# COPYRIGHT #
-# Copyright (C) 2004 Igor Belyi <belyi at users.sourceforge.net>
-# Copyright (C) 2002 John Goerzen <jgoerzen at complete.org>
-#
-# This library 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 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-# END OF COPYRIGHT #
-
-
-from distutils.core import setup, Extension
-from distutils.command.build_ext import build_ext
-import os, os.path, sys
-
-sys.path.append("pyme")
-import version
-
-def getconfig(what):
- cmd = os.popen("sh -c 'gpgme-config --%s'" % what, "r")
- confdata = cmd.read()
- confdata = confdata.replace("\n", " ")
- assert cmd.close() == None, "error getting GPG config"
- confdata = confdata.replace(" ", " ")
- return [x for x in confdata.split(' ') if x != '']
-
-include_dirs = [os.getcwd()]
-define_macros = []
-library_dirs = []
-libs = getconfig('libs')
-for item in getconfig('cflags'):
- if item.startswith("-I"):
- include_dirs.append(item[2:])
- elif item.startswith("-D"):
- defitem = item[2:].split("=", 1)
- if len(defitem)==2:
- define_macros.append((defitem[0], defitem[1]))
- else:
- define_macros.append((defitem[0], None))
-
-# Adjust include and library locations in case of win32
-uname_s = os.popen("uname -s").read()
-if uname_s.startswith("MINGW32"):
- mnts = [x.split()[0:3:2] for x in os.popen("mount").read().split("\n") if x]
- tmplist = [(len(x[1]), x[1], x[0]) for x in mnts]
- tmplist.sort()
- tmplist.reverse()
- extra_dirs = []
- for item in include_dirs:
- for ln, mnt, tgt in tmplist:
- if item.startswith(mnt):
- item = os.path.normpath(item[ln:])
- while item[0] == os.path.sep:
- item = item[1:]
- extra_dirs.append(os.path.join(tgt,item))
- break
- include_dirs += extra_dirs
- for item in [x[2:] for x in libs if x.startswith("-L")]:
- for ln, mnt, tgt in tmplist:
- if item.startswith(mnt):
- item = os.path.normpath(item[ln:])
- while item[0] == os.path.sep:
- item = item[1:]
- library_dirs.append(os.path.join(tgt,item))
- break
-
-swige = Extension("pyme._pygpgme", ["gpgme_wrap.c", "helpers.c"],
- include_dirs = include_dirs,
- define_macros = define_macros,
- library_dirs = library_dirs,
- extra_link_args = libs)
-
-setup(name = "pygpgme",
- version = version.versionstr,
- description = version.description,
- author = version.author,
- author_email = version.author_email,
- url = version.homepage,
- ext_modules=[swige],
- packages = ['pyme', 'pyme.constants', 'pyme.constants.data',
- 'pyme.constants.keylist', 'pyme.constants.sig'],
- license = version.copyright + \
- ", Licensed under the GPL version 2"
-)
-
More information about the Python-modules-commits
mailing list