[Python-modules-commits] r11173 - in packages/pysilc/pysilc/trunk (15 files)
stefanor-guest at users.alioth.debian.org
stefanor-guest at users.alioth.debian.org
Sat Jan 16 17:51:40 UTC 2010
Date: Saturday, January 16, 2010 @ 17:51:39
Author: stefanor-guest
Revision: 11173
[svn-inject] Applying Debian modifications to trunk
Added:
packages/pysilc/pysilc/trunk/debian/
packages/pysilc/pysilc/trunk/debian/changelog
packages/pysilc/pysilc/trunk/debian/compat
packages/pysilc/pysilc/trunk/debian/control
packages/pysilc/pysilc/trunk/debian/copyright
packages/pysilc/pysilc/trunk/debian/docs
packages/pysilc/pysilc/trunk/debian/patches/
packages/pysilc/pysilc/trunk/debian/patches/10-fix-build.diff
packages/pysilc/pysilc/trunk/debian/patches/20-client_id.diff
packages/pysilc/pysilc/trunk/debian/patches/30-fix-segfaults.diff
packages/pysilc/pysilc/trunk/debian/pycompat
packages/pysilc/pysilc/trunk/debian/python-silc.install
packages/pysilc/pysilc/trunk/debian/pyversions
packages/pysilc/pysilc/trunk/debian/rules
packages/pysilc/pysilc/trunk/debian/watch
Property changes on: packages/pysilc/pysilc/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/pysilc/pysilc/trunk/debian/changelog
===================================================================
--- packages/pysilc/pysilc/trunk/debian/changelog (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/changelog 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,8 @@
+pysilc (0.5-0ubuntu1) karmic; urgency=low
+
+ * Initial debianization (LP: #330105)
+ * Fix build by removing iconv link
+ * Correct client_id returned by PyUser.user_id
+ * Fix segfaults
+
+ -- Michael Gorven <michael at gorven.za.net> Mon, 21 Sep 2009 14:24:07 +0200
Added: packages/pysilc/pysilc/trunk/debian/compat
===================================================================
--- packages/pysilc/pysilc/trunk/debian/compat (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/compat 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1 @@
+5
Added: packages/pysilc/pysilc/trunk/debian/control
===================================================================
--- packages/pysilc/pysilc/trunk/debian/control (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/control 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,30 @@
+Source: pysilc
+Section: python
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Gorven <michael at gorven.za.net>
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.38), python-setuptools (>= 0.6a9), python-support (>= 0.6), libsilc-dev, python-all-dev (>= 2.5), python-all-dbg (>= 2.5)
+Standards-Version: 3.8.2
+Homepage: http://www.liquidx.net/pysilc/
+
+Package: python-silc
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
+Description: Python bindings for SILC
+ PySilc is a near-complete set of Python bindings for creating SILC clients
+ using the silc-toolkit. It allows developers to write simple bots and clients
+ for connecting to SILC servers.
+
+Package: python-silc-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-silc (= ${binary:Version}), python-dbg
+Provides: ${python:Provides}
+Description: Python bindings for SILC (debug extension)
+ PySilc is a near-complete set of Python bindings for creating SILC clients
+ using the silc-toolkit. It allows developers to write simple bots and clients
+ for connecting to SILC servers.
+ .
+ This package contains the extensions built for the Python debug interpreter.
Added: packages/pysilc/pysilc/trunk/debian/copyright
===================================================================
--- packages/pysilc/pysilc/trunk/debian/copyright (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/copyright 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,17 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: PySilc
+Upstream-Maintainer: Martynas Venckus <martynas at altroot.org>
+Upstream-Source: http://www.liquidx.net/pysilc/
+
+Files: *
+Copyright: (c) 2006, Alastair Tse <alastair at liquidx.net>
+Copyright: (c) 2007, Martynas Venckus <martynas at altroot.org>
+License: BSD
+X-Comment: On Debian GNU/Linux systems, the complete text of the
+ BSD License can be found in /usr/share/common-licenses/BSD
+
+Files: debian/*
+Copyright: (c) 2009 Michael Gorven
+License: GPL-2
+X-Comment: On Debian GNU/Linux systems, the complete text of the
+ GNU General Public License can be found in /usr/share/common-licenses/GPL-2
Added: packages/pysilc/pysilc/trunk/debian/docs
===================================================================
--- packages/pysilc/pysilc/trunk/debian/docs (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/docs 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,2 @@
+README
+examples
Added: packages/pysilc/pysilc/trunk/debian/patches/10-fix-build.diff
===================================================================
--- packages/pysilc/pysilc/trunk/debian/patches/10-fix-build.diff (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/patches/10-fix-build.diff 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,16 @@
+Description: libiconv isn't available or necessary on Ubuntu.
+Author: Michael Gorven <michael at gorven.za.net>
+
+=== modified file 'setup.py'
+--- setup.py 2009-02-12 15:35:41 +0000
++++ setup.py 2009-02-12 16:16:26 +0000
+@@ -15,7 +15,7 @@
+ '/usr/local/include/silc-toolkit',
+ '/usr/include/silc',
+ '/usr/local/include/silc'],
+- libraries = ['iconv', 'silc', 'silcclient'],
++ libraries = ['silc', 'silcclient'],
+ depends = ['src/pysilc_callbacks.c',
+ 'src/pysilc_channel.c',
+ 'src/pysilc_user.c',
+
Added: packages/pysilc/pysilc/trunk/debian/patches/20-client_id.diff
===================================================================
--- packages/pysilc/pysilc/trunk/debian/patches/20-client_id.diff (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/patches/20-client_id.diff 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,20 @@
+Description: Corrects the number of bytes in SilcUser.user_id.
+Author: Michael Gorven <michael at gorven.za.net>
+Forwarded: http://developer.berlios.de/patch/?func=detailpatch&patch_id=2694&group_id=6260
+Last-Update: 2009-02-12
+
+=== modified file 'src/pysilc_user.c'
+--- src/pysilc_user.c 2009-02-12 15:35:41 +0000
++++ src/pysilc_user.c 2009-02-12 16:16:44 +0000
+@@ -149,9 +149,7 @@
+ if (PyObject_Cmp(temp, name, &result) == -1)
+ goto cleanup;
+ if (result == 0) {
+- char buf[224];
+- memcpy(&buf, &(pyuser->silcobj->id), 224);
+- value = PyString_FromStringAndSize(buf, 224);
++ value = PyString_FromStringAndSize(&(pyuser->silcobj->id), 29);
+ goto cleanup;
+ }
+
+
Added: packages/pysilc/pysilc/trunk/debian/patches/30-fix-segfaults.diff
===================================================================
--- packages/pysilc/pysilc/trunk/debian/patches/30-fix-segfaults.diff (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/patches/30-fix-segfaults.diff 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,30 @@
+Description: Fixes segfaults.
+Origin: http://developer.berlios.de/patch/?func=detailpatch&patch_id=2571&group_id=6260
+Forwarded: http://developer.berlios.de/patch/?func=detailpatch&patch_id=2571&group_id=6260
+Last-Update: 2008-09-29
+
+=== modified file 'src/pysilc_callbacks.c'
+--- src/pysilc_callbacks.c 2009-02-12 15:35:41 +0000
++++ src/pysilc_callbacks.c 2009-02-14 22:42:12 +0000
+@@ -825,6 +825,7 @@
+ if (tmpstr)
+ context->topic = strdup(tmpstr);
+ tmpstr = va_arg(va, char *);
++ if (tmpstr)
+ context->cipher = strdup(tmpstr);
+ tmpstr = va_arg(va, char *);
+ if (tmpstr)
+
+=== modified file 'src/pysilc_channel.c'
+--- src/pysilc_channel.c 2009-02-12 15:35:41 +0000
++++ src/pysilc_channel.c 2009-02-14 22:42:12 +0000
+@@ -16,6 +16,8 @@
+
+ static PyObject *PySilcChannel_New(SilcChannelEntry channel)
+ {
++ if (!channel)
++ return NULL;
+ PySilcChannel *pychannel = (PySilcChannel *)PyObject_New(PySilcChannel, &PySilcChannel_Type);
+ if (!pychannel)
+ return NULL;
+
Added: packages/pysilc/pysilc/trunk/debian/pycompat
===================================================================
--- packages/pysilc/pysilc/trunk/debian/pycompat (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/pycompat 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1 @@
+2
Added: packages/pysilc/pysilc/trunk/debian/python-silc.install
===================================================================
--- packages/pysilc/pysilc/trunk/debian/python-silc.install (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/python-silc.install 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1 @@
+debian/tmp/usr
Added: packages/pysilc/pysilc/trunk/debian/pyversions
===================================================================
--- packages/pysilc/pysilc/trunk/debian/pyversions (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/pyversions 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1 @@
+2.5-
Added: packages/pysilc/pysilc/trunk/debian/rules
===================================================================
--- packages/pysilc/pysilc/trunk/debian/rules (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/rules 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM := pysupport
+PACKAGE := python-silc
+
+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
+
+# Debug rules based on python-apt
+build/$(PACKAGE)-dbg::
+ set -e; \
+ for i in $(cdbs_python_build_versions); do \
+ python$$i-dbg ./setup.py build; \
+ done
+
+install/$(PACKAGE)-dbg::
+ for i in $(cdbs_python_build_versions); do \
+ python$$i-dbg ./setup.py install --root $(CURDIR)/debian/$(PACKAGE)-dbg; \
+ done
+ find debian/$(PACKAGE)-dbg \
+ ! -type d ! -name '*_d.so' | xargs rm -f
+ find debian/$(PACKAGE)-dbg -depth -empty -exec rmdir {} \;
+
+binary-predeb/$(PACKAGE)-dbg::
+ rm -rf debian/$(PACKAGE)-dbg/usr/share/doc/$(PACKAGE)-dbg
+ ln -s $(PACKAGE) debian/$(PACKAGE)-dbg/usr/share/doc/$(PACKAGE)-dbg
Property changes on: packages/pysilc/pysilc/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/pysilc/pysilc/trunk/debian/watch
===================================================================
--- packages/pysilc/pysilc/trunk/debian/watch (rev 0)
+++ packages/pysilc/pysilc/trunk/debian/watch 2010-01-16 17:51:39 UTC (rev 11173)
@@ -0,0 +1,2 @@
+version=3
+http://developer.berlios.de/project/showfiles.php?group_id=6260&release_id=14871 http://prdownload.berlios.de/python-silc/pysilc-(.*).tar.bz2
More information about the Python-modules-commits
mailing list