[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-experimental, updated. debian/3.6.0.1-1-7-g9bdfce5
Simon McVittie
smcv at debian.org
Fri Oct 19 12:26:16 UTC 2012
The following commit has been merged in the debian-experimental branch:
commit cdddb16279848c44f4eaa23bc5097648814f009b
Author: Simon McVittie <smcv at debian.org>
Date: Fri Oct 19 13:04:22 2012 +0100
New upstream stable release
* Drop all patches, applied upstream
diff --git a/debian/changelog b/debian/changelog
index b040c04..bba5f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-empathy (3.6.0.1-2) UNRELEASED; urgency=low
+empathy (3.6.1-1) UNRELEASED; urgency=low
+ [ Sjoerd Simons ]
* debian/patches/Don-t-set-the-DefaultFont-Size-Family-in-the-themes.patch
+ Added. Follow the system font settngs for the Adium themes
* debian/patches/Fix-planet-gnome-theme-when-using-a-non-default-font.patch
+ Added. Fix the planet gnome theme when using a non-default font
+ [ Simon McVittie ]
+ * New upstream stable release
+ * Drop all patches, applied upstream
+
-- Sjoerd Simons <sjoerd at debian.org> Sun, 07 Oct 2012 19:40:48 +0200
empathy (3.6.0.1-1) experimental; urgency=low
diff --git a/debian/patches/Don-t-set-the-DefaultFont-Size-Family-in-the-themes.patch b/debian/patches/Don-t-set-the-DefaultFont-Size-Family-in-the-themes.patch
deleted file mode 100644
index d3f9b0d..0000000
--- a/debian/patches/Don-t-set-the-DefaultFont-Size-Family-in-the-themes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 8a76c42bfbecd67e6f8a08650d744a0209328b45 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 7 Oct 2012 15:46:17 +0200
-Subject: [PATCH] Don't set the DefaultFont{Size,Family} in the themes
-
-For Adium themes Empathy prefers using the default font settings in a
-theme above the system font settings. So lets not set default fonts for
-the builtin themes, so these will follow the system instead.
----
- data/themes/Boxes.AdiumMessageStyle/Contents/Info.plist | 6 ------
- data/themes/Classic.AdiumMessageStyle/Contents/Info.plist | 6 ------
- data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist | 6 ------
- 3 files changed, 18 deletions(-)
-
-diff --git a/data/themes/Boxes.AdiumMessageStyle/Contents/Info.plist b/data/themes/Boxes.AdiumMessageStyle/Contents/Info.plist
-index c61a0f4..35193c4 100644
---- a/data/themes/Boxes.AdiumMessageStyle/Contents/Info.plist
-+++ b/data/themes/Boxes.AdiumMessageStyle/Contents/Info.plist
-@@ -25,12 +25,6 @@
- <key>DefaultBackgroundColor</key>
- <string>ffffff</string>
-
-- <key>DefaultFontFamily</key>
-- <string>Cantarell</string>
--
-- <key>DefaultFontSize</key>
-- <integer>12</integer>
--
- <key>MessageViewVersion</key>
- <integer>4</integer>
-
-diff --git a/data/themes/Classic.AdiumMessageStyle/Contents/Info.plist b/data/themes/Classic.AdiumMessageStyle/Contents/Info.plist
-index 35014f0..053bc9c 100644
---- a/data/themes/Classic.AdiumMessageStyle/Contents/Info.plist
-+++ b/data/themes/Classic.AdiumMessageStyle/Contents/Info.plist
-@@ -25,12 +25,6 @@
- <key>DefaultBackgroundColor</key>
- <string>ffffff</string>
-
-- <key>DefaultFontFamily</key>
-- <string>Cantarell</string>
--
-- <key>DefaultFontSize</key>
-- <integer>12</integer>
--
- <key>MessageViewVersion</key>
- <integer>4</integer>
-
-diff --git a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist
-index 45d5cc2..805d053 100644
---- a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist
-+++ b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist
-@@ -25,12 +25,6 @@
- <key>DefaultBackgroundColor</key>
- <string>ffffff</string>
-
-- <key>DefaultFontFamily</key>
-- <string>Cantarell</string>
--
-- <key>DefaultFontSize</key>
-- <integer>12</integer>
--
- <key>MessageViewVersion</key>
- <integer>4</integer>
-
---
-1.7.10.4
-
diff --git a/debian/patches/Fix-planet-gnome-theme-when-using-a-non-default-font.patch b/debian/patches/Fix-planet-gnome-theme-when-using-a-non-default-font.patch
deleted file mode 100644
index 064185f..0000000
--- a/debian/patches/Fix-planet-gnome-theme-when-using-a-non-default-font.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From de757546980efe217e084380009755181835edc5 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 7 Oct 2012 19:31:10 +0200
-Subject: [PATCH] Fix planet gnome theme when using a non-default font
-
----
- .../Contents/Resources/Incoming/Content.html | 18 ++++++++++--------
- .../Contents/Resources/main.css | 20 +++++++++++++-------
- 2 files changed, 23 insertions(+), 15 deletions(-)
-
-diff --git a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
-index 827c627..e3a5c63 100644
---- a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
-+++ b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
-@@ -4,14 +4,16 @@
- %sender%
- </div>
- <div class="post">
-- <div class="post-contents">
-- <p>
-- %message%
-- </p>
-- <div id="insert"></div>
-- </div>
-- <div class="post-footer">
-- <p>%time%</p>
-+ <div class="post-body">
-+ <div class="post-contents">
-+ <p>
-+ %message%
-+ </p>
-+ <div id="insert"></div>
-+ </div>
-+ <div class="post-footer">
-+ <p>%time%</p>
-+ </div>
- </div>
- <b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
- <b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
-diff --git a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
-index 8fe7848..a4b8183 100644
---- a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
-+++ b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
-@@ -23,10 +23,10 @@ div.person-info {
- z-index: 1;
- float: left;
- margin-top: 25px !important;
-- margin-left: -1em;
-- padding: 0 2em 0 0.5em;
-+ margin-left: -12px;
-+ padding: 0 24px 0 6px;
- left: 3px;
-- width: 6em;
-+ width: 72px;
- background: url(Images/nipple.png) top right no-repeat;
- text-align: center;
- color: #777;
-@@ -42,8 +42,8 @@ div.person-info img {
-
- div.post {
- position: relative;
-- margin-left: 6em;
-- padding: 1em;
-+ margin-left: 89px;
-+ padding: 12px;
- }
-
- b.cr {
-@@ -80,7 +80,11 @@ b.bo { bottom: 0px; left: 0px; background-position: bottom left; }
- z-index: 1;
- line-height: 120%;
- padding: 0;
-- margin: 0;
-+ margin: 0 0 2em 0;
-+}
-+
-+.post-body {
-+ min-height: 40px;
- }
-
- .post-contents p {
-@@ -95,7 +99,9 @@ b.bo { bottom: 0px; left: 0px; background-position: bottom left; }
- }
-
- .post-footer {
-- margin-top: 0.5em;
-+ position: absolute;
-+ bottom: 1em;
-+ right: 1em;
- }
-
- .post-footer p {
---
-1.7.10.4
-
diff --git a/debian/patches/nst-Link-against-libempathy.patch b/debian/patches/nst-Link-against-libempathy.patch
deleted file mode 100644
index e1ab5f1..0000000
--- a/debian/patches/nst-Link-against-libempathy.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f5486dce8dbb842ad9edfcd89db6573f9f308ab8 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 7 Oct 2012 11:21:00 +0200
-Subject: [PATCH] [nst] Link against libempathy
-
-As the nautilus-sendto-plugin uses functions from libempathy it should
-link directly against it otherwise the build fails when using
--Wl,--as-needed:
-
-.libs/empathy-nautilus-sendto.o: In function
-`dup_contact_from_individual':
-/tmp/buildd/empathy-3.6.0.1/nautilus-sendto-plugin/empathy-nautilus-sendto.c:73:
-undefined reference to `empathy_contact_dup_best_for_action'
-/tmp/buildd/empathy-3.6.0.1/nautilus-sendto-plugin/empathy-nautilus-sendto.c:78:
-undefined reference to `empathy_contact_can_do_action'
----
- nautilus-sendto-plugin/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
-index 63f8c44..171ba2e 100644
---- a/nautilus-sendto-plugin/Makefile.am
-+++ b/nautilus-sendto-plugin/Makefile.am
-@@ -16,5 +16,5 @@ libnstempathy_la_SOURCES = empathy-nautilus-sendto.c
- libnstempathy_la_LDFLAGS = -module -avoid-version
- libnstempathy_la_LIBADD = \
- $(NST_LIBS) \
-+ $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
--
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index d517d35..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-nst-Link-against-libempathy.patch
-Don-t-set-the-DefaultFont-Size-Family-in-the-themes.patch
-Fix-planet-gnome-theme-when-using-a-non-default-font.patch
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list