diff -Nru pysilc-0.5-1~ppa/debian/changelog pysilc-0.5/debian/changelog --- pysilc-0.5-1~ppa/debian/changelog 2010-01-20 10:55:11.000000000 +0000 +++ pysilc-0.5/debian/changelog 2010-01-30 23:36:12.000000000 +0000 @@ -1,14 +1,11 @@ -pysilc (0.5-1~ppa-intrepid2) intrepid; urgency=low +pysilc (0.5-1~ppa+8~intrepid) intrepid; urgency=low * Build for intrepid - -- Stefano Rivera Wed, 20 Jan 2010 12:55:11 +0200 + -- Stefano Rivera Sun, 31 Jan 2010 01:19:37 +0200 pysilc (0.5-1) unstable; urgency=low * Initial release (Closes: #564605) - * Fix build by removing iconv link - * Correct client_id returned by PyUser.user_id - * Fix segfaults - -- Stefano Rivera Sat, 16 Jan 2010 19:57:41 +0200 + -- Stefano Rivera Thu, 28 Jan 2010 13:02:23 +0200 diff -Nru pysilc-0.5-1~ppa/debian/control pysilc-0.5/debian/control --- pysilc-0.5-1~ppa/debian/control 2010-01-20 10:55:11.000000000 +0000 +++ pysilc-0.5/debian/control 2010-01-30 23:36:12.000000000 +0000 @@ -3,9 +3,10 @@ Priority: optional Maintainer: Debian Python Modules Team Uploaders: Stefano Rivera -Build-Depends: debhelper (>= 7.0.50~), python-setuptools (>= 0.6a9), python-support (>= 0.6), libsilc-dev, python-all-dev, python-all-dbg, quilt +Build-Depends: quilt (>= 0.46-7), debhelper (>= 7.0.50~), python-support (>= 0.6), libsilc-dev, + python-all-dev, python-all-dbg XS-Python-Version: >= 2.5 -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://www.liquidx.net/pysilc/ Vcs-Svn: svn://svn.debian.org/python-modules/packages/pysilc/trunk/ Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pysilc/trunk/ @@ -13,21 +14,13 @@ 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. + SILC (Secure Internet Live Conferencing) is a network protocol designed to + provide end-to-end security for conferencing services. SILC has a command set + and a user interface similar to IRC, but the network protocol is completely + different as it supports public key strong cryptography and a different + network model. diff -Nru pysilc-0.5-1~ppa/debian/controle pysilc-0.5/debian/controle --- pysilc-0.5-1~ppa/debian/controle 2010-01-20 10:55:11.000000000 +0000 +++ pysilc-0.5/debian/controle 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -Source: pysilc -Section: python -Priority: optional -Maintainer: Debian Python Modules Team -Uploaders: Stefano Rivera -Build-Depends: debhelper (>= 7.0.50~), python-setuptools (>= 0.6a9), python-support (>= 0.6), libsilc-dev, python-all-dev, python-all-dbg -XS-Python-Version: >= 2.5 -Standards-Version: 3.8.3 -Homepage: http://www.liquidx.net/pysilc/ -Vcs-Svn: svn://svn.debian.org/python-modules/packages/pysilc/trunk/ -Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pysilc/trunk/ - -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. diff -Nru pysilc-0.5-1~ppa/debian/copyright pysilc-0.5/debian/copyright --- pysilc-0.5-1~ppa/debian/copyright 2010-01-17 08:34:44.000000000 +0000 +++ pysilc-0.5/debian/copyright 2010-01-30 23:36:12.000000000 +0000 @@ -11,8 +11,26 @@ This program is free software; you can redistributed it and/or modify it under the terms of the BSD License. . - On Debian systems, the complete text of the BSD License can be found in - the /usr/share/common-licenses/BSD file. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pysilc nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN Files: debian/* Copyright: diff -Nru pysilc-0.5-1~ppa/debian/docs pysilc-0.5/debian/docs --- pysilc-0.5-1~ppa/debian/docs 2010-01-17 08:34:44.000000000 +0000 +++ pysilc-0.5/debian/docs 2010-01-30 23:36:12.000000000 +0000 @@ -1,2 +1 @@ README -examples diff -Nru pysilc-0.5-1~ppa/debian/patches/client_id.diff pysilc-0.5/debian/patches/client_id.diff --- pysilc-0.5-1~ppa/debian/patches/client_id.diff 2010-01-17 08:34:44.000000000 +0000 +++ pysilc-0.5/debian/patches/client_id.diff 2010-01-30 23:36:12.000000000 +0000 @@ -4,8 +4,8 @@ Last-Update: 2009-02-12 === modified file 'pysilc-0.5/src/pysilc_user.c' ---- pysilc-0.5.orig/src/pysilc_user.c 2009-02-12 15:35:41 +0000 -+++ pysilc-0.5/src/pysilc_user.c 2009-02-12 16:16:44 +0000 +--- a/src/pysilc_user.c ++++ b/src/pysilc_user.c @@ -149,9 +149,7 @@ if (PyObject_Cmp(temp, name, &result) == -1) goto cleanup; @@ -13,8 +13,7 @@ - char buf[224]; - memcpy(&buf, &(pyuser->silcobj->id), 224); - value = PyString_FromStringAndSize(buf, 224); -+ value = PyString_FromStringAndSize(&(pyuser->silcobj->id), 29); ++ value = PyString_FromStringAndSize(&(pyuser->silcobj->id), sizeof(SilcClientID)); goto cleanup; } - diff -Nru pysilc-0.5-1~ppa/debian/patches/failure-method.diff pysilc-0.5/debian/patches/failure-method.diff --- pysilc-0.5-1~ppa/debian/patches/failure-method.diff 1970-01-01 01:00:00.000000000 +0100 +++ pysilc-0.5/debian/patches/failure-method.diff 2010-01-30 23:36:12.000000000 +0000 @@ -0,0 +1,44 @@ +Description: SilcClient calls failure on a connection failure, yet the examples + don't show this, leading to the rather confusing "AttributeError" when you run + the example script. +Author: Stefano Rivera +Forwarded: http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=2914&group_id=6260 +Last-Update: 2010-01-24 + +--- a/README ++++ b/README +@@ -84,6 +84,9 @@ + def disconnected(self): + print "* Disconnected" + ++ def failure(self): ++ print "* Connection failure" ++ + # catch responses to commands + + def command_reply_join(self, channel, name, topic, hmac, x, y, +--- a/examples/demo.py ++++ b/examples/demo.py +@@ -42,6 +42,10 @@ + print 'SILC: Disconnected from server.' + self.isconnected = False + ++ def failure(self): ++ print "SILC: Connection failure" ++ self.isconnected = False ++ + def command(self, success, code, command, status): + print 'SILC: Command:', success, code, command, status + +--- a/examples/echo.py ++++ b/examples/echo.py +@@ -22,6 +22,9 @@ + def disconnected(self, msg): + print "* Disconnected: %s" % msg + ++ def failure(self): ++ print "* Connection Failure" ++ + # catch responses to commands + + def command_reply_join(self, channel, name, topic, hmac, x, y, diff -Nru pysilc-0.5-1~ppa/debian/patches/series pysilc-0.5/debian/patches/series --- pysilc-0.5-1~ppa/debian/patches/series 2010-01-17 08:34:44.000000000 +0000 +++ pysilc-0.5/debian/patches/series 2010-01-30 23:36:12.000000000 +0000 @@ -1,3 +1,4 @@ +failure-method.diff fix-build.diff client_id.diff fix-segfaults.diff diff -Nru pysilc-0.5-1~ppa/debian/python-silc.examples pysilc-0.5/debian/python-silc.examples --- pysilc-0.5-1~ppa/debian/python-silc.examples 1970-01-01 01:00:00.000000000 +0100 +++ pysilc-0.5/debian/python-silc.examples 2010-01-30 23:36:12.000000000 +0000 @@ -0,0 +1 @@ +examples/* diff -Nru pysilc-0.5-1~ppa/debian/python-silc.install pysilc-0.5/debian/python-silc.install --- pysilc-0.5-1~ppa/debian/python-silc.install 2010-01-17 08:34:44.000000000 +0000 +++ pysilc-0.5/debian/python-silc.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/tmp/usr diff -Nru pysilc-0.5-1~ppa/debian/rules pysilc-0.5/debian/rules --- pysilc-0.5-1~ppa/debian/rules 2010-01-20 10:55:11.000000000 +0000 +++ pysilc-0.5/debian/rules 2010-01-30 23:36:12.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with quilt + dh --with quilt $@ -override_dh_strip: - dh_strip --dbg-package=python-silc-dbg +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp diff -Nru pysilc-0.5-1~ppa/debian/rulese pysilc-0.5/debian/rulese --- pysilc-0.5-1~ppa/debian/rulese 2010-01-20 10:55:11.000000000 +0000 +++ pysilc-0.5/debian/rulese 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ - -override_dh_strip: - dh_strip --dbg-package=python-silc-dbg