diff -Nru adium-theme-ubuntu-0.3.4/debian/changelog adium-theme-ubuntu-0.3.4/debian/changelog --- adium-theme-ubuntu-0.3.4/debian/changelog 2016-04-25 08:17:17.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/changelog 2016-04-25 08:08:00.000000000 +0000 @@ -1,3 +1,13 @@ +adium-theme-ubuntu (0.3.4-0ubuntu2) yakkety; urgency=medium + + * Non-maintainer upload. + * Switch to 3.0 (quilt) source package format. + * Update the theme to work with recent Empathy (LP: #1235472). + * Use dh-python, update Standards-Version. + * Patch setup.py to install things into the right places. + + -- Andrew Shadura Mon, 11 Apr 2016 10:53:43 +0200 + adium-theme-ubuntu (0.3.4-0ubuntu1) trusty; urgency=medium * Fix for automatic scrolling to new messages broken with newer diff -Nru adium-theme-ubuntu-0.3.4/debian/control adium-theme-ubuntu-0.3.4/debian/control --- adium-theme-ubuntu-0.3.4/debian/control 2016-04-25 08:17:17.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/control 2016-04-25 08:07:48.000000000 +0000 @@ -2,16 +2,23 @@ Section: gnome Priority: extra Maintainer: Ubuntu Artwork Team -Build-Depends: debhelper (>= 7), python -Build-Depends-Indep: python-distutils-extra -Standards-Version: 3.9.2 +Build-Depends: + debhelper (>= 9), + dh-python, + python-setuptools (>= 0.6.24), + python-all (>= 2.6.6-3), + python-distutils-extra +Standards-Version: 3.9.7 XS-Python-Version: current Homepage: http://launchpad.net/adium-theme-ubuntu Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/adium-theme-ubuntu/ubuntu Package: adium-theme-ubuntu Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${python:Depends}, + ${misc:Depends} Description: Adium message style for Ubuntu Adium message style for Ubuntu, to be used in an instant messenger that supports Adium message styles, such as Empathy. diff -Nru adium-theme-ubuntu-0.3.4/debian/patches/0001-Provide-appendMessageNoScroll-and-appendNextMessageN.patch adium-theme-ubuntu-0.3.4/debian/patches/0001-Provide-appendMessageNoScroll-and-appendNextMessageN.patch --- adium-theme-ubuntu-0.3.4/debian/patches/0001-Provide-appendMessageNoScroll-and-appendNextMessageN.patch 1970-01-01 00:00:00.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/patches/0001-Provide-appendMessageNoScroll-and-appendNextMessageN.patch 2016-04-25 08:07:48.000000000 +0000 @@ -0,0 +1,45 @@ +From b532f9177722d38c531cf04356f8541319a3690a Mon Sep 17 00:00:00 2001 +From: Andrew Shadura +Date: Wed, 6 Apr 2016 20:41:08 +0200 +Subject: [PATCH] Provide appendMessageNoScroll() and + appendNextMessageNoScroll(). + +These two functions are required by Empathy. Not having them causes failures +when the first message is about to be displayed. +--- + ubuntu.AdiumMessageStyle/Contents/Resources/Template.html | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Template.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Template.html +index 8a64e3e..02cb208 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Template.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Template.html +@@ -33,6 +33,12 @@ + function appendMessage(html) { + var shouldScroll = nearBottom(); + ++ appendMessageNoScroll(html, shouldScroll); ++ } ++ ++ function appendMessageNoScroll(html, shouldScroll) { ++ shouldScroll = shouldScroll || false; ++ + //Remove any existing insertion point + var insert = document.getElementById("insert"); + +@@ -65,6 +71,12 @@ + function appendNextMessage(html){ + var shouldScroll = nearBottom(); + ++ appendNextMessageNoScroll(html, shouldScroll); ++ } ++ ++ function appendNextMessageNoScroll(html, shouldScroll){ ++ shouldScroll = shouldScroll || false; ++ + //Locate the insertion point + var insert = document.getElementById("insert"); + +-- +2.5.0 + diff -Nru adium-theme-ubuntu-0.3.4/debian/patches/0002-Add-prepend-elements.patch adium-theme-ubuntu-0.3.4/debian/patches/0002-Add-prepend-elements.patch --- adium-theme-ubuntu-0.3.4/debian/patches/0002-Add-prepend-elements.patch 1970-01-01 00:00:00.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/patches/0002-Add-prepend-elements.patch 2016-04-25 08:07:48.000000000 +0000 @@ -0,0 +1,105 @@ +From ced627ea749c8788b46f4207bb0a16348a87b5ee Mon Sep 17 00:00:00 2001 +From: Andrew Shadura +Date: Thu, 7 Apr 2016 14:42:46 +0200 +Subject: [PATCH] Add #prepend elements. + +--- + ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html | 1 + + ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html | 1 + + ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html | 1 + + ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html | 1 + + ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html | 1 + + ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html | 1 + + ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html | 1 + + ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html | 1 + + 8 files changed, 8 insertions(+) + +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html +index ccada1d..995570a 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html +@@ -13,6 +13,7 @@ + + +
%sender% %time{%X}%
++ + %message% + + +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html +index 16c242e..e929d6b 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html +@@ -14,6 +14,7 @@ + +
%sender% %time{%x %X}% +
++ + %message% + + +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html +index bfff568..7787a41 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html +@@ -1,4 +1,5 @@ +
++ +
+
+ +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html +index 3fef1ef..ff197f2 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html +@@ -1,3 +1,4 @@ ++ +
+
+ +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html +index da841a4..77c8901 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html +@@ -13,6 +13,7 @@ + + +
%sender% %time{%X}%
++ + %message% + + +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html +index 8d83abf..23d44a7 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html +@@ -14,6 +14,7 @@ + +
%sender% %time{%x %X}% +
++ + %message% + + +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html +index 9cc2b55..a95f69b 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html +@@ -1,4 +1,5 @@ +
++ +
+
+ %message% +diff --git a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html +index 5be8be1..c924453 100644 +--- a/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html ++++ b/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html +@@ -1,3 +1,4 @@ ++ +
+
+ %message% +-- +2.5.0 + diff -Nru adium-theme-ubuntu-0.3.4/debian/patches/0003-Fix-setup-py.patch adium-theme-ubuntu-0.3.4/debian/patches/0003-Fix-setup-py.patch --- adium-theme-ubuntu-0.3.4/debian/patches/0003-Fix-setup-py.patch 1970-01-01 00:00:00.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/patches/0003-Fix-setup-py.patch 2016-04-25 08:07:48.000000000 +0000 @@ -0,0 +1,19 @@ +From: Andrew Shadura +Date: Thu, 7 Apr 2016 15:27:11 +0200 +Subject: Update setup.py to install things into the right places. + +--- a/setup.py ++++ b/setup.py +@@ -9,10 +9,8 @@ + glob.glob('ubuntu.AdiumMessageStyle/Contents/Info.plist')), + ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources', + glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/*.*')), +- ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/balloons', +- glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/balloons/*.*')), +- ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/corners', +- glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/corners/*.*')), ++ ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/Variants', ++ glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/Variants/*.*')), + ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/images', + glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/images/*.*')), + ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming', diff -Nru adium-theme-ubuntu-0.3.4/debian/patches/series adium-theme-ubuntu-0.3.4/debian/patches/series --- adium-theme-ubuntu-0.3.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/patches/series 2016-04-25 08:07:48.000000000 +0000 @@ -0,0 +1,3 @@ +0001-Provide-appendMessageNoScroll-and-appendNextMessageN.patch +0002-Add-prepend-elements.patch +0003-Fix-setup-py.patch diff -Nru adium-theme-ubuntu-0.3.4/debian/rules adium-theme-ubuntu-0.3.4/debian/rules --- adium-theme-ubuntu-0.3.4/debian/rules 2016-04-25 08:17:17.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/rules 2016-04-25 08:07:48.000000000 +0000 @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --with python2 + dh $@ --with python2 --buildsystem=pybuild diff -Nru adium-theme-ubuntu-0.3.4/debian/source/format adium-theme-ubuntu-0.3.4/debian/source/format --- adium-theme-ubuntu-0.3.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/debian/source/format 2016-04-25 08:07:48.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru adium-theme-ubuntu-0.3.4/PKG-INFO adium-theme-ubuntu-0.3.4/PKG-INFO --- adium-theme-ubuntu-0.3.4/PKG-INFO 2016-04-25 08:17:17.000000000 +0000 +++ adium-theme-ubuntu-0.3.4/PKG-INFO 2014-02-25 14:24:50.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: adium-theme-ubuntu -Version: 0.3.2 +Version: 0.3.4 Summary: UNKNOWN Home-page: UNKNOWN Author: UNKNOWN