[Python-modules-commits] r11179 - in packages/pysilc/trunk/debian (11 files)
stefanor-guest at users.alioth.debian.org
stefanor-guest at users.alioth.debian.org
Sat Jan 16 20:52:00 UTC 2010
Date: Saturday, January 16, 2010 @ 20:51:59
Author: stefanor-guest
Revision: 11179
Switch from CDBS to 3.0 Quilt
Added:
packages/pysilc/trunk/debian/patches/client_id.diff
(from rev 11174, packages/pysilc/trunk/debian/patches/20-client_id.diff)
packages/pysilc/trunk/debian/patches/fix-build.diff
(from rev 11174, packages/pysilc/trunk/debian/patches/10-fix-build.diff)
packages/pysilc/trunk/debian/patches/fix-segfaults.diff
(from rev 11174, packages/pysilc/trunk/debian/patches/30-fix-segfaults.diff)
packages/pysilc/trunk/debian/patches/series
packages/pysilc/trunk/debian/source/
packages/pysilc/trunk/debian/source/format
Modified:
packages/pysilc/trunk/debian/control
packages/pysilc/trunk/debian/rules
Deleted:
packages/pysilc/trunk/debian/patches/10-fix-build.diff
packages/pysilc/trunk/debian/patches/20-client_id.diff
packages/pysilc/trunk/debian/patches/30-fix-segfaults.diff
Modified: packages/pysilc/trunk/debian/control
===================================================================
--- packages/pysilc/trunk/debian/control 2010-01-16 18:40:12 UTC (rev 11178)
+++ packages/pysilc/trunk/debian/control 2010-01-16 20:51:59 UTC (rev 11179)
@@ -3,9 +3,12 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Stefano Rivera <stefano at rivera.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, python-all-dbg
-Standards-Version: 3.8.2
+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
Deleted: packages/pysilc/trunk/debian/patches/10-fix-build.diff
===================================================================
--- packages/pysilc/trunk/debian/patches/10-fix-build.diff 2010-01-16 18:40:12 UTC (rev 11178)
+++ packages/pysilc/trunk/debian/patches/10-fix-build.diff 2010-01-16 20:51:59 UTC (rev 11179)
@@ -1,16 +0,0 @@
-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',
-
Deleted: packages/pysilc/trunk/debian/patches/20-client_id.diff
===================================================================
--- packages/pysilc/trunk/debian/patches/20-client_id.diff 2010-01-16 18:40:12 UTC (rev 11178)
+++ packages/pysilc/trunk/debian/patches/20-client_id.diff 2010-01-16 20:51:59 UTC (rev 11179)
@@ -1,20 +0,0 @@
-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;
- }
-
-
Deleted: packages/pysilc/trunk/debian/patches/30-fix-segfaults.diff
===================================================================
--- packages/pysilc/trunk/debian/patches/30-fix-segfaults.diff 2010-01-16 18:40:12 UTC (rev 11178)
+++ packages/pysilc/trunk/debian/patches/30-fix-segfaults.diff 2010-01-16 20:51:59 UTC (rev 11179)
@@ -1,30 +0,0 @@
-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;
-
Copied: packages/pysilc/trunk/debian/patches/client_id.diff (from rev 11174, packages/pysilc/trunk/debian/patches/20-client_id.diff)
===================================================================
--- packages/pysilc/trunk/debian/patches/client_id.diff (rev 0)
+++ packages/pysilc/trunk/debian/patches/client_id.diff 2010-01-16 20:51:59 UTC (rev 11179)
@@ -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 '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
+@@ -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;
+ }
+
+
Copied: packages/pysilc/trunk/debian/patches/fix-build.diff (from rev 11174, packages/pysilc/trunk/debian/patches/10-fix-build.diff)
===================================================================
--- packages/pysilc/trunk/debian/patches/fix-build.diff (rev 0)
+++ packages/pysilc/trunk/debian/patches/fix-build.diff 2010-01-16 20:51:59 UTC (rev 11179)
@@ -0,0 +1,17 @@
+Description: libiconv isn't available or necessary on Debian.
+Author: Michael Gorven <michael at gorven.za.net>
+Last-Update: 2010-01-16
+
+=== modified file 'pysilc-0.5/setup.py'
+--- pysilc-0.5.orig/setup.py 2009-02-12 15:35:41 +0000
++++ pysilc-0.5/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',
+
Copied: packages/pysilc/trunk/debian/patches/fix-segfaults.diff (from rev 11174, packages/pysilc/trunk/debian/patches/30-fix-segfaults.diff)
===================================================================
--- packages/pysilc/trunk/debian/patches/fix-segfaults.diff (rev 0)
+++ packages/pysilc/trunk/debian/patches/fix-segfaults.diff 2010-01-16 20:51:59 UTC (rev 11179)
@@ -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 'pysilc-0.5/src/pysilc_callbacks.c'
+--- pysilc-0.5.orig/src/pysilc_callbacks.c 2009-02-12 15:35:41 +0000
++++ pysilc-0.5/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 'pysilc-0.5/src/pysilc_channel.c'
+--- pysilc-0.5.orig/src/pysilc_channel.c 2009-02-12 15:35:41 +0000
++++ pysilc-0.5/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/trunk/debian/patches/series
===================================================================
--- packages/pysilc/trunk/debian/patches/series (rev 0)
+++ packages/pysilc/trunk/debian/patches/series 2010-01-16 20:51:59 UTC (rev 11179)
@@ -0,0 +1,3 @@
+fix-build.diff
+client_id.diff
+fix-segfaults.diff
Modified: packages/pysilc/trunk/debian/rules
===================================================================
--- packages/pysilc/trunk/debian/rules 2010-01-16 18:40:12 UTC (rev 11178)
+++ packages/pysilc/trunk/debian/rules 2010-01-16 20:51:59 UTC (rev 11179)
@@ -1,28 +1,7 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM := pysupport
-PACKAGE := python-silc
+%:
+ dh $@
-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
+override_dh_strip:
+ dh_strip --dbg-package=python-silc-dbg
Added: packages/pysilc/trunk/debian/source/format
===================================================================
--- packages/pysilc/trunk/debian/source/format (rev 0)
+++ packages/pysilc/trunk/debian/source/format 2010-01-16 20:51:59 UTC (rev 11179)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Python-modules-commits
mailing list