[Python-modules-commits] r9986 - in packages/pyme/trunk/debian (9 files)

Fri Oct 9 17:00:44 UTC 2009

Date: Friday, October 9, 2009 @ 17:00:17
  Author: arnau
Revision: 9986

* debian/patches:
  + Add build_with_lfs.patch as required by libgpgme. Closes: #546679.
* Use quilt to manage patches.
* debian/copyright:
  + Update copyright years.
* debian/control:
  + Drop now useless Conflicts and Replaces.
  + Update Standards-Version to 3.8.3.
    - Add README.source.
  + Add ${misc:Depends} to python-pyme and python-pyme-doc Depends in
    case the result of a call to debhelper tools adds extra
    dependencies.

Added:
  packages/pyme/trunk/debian/README.source
  packages/pyme/trunk/debian/patches/build_with_lfs.patch
  packages/pyme/trunk/debian/patches/fix_docs_building.patch
    (from rev 8352, packages/pyme/trunk/debian/patches/01_makefile.patch)
  packages/pyme/trunk/debian/patches/series
Modified:
  packages/pyme/trunk/debian/changelog
  packages/pyme/trunk/debian/control
  packages/pyme/trunk/debian/copyright
  packages/pyme/trunk/debian/rules
Deleted:
  packages/pyme/trunk/debian/patches/01_makefile.patch

Added: packages/pyme/trunk/debian/README.source
===================================================================

--- packages/pyme/trunk/debian/README.source	                        (rev 0)
+++ packages/pyme/trunk/debian/README.source	2009-10-09 17:00:17 UTC (rev 9986)
@@ -0,0 +1,8 @@
+This package  uses quilt to  manage all modifications to  the upstream
+source.   Changes  are  stored  in  the source  package  as  diffs  in
+'debian/patches' and applied during the build.
+
+You can find explanations about quilt usage in the following file:
+/usr/share/doc/quilt/README.source
+
+ -- Arnaud Fontaine <arnau at debian.org>, Fri,  9 Oct 2009 17:06:48 +0100

Modified: packages/pyme/trunk/debian/changelog
===================================================================
--- packages/pyme/trunk/debian/changelog	2009-10-09 16:04:44 UTC (rev 9985)
+++ packages/pyme/trunk/debian/changelog	2009-10-09 17:00:17 UTC (rev 9986)
@@ -1,9 +1,24 @@
-pyme (0.8.1+clean-2) UNRELEASED; urgency=low
+pyme (0.8.1+clean-2) unstable; urgency=low
 
+  [ Arnaud Fontaine ]
+  * debian/patches:
+    + Add build_with_lfs.patch as required by libgpgme. Closes: #546679.
+  * Use quilt to manage patches.
+  * debian/copyright:
+    + Update copyright years.
   * debian/control:
+    + Drop now useless Conflicts and Replaces.
+    + Update Standards-Version to 3.8.3.
+      - Add README.source.
+    + Add ${misc:Depends} to python-pyme and python-pyme-doc Depends in
+      case the result of a call to debhelper tools adds extra
+      dependencies.
+
+  [ Sandro Tosi ]
+  * debian/control:
     + Switch Vcs-Browser field to viewsvn.
 
- -- Sandro Tosi <morph at debian.org>  Tue, 02 Dec 2008 21:47:20 +0000
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 09 Oct 2009 17:04:22 +0100
 
 pyme (0.8.1+clean-1) unstable; urgency=low
 

Modified: packages/pyme/trunk/debian/control
===================================================================
--- packages/pyme/trunk/debian/control	2009-10-09 16:04:44 UTC (rev 9985)
+++ packages/pyme/trunk/debian/control	2009-10-09 17:00:17 UTC (rev 9986)
@@ -8,21 +8,19 @@
                cdbs (>= 0.4.42),
                python-all-dev (>= 2.3.5-11),
                python-central (>= 0.4.17),
-               patchutils (>= 0.2.25),
+	       quilt,
                libgpgme11-dev,
                swig
 Homepage: http://pyme.sourceforge.net
 XS-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.8.0
+Standards-Version: 3.8.3
 
 Package: python-pyme
 Architecture: any
-Conflicts: python2.3-pyme (<< 0.7.0-2), python2.4-pyme (<< 0.7.0-2)
-Replaces: python2.3-pyme (<< 0.7.0-2), python2.4-pyme (<< 0.7.0-2)
 Provides: ${python:Provides}
-Depends: ${python:Depends}, ${shlibs:Depends}
+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
@@ -43,5 +41,6 @@
 Package: python-pyme-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Python interface to the GPGME GnuPG encryption library
  This package contains the documentation for Pyme.

