diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/50_skype-empathy-help-mods.patch | 46 |
2 files changed, 39 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 437edb259..fff8eec87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +empathy (2.34.0+git.20110718.8e8bf4-0ubuntu0+easton2) natty; urgency=low + + * Update debian/patches/50_skype-empathy-help-mods.patch. + + -- Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> Thu, 04 Aug 2011 10:44:28 +0100 + empathy (2.34.0+git.20110718.8e8bf4-0ubuntu0+easton1) natty; urgency=low * New upstream snapshot. diff --git a/debian/patches/50_skype-empathy-help-mods.patch b/debian/patches/50_skype-empathy-help-mods.patch index 39bb19b2c..79df73460 100644 --- a/debian/patches/50_skype-empathy-help-mods.patch +++ b/debian/patches/50_skype-empathy-help-mods.patch @@ -1,6 +1,6 @@ === added file 'help/C/account-balance.page' --- old/help/C/account-balance.page 1970-01-01 00:00:00 +0000 -+++ new/help/C/account-balance.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/account-balance.page 2011-07-25 18:40:11 +0000 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<page xmlns="http://projectmallard.org/1.0/" @@ -30,7 +30,7 @@ === added file 'help/C/account-skype.page' --- old/help/C/account-skype.page 1970-01-01 00:00:00 +0000 -+++ new/help/C/account-skype.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/account-skype.page 2011-07-25 18:40:11 +0000 @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<page xmlns="http://projectmallard.org/1.0/" @@ -79,7 +79,7 @@ === modified file 'help/C/accounts-window.page' --- old/help/C/accounts-window.page 2010-02-22 23:45:14 +0000 -+++ new/help/C/accounts-window.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/accounts-window.page 2011-07-25 18:40:11 +0000 @@ -37,13 +37,14 @@ <section id="details"> @@ -99,7 +99,7 @@ === modified file 'help/C/add-account.page' --- old/help/C/add-account.page 2010-06-18 11:50:45 +0000 -+++ new/help/C/add-account.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/add-account.page 2011-07-25 18:40:11 +0000 @@ -58,7 +58,7 @@ to add.</p> </item> @@ -112,7 +112,7 @@ === modified file 'help/C/audio-video.page' --- old/help/C/audio-video.page 2010-02-22 23:45:14 +0000 -+++ new/help/C/audio-video.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/audio-video.page 2011-07-25 18:40:11 +0000 @@ -207,6 +207,11 @@ <td><p>Yes</p></td> </tr> @@ -128,7 +128,7 @@ === added file 'help/C/block-contact.page' --- old/help/C/block-contact.page 1970-01-01 00:00:00 +0000 -+++ new/help/C/block-contact.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/block-contact.page 2011-07-25 18:40:11 +0000 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<page xmlns="http://projectmallard.org/1.0/" @@ -157,7 +157,7 @@ === modified file 'help/C/create-account.page' --- old/help/C/create-account.page 2010-06-18 11:50:45 +0000 -+++ new/help/C/create-account.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/create-account.page 2011-07-25 18:40:11 +0000 @@ -148,6 +148,11 @@ </item> <item> @@ -173,7 +173,7 @@ === modified file 'help/C/disable-account.page' --- old/help/C/disable-account.page 2010-02-22 23:45:14 +0000 -+++ new/help/C/disable-account.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/disable-account.page 2011-07-25 18:40:11 +0000 @@ -38,10 +38,9 @@ <title>Disable an account</title> @@ -211,7 +211,7 @@ === modified file 'help/C/geolocation.page' --- old/help/C/geolocation.page 2010-02-22 23:45:14 +0000 -+++ new/help/C/geolocation.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/geolocation.page 2011-07-25 18:40:11 +0000 @@ -4,7 +4,7 @@ id="geolocation"> @@ -224,7 +224,7 @@ === modified file 'help/C/index.page' --- old/help/C/index.page 2010-09-14 13:05:00 +0000 -+++ new/help/C/index.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/index.page 2011-07-25 18:40:11 +0000 @@ -47,8 +47,8 @@ <title>Audio and Video Conversations</title> </section> @@ -239,7 +239,7 @@ === modified file 'help/C/prev-conv.page' --- old/help/C/prev-conv.page 2010-02-22 23:45:14 +0000 -+++ new/help/C/prev-conv.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/prev-conv.page 2011-07-25 18:40:11 +0000 @@ -4,8 +4,8 @@ id="prev-conv"> @@ -404,7 +404,7 @@ === modified file 'help/C/send-file.page' --- old/help/C/send-file.page 2010-02-22 23:45:14 +0000 -+++ new/help/C/send-file.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/send-file.page 2011-07-25 18:40:11 +0000 @@ -4,7 +4,7 @@ id="send-file"> @@ -417,7 +417,7 @@ === modified file 'help/C/share-desktop.page' --- old/help/C/share-desktop.page 2010-02-22 23:45:14 +0000 -+++ new/help/C/share-desktop.page 2011-07-11 17:45:15 +0000 ++++ new/help/C/share-desktop.page 2011-07-25 18:40:11 +0000 @@ -3,7 +3,7 @@ id="share-desktop"> @@ -428,3 +428,23 @@ Share the desktop with your contacts. </desc> +=== modified file 'help/Makefile.am' +--- old/help/Makefile.am 2010-09-27 10:21:30 +0000 ++++ new/help/Makefile.am 2011-07-25 18:42:54 +0000 +@@ -16,12 +16,15 @@ + + DOC_PAGES = \ + account-irc.page \ ++ account-balance.page \ + account-jabber.page \ ++ account-skype.page \ + accounts-window.page \ + add-account.page \ + add-contact.page \ + audio-call.page \ + audio-video.page \ ++ block-contact.page \ + change-status.page \ + create-account.page \ + disable-account.page \ + |