banshee r4431 - in trunk/banshee: . build/pkg-config

[abock svn gnome org]

Author: abock
Date: Tue Aug 26 19:09:21 2008
New Revision: 4431
URL: http://svn.gnome.org/viewvc/banshee?rev=4431&view=rev

Log:
2008-08-25  Aaron Bockover  <abock gnome org>

    * build/pkg-config/Makefile.am:
    * build/pkg-config/*.pc.in: Use @libdir@ to make sure the .pc file
    work on 64 bit (lib64)
    
    * configure.ac: Bump version



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/pkg-config/Makefile.am
   trunk/banshee/build/pkg-config/banshee-1-core.pc.in
   trunk/banshee/build/pkg-config/banshee-1-hyena-gui.pc.in
   trunk/banshee/build/pkg-config/banshee-1-hyena.pc.in
   trunk/banshee/build/pkg-config/banshee-1-lastfm-gui.pc.in
   trunk/banshee/build/pkg-config/banshee-1-lastfm.pc.in
   trunk/banshee/build/pkg-config/banshee-1-mono-media.pc.in
   trunk/banshee/build/pkg-config/banshee-1-musicbrainz.pc.in
   trunk/banshee/build/pkg-config/banshee-1-services.pc.in
   trunk/banshee/build/pkg-config/banshee-1-thickclient.pc.in
   trunk/banshee/configure.ac

Modified: trunk/banshee/build/pkg-config/Makefile.am
==============================================================================
--- trunk/banshee/build/pkg-config/Makefile.am	(original)
+++ trunk/banshee/build/pkg-config/Makefile.am	Tue Aug 26 19:09:21 2008
@@ -3,7 +3,7 @@
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 
 %.pc: %.pc.in
-	sed "s,\ VERSION\@,$(VERSION),g; s,\ prefix\@,$(prefix),g" < $< > $@
+	sed "s,\ VERSION\@,$(VERSION),g; s,\ prefix\@,$(prefix),g; s,\ libdir\@,$(libdir),g" < $< > $@
 
 EXTRA_DIST = $(pkgconfig_in_files)
 

Modified: trunk/banshee/build/pkg-config/banshee-1-core.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-core.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-core.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee Core

Modified: trunk/banshee/build/pkg-config/banshee-1-hyena-gui.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-hyena-gui.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-hyena-gui.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee Hyena GUI

Modified: trunk/banshee/build/pkg-config/banshee-1-hyena.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-hyena.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-hyena.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee Hyena

Modified: trunk/banshee/build/pkg-config/banshee-1-lastfm-gui.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-lastfm-gui.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-lastfm-gui.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee Last.fm GUI

Modified: trunk/banshee/build/pkg-config/banshee-1-lastfm.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-lastfm.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-lastfm.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee Last.fm

Modified: trunk/banshee/build/pkg-config/banshee-1-mono-media.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-mono-media.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-mono-media.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee Mono.Media

Modified: trunk/banshee/build/pkg-config/banshee-1-musicbrainz.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-musicbrainz.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-musicbrainz.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee MusicBrainz

Modified: trunk/banshee/build/pkg-config/banshee-1-services.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-services.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-services.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee Services

Modified: trunk/banshee/build/pkg-config/banshee-1-thickclient.pc.in
==============================================================================
--- trunk/banshee/build/pkg-config/banshee-1-thickclient.pc.in	(original)
+++ trunk/banshee/build/pkg-config/banshee-1-thickclient.pc.in	Tue Aug 26 19:09:21 2008
@@ -1,6 +1,6 @@
 prefix= prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir= libdir@
 bansheedir=${libdir}/banshee-1
 
 Name: Banshee ThickClient

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Tue Aug 26 19:09:21 2008
@@ -1,7 +1,7 @@
 dnl Automake setup
 
-AC_INIT([banshee-1], [1.2.1]) 
-ASM_DISPLAY_VERSION="1.2.1"
+AC_INIT([banshee-1], [1.2.2]) 
+ASM_DISPLAY_VERSION="1.2.2"
 DEVEL_BUILD=yes
 
 AC_CANONICAL_SYSTEM