hipo r159 - in trunk: . src taglib-sharp

[bgarret svn gnome org]

Author: bgarret
Date: Wed Feb 20 19:17:54 2008
New Revision: 159
URL: http://svn.gnome.org/viewvc/hipo?rev=159&view=rev

Log:
2008-02-20  Benoit Garret  <benoit garret_gnome gadz org>

        * INSTALL: added taglib-sharp dependency
        * Makefile.am:
        * NEWS: update for the 0.6.1 release
        * configure.ac: bump version to 0.6.1
        * src/Makefile.am:
        * taglib-sharp/Makefile.am:



Removed:
   trunk/taglib-sharp/
Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/Makefile.am
   trunk/NEWS
   trunk/configure.ac
   trunk/src/Makefile.am

Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL	(original)
+++ trunk/INSTALL	Wed Feb 20 19:17:54 2008
@@ -2,3 +2,4 @@
 
 ipod-sharp 0.8.0
 podsleuth
+taglib-sharp 2.0

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Feb 20 19:17:54 2008
@@ -1,5 +1,4 @@
 SUBDIRS = 		\
-	taglib-sharp	\
 	src		\
 	po		\
 	data		\

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Feb 20 19:17:54 2008
@@ -1,3 +1,8 @@
+Hipo "We screwed up" 0.6.1
+==========================
+
+* Remove the dependency on libipoddevice
+
 Hipo "One Love" 0.6
 ===========================
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Feb 20 19:17:54 2008
@@ -1,6 +1,6 @@
 AC_INIT(src/HipoMain.cs)
 
-AM_INIT_AUTOMAKE(hipo, 0.6)
+AM_INIT_AUTOMAKE(hipo, 0.6.1)
 AM_MAINTAINER_MODE
 
 IT_PROG_INTLTOOL([0.35.0])
@@ -16,14 +16,15 @@
 GTK_SHARP_REQUIRED=2.10
 IPOD_SHARP_REQUIRED=0.8.0
 NDESK_DBUS_GLIB_REQUIRED=0.3
-
+TAGLIB_SHARP_REQUIRED=2.0
 PKG_CHECK_MODULES(HIPO, 
 		gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED \
 		gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED \
 		glade-sharp-2.0 >= $GTK_SHARP_REQUIRED \
 		ipod-sharp >= $IPOD_SHARP_REQUIRED   \
 		ipod-sharp-ui >= $IPOD_SHARP_REQUIRED \
-		ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
+		ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED	\
+		taglib-sharp >= $TAGLIB_SHARP_REQUIRED)
 
 AC_SUBST(HIPO_LIBS)
 
@@ -54,7 +55,5 @@
 src/hipo
 po/Makefile.in
 data/Makefile
-taglib-sharp/Makefile
-src/ipod-sharp.dll.config
 help/Makefile
 ])

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Feb 20 19:17:54 2008
@@ -23,7 +23,7 @@
 	$(top_srcdir)/data/hipo-logo.png \
 	$(top_srcdir)/data/ipod.gif
 
-HIPO_ASSEMBLIES = -r:Mono.Posix -pkg:gtk-sharp-2.0,gnome-sharp-2.0,glade-sharp-2.0,ipod-sharp,ipod-sharp-ui,ndesk-dbus-glib-1.0 -r:$(top_builddir)/taglib-sharp/taglib-sharp.dll
+HIPO_ASSEMBLIES = -r:Mono.Posix -pkg:gtk-sharp-2.0,gnome-sharp-2.0,glade-sharp-2.0,ipod-sharp,ipod-sharp-ui,ndesk-dbus-glib-1.0,taglib-sharp
 
 ASSEMBLY = hipo.exe
 
@@ -40,7 +40,6 @@
 	hipo.in			\
 	$(HIPO_SOURCES) 	\
 	$(HIPO_RESOURCES)	\
-	Defines.cs.in		\
-	ipod-sharp.dll.config	
+	Defines.cs.in		
 
-hipo_DATA = $(ASSEMBLY) $(IPOD_SHARP_FILES) $(HIPO_RESOURCES) ipod-sharp.dll.config
+hipo_DATA = $(ASSEMBLY) $(IPOD_SHARP_FILES) $(HIPO_RESOURCES)