Control: tags -1 + patch
<#secure method=pgpmime mode=sign>
❦ 16 juin 2015 12:42 +0200, Vincent Bernat <[email protected]> :
> Upstream now supports the web version of Skype. It is quite convenient
> as it doesn't require to have Skype running anymore. Moreover, it also
> works with the new-style chat.
Here is a proposed debdiff.
diff --git a/debian/changelog b/debian/changelog
index 6baffe31f39b..3af17a096732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pidgin-skype (20151008+git256e64d+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot.
+ + Remove 03emblems patch, upstreamed.
+ * Enable skypeweb plugin. Closes: #788922, #795420.
+
+ -- Vincent Bernat <[email protected]> Fri, 06 Nov 2015 14:15:29 +0100
+
pidgin-skype (20140930+svn665+dfsg-1) unstable; urgency=medium
* New upstream snapshot.
diff --git a/debian/control b/debian/control
index dfc5bf92fd2c..af77404c4bcc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,14 @@ Source: pidgin-skype
Section: contrib/net
Priority: optional
Maintainer: Gabriele Giacone <[email protected]>
-Build-Depends: debhelper (>= 9), libglib2.0-dev,
- libpurple-dev (>= 2.1.1), libx11-dev, librsvg2-bin, libdbus-1-dev, pkg-config
+Build-Depends: debhelper (>= 9),
+ libglib2.0-dev,
+ libpurple-dev (>= 2.1.1),
+ libx11-dev,
+ librsvg2-bin,
+ libdbus-1-dev,
+ pkg-config,
+ libjson-glib-dev
Standards-Version: 3.9.5
Homepage: http://eion.robbmob.com/
Vcs-Git: git://anonscm.debian.org/collab-maint/pidgin-skype.git
diff --git a/debian/patches/03emblems b/debian/patches/03emblems
deleted file mode 100644
index f239a4eb4be5..000000000000
--- a/debian/patches/03emblems
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Display voice icon if contact has call equipment.
-Author: Gabriele Giacone <[email protected]>
-Forwarded: https://code.google.com/p/skype4pidgin/issues/detail?id=207
-
---- a/libskype.c
-+++ b/libskype.c
-@@ -424,6 +424,8 @@ plugin_init(PurplePlugin *plugin)
-
- option = purple_account_option_bool_new(_("Show SkypeOut contacts as 'Online'"), "skypeout_online", TRUE);
- prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-+ option = purple_account_option_bool_new(_("Show Voice/Video emblems if contact is Voice/Video capable"), "voicevideoemblems", TRUE);
-+ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
- option = purple_account_option_bool_new(_("Make Skype online/offline when going online/offline"), "skype_sync", TRUE);
- prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
- //option = purple_account_option_bool_new(_("Automatically check for updates"), "check_for_updates", TRUE);
-@@ -1190,6 +1192,7 @@ skype_set_buddies(PurpleAccount *acct)
- purple_prpl_got_user_status(acct, buddy->name, full_friends_list[i+5], NULL);
- }
- skype_send_message_nowait("GET USER %s IS_VIDEO_CAPABLE", buddy->name);
-+ skype_send_message_nowait("GET USER %s HASCALLEQUIPMENT", buddy->name);
- }
- g_strfreev(full_friends_list);
- skype_put_buddies_in_groups();
-@@ -1554,9 +1557,11 @@ skype_list_emblem(PurpleBuddy *buddy)
- return "birthday";
- }
- }
-- if (sbuddy->is_video_capable)
-- {
-- return "video";
-+ if (purple_account_get_bool(buddy->account, "voicevideoemblems", TRUE)) {
-+ if (sbuddy->is_video_capable)
-+ return "video";
-+ if (sbuddy->has_call_equipment)
-+ return "voice";
- }
- }
- return NULL;
-@@ -1589,6 +1594,7 @@ skype_update_buddy_status(PurpleBuddy *b
- skype_send_message_nowait("GET USER %s MOOD_TEXT", buddy->name);
- skype_send_message_nowait("GET USER %s RICH_MOOD_TEXT", buddy->name);
- skype_send_message_nowait("GET USER %s IS_VIDEO_CAPABLE", buddy->name);
-+ skype_send_message_nowait("GET USER %s HASCALLEQUIPMENT", buddy->name);
-
- /* if this function was called from another thread, don't loop over it */
- return FALSE;
-@@ -2123,6 +2129,7 @@ skype_buddy_new(PurpleBuddy *buddy)
- {
- skype_send_message_nowait("GET USER %s ONLINESTATUS", buddy->name);
- skype_send_message_nowait("GET USER %s IS_VIDEO_CAPABLE", buddy->name);
-+ skype_send_message_nowait("GET USER %s HASCALLEQUIPMENT", buddy->name);
- }
- return newbuddy;
- }
diff --git a/debian/patches/series b/debian/patches/series
index dde5b431499c..c323fefe7377 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01hardening
02nowarn
-03emblems
diff --git a/debian/pidgin-skype-common.install b/debian/pidgin-skype-common.install
index 17c37f132082..d0ec37990e41 100644
--- a/debian/pidgin-skype-common.install
+++ b/debian/pidgin-skype-common.install
@@ -1,5 +1,7 @@
libskype.so /usr/lib/purple-2
libskype_dbus.so /usr/lib/purple-2
+skypeweb/libskypeweb.so /usr/lib/purple-2
+
debian/icons/16/skype.png /usr/share/pidgin-skype-common/icons/16
debian/icons/16/skypeout.png /usr/share/pidgin-skype-common/icons/16
debian/icons/22/skype.png /usr/share/pidgin-skype-common/icons/22
diff --git a/debian/rules b/debian/rules
index dbeb0d467f08..8092ada0c5b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ DESTDIR = $(CURDIR)/debian/tmp
override_dh_auto_build:
$(MAKE) all
+ $(MAKE) -C skypeweb all
override_dh_auto_install:
for i in 16 22 48; do \
@@ -36,10 +37,11 @@ override_dh_builddeb:
TMPDIR=tmp-pidgin-skype
get-orig-source:
- @echo date=$(date) svnrev=$(svnrev)
- @if [ "$(date)" = "" ] || [ "$(svnrev)" = "" ];then echo \
- "Usage: debian/rules date=YYYYMMDD svnrev=nnnn get-orig-source";exit 1;fi
- svn export -r $(svnrev) http://skype4pidgin.googlecode.com/svn/trunk/ $(TMPDIR)
+ @echo date=$(date) hash=$(commit)
+ @if [ "$(date)" = "" ] || [ "$(commit)" = "" ];then echo \
+ "Usage: debian/rules date=YYYYMMDD commit=nnnn get-orig-source";exit 1;fi
+ @mkdir -p $(TMPDIR)
+ wget -O - https://github.com/EionRobb/skype4pidgin/archive/256e64d.tar.gz | tar -C $(TMPDIR) --strip-components=1 -zxf -
find $(TMPDIR) -type f -name '*.png' -print -delete
- cd $(TMPDIR) && tar --exclude-vcs -Jcf ../../pidgin-skype_$(date)+svn$(svnrev)+dfsg.orig.tar.xz *
+ cd $(TMPDIR) && tar --exclude-vcs -Jcf ../../pidgin-skype_$(date)+git$(commit)+dfsg.orig.tar.xz *
rm -rf $(TMPDIR)
--
Use the "telephone test" for readability.
- The Elements of Programming Style (Kernighan & Plauger)
