- merged 1.4.0 from DEVEL

Changed files:
    audacious-desktop.patch -> 1.7
    audacious-home_etc.patch -> 1.5

diff --git a/audacious-desktop.patch b/audacious-desktop.patch
index c6173c7c06a50b7071581cb133fca41959db5168..701c2106faaac84bbf286c146340b32a00a919bf 100644 (file)
--- a/audacious-desktop.patch
+++ b/audacious-desktop.patch
@@ -1,8 +1,10 @@
-diff -urN audacious-1.2.2/src/audacious/audacious.desktop.in audacious-1.2.2.new/src/audacious/audacious.desktop.in
---- audacious-1.2.2/src/audacious/audacious.desktop.in 2006-11-16 20:46:06.000000000 +0100
-+++ audacious-1.2.2.new/src/audacious/audacious.desktop.in     2006-11-19 13:55:33.000000000 +0100
-@@ -2,10 +2,11 @@
+--- audacious-1.4.0-beta1/audacious.desktop    2007-10-15 08:13:41.000000000 +0000
++++ audacious-1.4.0-beta1/audacious.desktop    2007-10-15 19:12:40.000000000 +0000
+@@ -1,12 +1,14 @@
+ [Desktop Entry]
  Name=Audacious
+ GenericName=Audio Player
++GenericName[pl]=Odtwarzacz muzyki
  Comment=Play music
  Comment[hu]=Zene lejátszása
 +Comment[pl]=Odtwarzacz muzyki

diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch
index 383fe576daf7e3e46892b879c59bddc5b9362c73..0d2702c3a965680cc679feb48d074b6f160b71c6 100644 (file)
--- a/audacious-home_etc.patch
+++ b/audacious-home_etc.patch
@@ -1,15 +1,17 @@
---- audacious-1.3.0/src/audacious/Makefile     2007-01-26 18:58:10.000000000 +0100
-+++ audacious-1.3.0/src/audacious/Makefile     2007-01-26 18:59:45.000000000 +0100
-@@ -15,6 +15,7 @@
-       $(GTK_LIBS) \
-       $(LIBGLADE_LIBS) \
-       $(REGEX_LIBS) \
-+      -lhome_etc \
-       ./widgets/libwidgets.a
+--- audacious-1.4.0/src/audacious/Makefile     2007-01-26 18:58:10.000000000 +0100
++++ audacious-1.4.0/src/audacious/Makefile     2007-01-26 18:59:45.000000000 +0100
+@@ -189,7 +189,8 @@
+       ${MOWGLI_LIBS}          \
+       ${LIBMCS_LIBS}          \
+       ${LIBGLADE_LIBS}        \
+-      ${REGEX_LIBS}
++      ${REGEX_LIBS}           \
++      -lhome_etc
+ 
+ LDFLAGS += ${PROG_IMPLIB_LDFLAGS}
  
- CFLAGS += \
---- audacious-1.3.0/src/libaudacious/configdb.h        2007-01-26 18:58:10.000000000 +0100
-+++ audacious-1.3.0/src/libaudacious/configdb.h        2007-01-26 19:01:51.000000000 +0100
+--- audacious-1.3.0/src/audacious/configdb.h   2007-01-26 18:58:10.000000000 +0100
++++ audacious-1.3.0/src/audacious/configdb.h   2007-01-26 19:01:51.000000000 +0100
 @@ -2,6 +2,7 @@
  #define CONFIGDB_H
  
@@ -18,18 +20,6 @@
  
  /**
   * ConfigDb:
---- audacious-1.3.0/src/libaudacious/Makefile  2007-01-23 19:22:32.000000000 +0100
-+++ audacious-1.3.0/src/libaudacious/Makefile  2007-01-26 19:03:46.000000000 +0100
-@@ -9,7 +9,8 @@
- LIBADD = \
-       $(GTK_LIBS) \
-       $(GCONF_LIBS) \
--      $(LIBMCS_LIBS)
-+      $(LIBMCS_LIBS) \
-+      -lhome_etc
- 
- CFLAGS += $(PICFLAGS) \
-       $(GTK_CFLAGS) \
 --- audacious-1.3.0/src/audacious/main.c       2007-01-23 03:21:22.000000000 +0100
 +++ audacious-1.3.0/src/audacious/main.c       2007-01-26 19:08:25.000000000 +0100
 @@ -490,13 +490,13 @@