Package: bitlbee-skype
Version: 0.8.1-0.2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpmqzITW
In Ubuntu, we've applied the attached patch to achieve the following:
* New upstream release
+ Supports bitlbee 3.0
* Added debian/watch
* Removed 01-config-files.patch as it got applied upstream.
* Added python2.7.diff to use python instead of python2.7
We thought you might be interested in doing the same.
-- System Information:
Debian Release: squeeze/sid
APT prefers maverick-updates
APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500,
'maverick-proposed'), (500, 'maverick-backports'), (500, 'maverick')
Architecture: i386 (i686)
Kernel: Linux 2.6.35-24-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru bitlbee-skype-0.8.1/debian/patches/01-config-files.patch bitlbee-skype-0.8.4/debian/patches/01-config-files.patch
--- bitlbee-skype-0.8.1/debian/patches/01-config-files.patch 2010-12-16 20:07:29.000000000 +0200
+++ bitlbee-skype-0.8.4/debian/patches/01-config-files.patch 1970-01-01 02:00:00.000000000 +0200
@@ -1,16 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' bitlbee-skype-0.7.1/skyped.conf.dist.in bitlbee-skype-0.7.1.new/skyped.conf.dist.in
---- bitlbee-skype-0.7.1/skyped.conf.dist.in 2009-02-13 14:39:38.000000000 -0800
-+++ bitlbee-skype-0.7.1.new/skyped.conf.dist.in 2009-04-02 12:25:33.000000000 -0700
-@@ -1,7 +1,10 @@
- [skyped]
-+# change to your skype username
- username = john
- # use `echo -n foo|sha1sum` to generate this hash for your password
- password = 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33
--cert = @sysconfdir@/skyped/skyped.cert.pem
--key = @sysconfdir@/skyped/skyped.key.pem
-+
-+# you have to change the following paths to your home directory:
-+cert = /home/YOUR_USER/.skyped/skyped.cert.pem
-+key = /home/YOUR_USER/.skyped/skyped.key.pem
- port = 2727
diff -Nru bitlbee-skype-0.8.1/debian/patches/python2.7.diff bitlbee-skype-0.8.4/debian/patches/python2.7.diff
--- bitlbee-skype-0.8.1/debian/patches/python2.7.diff 1970-01-01 02:00:00.000000000 +0200
+++ bitlbee-skype-0.8.4/debian/patches/python2.7.diff 2010-12-16 20:07:30.000000000 +0200
@@ -0,0 +1,21 @@
+Description: Use python instead of python2.7
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@sabily.org>
+--- a/configure
++++ b/configure
+@@ -2731,7 +2731,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python module Skype4Py" >&5
+ $as_echo_n "checking for Python module Skype4Py... " >&6; }
+-python2.7 -c "import Skype4Py" 2>&5
++python -c "import Skype4Py" 2>&5
+ if test "$?" != "0"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+--- a/skyped.py
++++ b/skyped.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.7
++#!/usr/bin/env python
+ #
+ # skyped.py
+ #
diff -Nru bitlbee-skype-0.8.1/debian/watch bitlbee-skype-0.8.4/debian/watch
--- bitlbee-skype-0.8.1/debian/watch 1970-01-01 02:00:00.000000000 +0200
+++ bitlbee-skype-0.8.4/debian/watch 2010-12-16 20:07:30.000000000 +0200
@@ -0,0 +1,2 @@
+version=3
+http://vmiklos.hu/project/bitlbee-skype/bitlbee-skype-(.*).tar.gz
