[Pkg-telepathy-commits] ./packages/unstable/empathy r92: * Removed patches merge upstream:

[Sjoerd Simons]

------------------------------------------------------------
revno: 92
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: empathy
timestamp: Sat 2008-02-09 20:19:57 +0100
message:
  * Removed patches merge upstream:
    - debian/patches/fix-pyftbfs.patch
    - debian/patches/accounts-icons-path.patch
removed:
  patches/accounts-icons-path.patch
  patches/fix-pyftbfs.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-02-09 19:19:03 +0000
+++ b/changelog	2008-02-09 19:19:57 +0000
@@ -1,6 +1,9 @@
 empathy (0.21.90-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Removed patches merge upstream:
+    - debian/patches/fix-pyftbfs.patch
+    - debian/patches/accounts-icons-path.patch
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 09 Feb 2008 20:17:13 +0100
 

=== removed file 'patches/accounts-icons-path.patch'
--- a/patches/accounts-icons-path.patch	2008-01-16 19:45:48 +0000
+++ b/patches/accounts-icons-path.patch	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-commit d8148a90f77742490bc80dcd85df2dc2096829b1
-Author: xclaesse <xclaesse at 4ee84921-47dd-4033-b63a-18d7a039a3e4>
-Date:   Wed Jan 16 18:15:01 2008 +0000
-
-    Icon location changed, forgot to change in empathy-account program.
-    
-    
-    git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@568 4ee84921-47dd-4033-b63a-18d7a039a3e4
-
-diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
-index f5d0b1b..b619171 100644
---- a/src/empathy-accounts.c
-+++ b/src/empathy-accounts.c
-@@ -45,7 +45,7 @@ main (int argc, char *argv[])
- 	gtk_init (&argc, &argv);
- 
- 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
--					   DATADIR G_DIR_SEPARATOR_S "empathy");
-+					   PKGDATADIR G_DIR_SEPARATOR_S "icons");
- 	dialog = empathy_accounts_dialog_show (NULL);
- 
- 	g_signal_connect (dialog, "destroy",

=== removed file 'patches/fix-pyftbfs.patch'
--- a/patches/fix-pyftbfs.patch	2008-01-16 19:45:48 +0000
+++ b/patches/fix-pyftbfs.patch	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-commit 540fb713e6e3efadc8dab0c6a7544515c2d198c4
-Author: xclaesse <xclaesse at 4ee84921-47dd-4033-b63a-18d7a039a3e4>
-Date:   Wed Jan 16 19:05:23 2008 +0000
-
-    Remove not implemented and not used empathy_time_parse_format function.
-    
-    
-    git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@570 4ee84921-47dd-4033-b63a-18d7a039a3e4
-
-diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
-index 560b465..ce520cd 100644
---- a/libempathy/empathy-time.h
-+++ b/libempathy/empathy-time.h
-@@ -36,8 +36,6 @@ G_BEGIN_DECLS
- time_t  empathy_time_get_current     (void);
- time_t  empathy_time_get_local_time  (struct tm   *tm);
- time_t  empathy_time_parse           (const gchar *str);
--time_t  empathy_time_parse_format    (const gchar *str,
--				      const gchar *format);
- gchar  *empathy_time_to_string_utc   (time_t       t,
- 				      const gchar *format);
- gchar  *empathy_time_to_string_local (time_t       t,
-diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
-index 8079911..56825ab 100644
---- a/python/pyempathy/pyempathy.defs
-+++ b/python/pyempathy/pyempathy.defs
-@@ -1415,15 +1415,6 @@
-   )
- )
- 
--(define-function empathy_time_parse_format
--  (c-name "empathy_time_parse_format")
--  (return-type "time_t")
--  (parameters
--    '("const-gchar*" "str")
--    '("const-gchar*" "format")
--  )
--)
--
- (define-function empathy_time_to_string_utc
-   (c-name "empathy_time_to_string_utc")
-   (return-type "gchar*")