[Python-modules-commits] r7063 - in packages/pyme/trunk (5 files)

Tue Dec 2 21:47:19 UTC 2008

Date: Tuesday, December 2, 2008 @ 21:47:19
  Author: arnau
Revision: 7063

* New upstream release.
  + Update 01_makefile.patch as a part of the diff has been merged
    upstream.
* Get rid of debian/ directory in upstream source and add a note about
  that in debian/copyright.

Modified:
  packages/pyme/trunk/debian/changelog
  packages/pyme/trunk/debian/control
  packages/pyme/trunk/debian/copyright
  packages/pyme/trunk/debian/patches/01_makefile.patch
  packages/pyme/trunk/setup.py

Modified: packages/pyme/trunk/debian/changelog
===================================================================

--- packages/pyme/trunk/debian/changelog	2008-12-02 21:37:12 UTC (rev 7062)
+++ packages/pyme/trunk/debian/changelog	2008-12-02 21:47:19 UTC (rev 7063)
@@ -1,9 +1,12 @@
-pyme (0.8.0-3) UNRELEASED; urgency=low
+pyme (0.8.1+clean-1) unstable; urgency=low
 
-  * debian/control
-    - switch Vcs-Browser field to viewsvn
+  * New upstream release.
+    + Update 01_makefile.patch as a part of the diff has been merged
+      upstream.
+  * Get rid of debian/ directory in upstream source and add a note about
+    that in debian/copyright.
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:14:27 +0100
+ -- Arnaud Fontaine <arnau at debian.org>  Tue, 02 Dec 2008 16:23:52 +0000
 
 pyme (0.8.0-2) unstable; urgency=low
 

Modified: packages/pyme/trunk/debian/control
===================================================================
--- packages/pyme/trunk/debian/control	2008-12-02 21:37:12 UTC (rev 7062)
+++ packages/pyme/trunk/debian/control	2008-12-02 21:47:19 UTC (rev 7063)
@@ -14,7 +14,7 @@
 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/
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyme/trunk/?op=log
 Standards-Version: 3.8.0
 
 Package: python-pyme

Modified: packages/pyme/trunk/debian/copyright
===================================================================
--- packages/pyme/trunk/debian/copyright	2008-12-02 21:37:12 UTC (rev 7062)
+++ packages/pyme/trunk/debian/copyright	2008-12-02 21:47:19 UTC (rev 7063)
@@ -5,7 +5,9 @@
 <jgoerzen at complete.org>  have  maintained  unofficially  the  package,
 thanks for their work.
 
-It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=104883
+It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=104883,
+the upstream source has been repackaged  only on purpose to get rid of
+debian/ directory, no other changes have been made.
 
 Tue, 19 Nov 2002 14:32:36 -0600.
 

Modified: packages/pyme/trunk/debian/patches/01_makefile.patch
===================================================================
--- packages/pyme/trunk/debian/patches/01_makefile.patch	2008-12-02 21:37:12 UTC (rev 7062)
+++ packages/pyme/trunk/debian/patches/01_makefile.patch	2008-12-02 21:47:19 UTC (rev 7063)
@@ -1,14 +1,11 @@
---- a/Makefile	2008-06-23 00:22:34.000000000 +0900
-+++ b/Makefile	2008-06-23 00:23:11.000000000 +0900
-@@ -75,9 +75,9 @@
+--- 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*` pydoc -w $$MOD; done
-+	cd doc; for MOD in $(DOCMODS); do PYTHONPATH=`echo ../build/lib* | sed 's/\ /:/g'` pydoc -w $$MOD; done
+ 	cd doc; for MOD in $(DOCMODS); do PYTHONPATH=`echo ../build/lib* | sed -e "s# #:#"` pydoc -w $$MOD; done
  ifneq (, $(PYSRCURL))
- 	cd doc; for MOD in $(DOCMODS); do sed -i -e "s#\"file:.*/site-packages/\(pyme/.*\)\">[^<]*</a>#\"$(PYSRCURL)\">\1</a>#" $$MOD.html; done
- endif

Modified: packages/pyme/trunk/setup.py
===================================================================
--- packages/pyme/trunk/setup.py	2008-12-02 21:37:12 UTC (rev 7062)
+++ packages/pyme/trunk/setup.py	2008-12-02 21:47:19 UTC (rev 7063)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# $Id: setup.py,v 1.6 2006/04/12 22:20:38 belyi Exp $
+# $Id: setup.py,v 1.8 2008/11/24 21:44:30 belyi Exp $
 
 # Module: installer
 # COPYRIGHT #
@@ -63,13 +63,19 @@
    for item in include_dirs:
        for ln, mnt, tgt in tmplist:
            if item.startswith(mnt):
-               extra_dirs.append(os.path.realpath(tgt+item[ln:]))
+               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):
-               library_dirs.append(os.path.realpath(tgt+item[ln:]))
+               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"],


