- rediffed, move #include <home_etc.h> to configdb.h

Changed files:
    audacious-home_etc.patch -> 1.2

diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch
index 31e21c5a62b2255ce0609ef9b442ad92d4d73340..ac2d0b15140841146de3721c6965b115fade3b09 100644 (file)
--- a/audacious-home_etc.patch
+++ b/audacious-home_etc.patch
@@ -1,26 +1,15 @@
---- bmp-0.9.7.1/audacious/Makefile.am.orig     2005-08-09 02:41:52.000000000 +0200
-+++ bmp-0.9.7.1/audacious/Makefile.am  2005-11-01 10:33:17.554845704 +0100
-@@ -11,7 +11,8 @@
-       $(GTK_LIBS)      \
-       $(LIBGLADE_LIBS) \
-       $(LTLIBINTL)     \
--      $(top_builddir)/libaudacious/libaudacious.la
-+      $(top_builddir)/libaudacious/libaudacious.la \
-+      -lhome_etc
- 
- audacious_CFLAGS = \
-       $(X_CFLAGS)        \
---- bmp-0.9.7.1/audacious/main.c.orig  2005-08-27 13:20:04.000000000 +0200
-+++ bmp-0.9.7.1/audacious/main.c       2005-11-01 10:38:05.469076088 +0100
-@@ -72,6 +72,7 @@
+diff -aurN audacious-0.1.2.orig/audacious/main.c audacious-0.1.2/audacious/main.c
+--- audacious-0.1.2.orig/audacious/main.c      2005-12-04 18:29:14.000000000 +0100
++++ audacious-0.1.2/audacious/main.c   2005-12-16 12:31:16.000000000 +0100
+@@ -77,7 +77,6 @@
  #include "pixmaps.h"
- #include "images/bmp_player.xpm"
+ #include "images/audacious_player.xpm"
  
-+#include <home_etc.h>
+-
+ /* Translatable string for beep.desktop's comment field */
+ const gchar *desktop_comment = N_("Audacious");
  
- /* Translatable string for audacious.desktop's comment field */
- const gchar *desktop_comment = N_("Beep Media Player");
-@@ -402,7 +403,7 @@
+@@ -408,7 +407,7 @@
  static void
  bmp_init_paths(void)
  {
@@ -29,21 +18,35 @@
  
      bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = USER_PATH(BMP_USER_PLUGIN_DIR_BASENAME);
      bmp_paths[BMP_PATH_USER_SKIN_DIR] = USER_PATH(BMP_SKIN_DIR_BASENAME);
---- bmp-0.9.7.1/libaudacious/Makefile.am.orig  2005-08-09 02:41:53.000000000 +0200
-+++ bmp-0.9.7.1/libaudacious/Makefile.am       2005-11-01 10:41:02.170213432 +0100
+diff -aurN audacious-0.1.2.orig/audacious/Makefile.am audacious-0.1.2/audacious/Makefile.am
+--- audacious-0.1.2.orig/audacious/Makefile.am 2005-11-16 05:21:50.000000000 +0100
++++ audacious-0.1.2/audacious/Makefile.am      2005-12-16 12:30:08.000000000 +0100
 @@ -10,7 +10,8 @@
- libaudacious_la_LIBADD = \
        $(GTK_LIBS)      \
-       $(GCONF_LIBS)    \
--      $(GNOMEVFS_LIBS)
-+      $(GNOMEVFS_LIBS) \
+       $(LIBGLADE_LIBS) \
+       $(LTLIBINTL)     \
+-      $(top_builddir)/libaudacious/libaudacious.la
++      $(top_builddir)/libaudacious/libaudacious.la \
 +      -lhome_etc
  
- INCLUDES = \
-       $(GTK_CFLAGS)        \
---- bmp-0.9.7.1/libaudacious/configdb_rcfile.c~        2005-11-01 10:30:32.056005352 +0100
-+++ bmp-0.9.7.1/libaudacious/configdb_rcfile.c 2005-11-01 10:42:07.430292392 +0100
-@@ -41,7 +41,7 @@
+ audacious_CFLAGS = \
+       $(X_CFLAGS)        \
+diff -aurN audacious-0.1.2.orig/libaudacious/configdb.h audacious-0.1.2/libaudacious/configdb.h
+--- audacious-0.1.2.orig/libaudacious/configdb.h       2005-10-24 12:06:47.000000000 +0200
++++ audacious-0.1.2/libaudacious/configdb.h    2005-12-16 12:30:48.000000000 +0100
+@@ -2,7 +2,7 @@
+ #define CONFIGDB_H
+ 
+ #include <glib.h>
+-
++#include <home_etc.h>
+ 
+ typedef struct _ConfigDb ConfigDb;
+ 
+diff -aurN audacious-0.1.2.orig/libaudacious/configdb_rcfile.c audacious-0.1.2/libaudacious/configdb_rcfile.c
+--- audacious-0.1.2.orig/libaudacious/configdb_rcfile.c        2005-10-24 12:06:47.000000000 +0200
++++ audacious-0.1.2/libaudacious/configdb_rcfile.c     2005-12-16 12:30:08.000000000 +0100
+@@ -40,7 +40,7 @@
      ConfigDb *db;
  
      db = g_new(ConfigDb, 1);
@@ -52,3 +55,16 @@
                                      "config", NULL);
      db->file = bmp_rcfile_open(db->filename);
      if (!db->file)
+diff -aurN audacious-0.1.2.orig/libaudacious/Makefile.am audacious-0.1.2/libaudacious/Makefile.am
+--- audacious-0.1.2.orig/libaudacious/Makefile.am      2005-10-24 12:06:47.000000000 +0200
++++ audacious-0.1.2/libaudacious/Makefile.am   2005-12-16 12:30:08.000000000 +0100
+@@ -10,7 +10,8 @@
+ libaudacious_la_LIBADD = \
+       $(GTK_LIBS)      \
+       $(GCONF_LIBS)    \
+-      $(GNOMEVFS_LIBS)
++      $(GNOMEVFS_LIBS) \
++      -lhome_etc
+ 
+ INCLUDES = \
+       $(GTK_CFLAGS)        \