Modified: packages/pyme/trunk/debian/copyright
===================================================================
--- packages/pyme/trunk/debian/copyright	2009-10-09 16:04:44 UTC (rev 9985)
+++ packages/pyme/trunk/debian/copyright	2009-10-09 17:00:17 UTC (rev 9986)
@@ -13,7 +13,7 @@
 
 Copyright:
 
-Copyright (C) 2004-2008 Igor Belyi <belyi at users.sourceforge.net>
+Copyright (C) 2004-2009 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

Deleted: packages/pyme/trunk/debian/patches/01_makefile.patch
===================================================================
--- packages/pyme/trunk/debian/patches/01_makefile.patch	2009-10-09 16:04:44 UTC (rev 9985)
+++ packages/pyme/trunk/debian/patches/01_makefile.patch	2009-10-09 17:00:17 UTC (rev 9986)
@@ -1,11 +0,0 @@
---- a/Makefile	2008-12-02 16:56:41.000000000 +0000
-+++ b/Makefile	2008-12-02 16:56:54.000000000 +0000
-@@ -75,7 +75,7 @@
- reallyclean: clean
- 	rm -f doc/*.html doc/gpgme/*.html $(CFILE) $(PYPATH)/$(PYFILE) $(HFILE)
- 
--docs: build
-+docs:
- 	rm -f doc/*.html
- 	cd doc; for MOD in $(DOCMODS); do PYTHONPATH=`echo ../build/lib* | sed -e "s# #:#"` pydoc -w $$MOD; done
- ifneq (, $(PYSRCURL))

Added: packages/pyme/trunk/debian/patches/build_with_lfs.patch
===================================================================
--- packages/pyme/trunk/debian/patches/build_with_lfs.patch	                        (rev 0)
+++ packages/pyme/trunk/debian/patches/build_with_lfs.patch	2009-10-09 17:00:17 UTC (rev 9986)
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@ SWIGSOURCE = $(FILE).i
+ DOCMODSDIRS := $(shell find pyme -type d | grep -v CVS | sed 'sx/x.xg')
+ DOCMODSFILES := $(shell find pyme -name "*.py" | egrep -v __init__ | grep -v gpgme.py | sed 'sx/x.xg')
+ DOCMODS := $(DOCMODSDIRS) $(DOCMODSFILES:.py=)
+-SWIGOPT := $(shell gpgme-config --cflags) -I/usr/include 
++SWIGOPT := $(shell gpgme-config --cflags) -I/usr/include -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE
+ PYMEVERS := $(shell python -c "from pyme.version import *;print versionstr")
+ SYSTEM = $(shell uname -s | sed 's/_.*//')
+ ifeq ($(SYSTEM),MINGW32)
+--- a/setup.py
++++ b/setup.py
+@@ -39,7 +39,7 @@ def getconfig(what):
+     return [x for x in confdata.split(' ') if x != '']
+ 
+ include_dirs = [os.getcwd()]
+-define_macros = []
++define_macros = [("_FILE_OFFSET_BITS", "64"), ("LARGEFILE_SOURCE", None)]
+ library_dirs = []
+ libs = getconfig('libs')
+ for item in getconfig('cflags'):

Copied: packages/pyme/trunk/debian/patches/fix_docs_building.patch (from rev 8352, packages/pyme/trunk/debian/patches/01_makefile.patch)
===================================================================
--- packages/pyme/trunk/debian/patches/fix_docs_building.patch	                        (rev 0)
+++ packages/pyme/trunk/debian/patches/fix_docs_building.patch	2009-10-09 17:00:17 UTC (rev 9986)
@@ -0,0 +1,11 @@
+--- a/Makefile	2008-12-02 16:56:41.000000000 +0000
++++ b/Makefile	2008-12-02 16:56:54.000000000 +0000
+@@ -75,7 +75,7 @@
+ reallyclean: clean
+ 	rm -f doc/*.html doc/gpgme/*.html $(CFILE) $(PYPATH)/$(PYFILE) $(HFILE)
+ 
+-docs: build
++docs:
+ 	rm -f doc/*.html
+ 	cd doc; for MOD in $(DOCMODS); do PYTHONPATH=`echo ../build/lib* | sed -e "s# #:#"` pydoc -w $$MOD; done
+ ifneq (, $(PYSRCURL))

Added: packages/pyme/trunk/debian/patches/series
===================================================================
--- packages/pyme/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyme/trunk/debian/patches/series	2009-10-09 17:00:17 UTC (rev 9986)
@@ -0,0 +1,2 @@
+fix_docs_building.patch
+build_with_lfs.patch

Modified: packages/pyme/trunk/debian/rules
===================================================================
--- packages/pyme/trunk/debian/rules	2009-10-09 16:04:44 UTC (rev 9985)
+++ packages/pyme/trunk/debian/rules	2009-10-09 17:00:17 UTC (rev 9986)
@@ -7,7 +7,7 @@
 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/simple-patchsys.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


