jhbuild r1892 - in trunk: . modulesets patches

[fcrozat svn gnome org]

Author: fcrozat
Date: Tue Feb 12 13:57:03 2008
New Revision: 1892
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1892&view=rev

Log:
2008-02-12  Frederic Crozat  <fcrozat mandriva com>

        * modulesets/gnome-external-deps-2.22.modules:
        * patches/libvolume_id_Makefile.patch:
        hal 0.5.10 requires udev >= 111.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-external-deps-2.22.modules
   trunk/patches/libvolume_id_Makefile.patch

Modified: trunk/modulesets/gnome-external-deps-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.22.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.22.modules	Tue Feb 12 13:57:03 2008
@@ -342,8 +342,8 @@
                  makeargs="EXTRAS=extras/volume_id prefix=${prefix} libdir=${libdir}"
                  makeinstallargs="-C extras/volume_id prefix=${prefix} libdir=${libdir} install-bin install-man">
     <branch repo="kernel.org"
-	    module="utils/kernel/hotplug/udev-105.tar.bz2" version="105"
-	    size="187920" md5sum="e789686432bfdcb6ec23661b111364fa">
+	    module="utils/kernel/hotplug/udev-111.tar.bz2" version="111"
+	    size="190020" md5sum="bd2a94e3ed243e6a3d501a5c8afc4b54">
       <patch file="libvolume_id_Makefile.patch" strip="1"/>
     </branch>
   </autotools>

Modified: trunk/patches/libvolume_id_Makefile.patch
==============================================================================
--- trunk/patches/libvolume_id_Makefile.patch	(original)
+++ trunk/patches/libvolume_id_Makefile.patch	Tue Feb 12 13:57:03 2008
@@ -1,16 +1,5 @@
---- udev-100/extras/volume_id/Makefile-	2006-09-23 11:52:33.000000000 -0400
-+++ udev-100/extras/volume_id/Makefile	2006-09-23 11:53:04.000000000 -0400
-@@ -15,7 +15,7 @@
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
- libudevdir =	${prefix}/lib/udev
--mandir =	${prefix}/usr/share/man
-+mandir =	${prefix}/share/man
- configdir =	${etcdir}/udev/
- 
- INSTALL = /usr/bin/install -c
---- udev-100/extras/volume_id/lib/Makefile-	2006-09-23 11:58:47.000000000 -0400
-+++ udev-100/extras/volume_id/lib/Makefile	2006-09-23 11:59:23.000000000 -0400
+--- udev-111/extras/volume_id/lib/Makefile.orig	2007-05-10 12:42:56.000000000 +0200
++++ udev-111/extras/volume_id/lib/Makefile	2008-02-12 14:47:26.000000000 +0100
 @@ -4,7 +4,7 @@
  #
  # Released under the GNU General Public License, version 2.
@@ -20,17 +9,16 @@
  libdir =	${prefix}/lib
  usrlibdir =	${prefix}/usr/lib
  
-@@ -102,16 +102,16 @@
+@@ -103,16 +103,16 @@ libvolume_id.pc:
  
  install: all
  	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
--	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
+-	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
 +	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(libdir)/libvolume_id.a
- 	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
--	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+ 	mkdir -p $(DESTDIR)$(usrlibdir)/
+ 	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
 -	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
 -	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
-+	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
 +	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so
 +	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(libdir)/pkgconfig/libvolume_id.pc
  .PHONY: install
@@ -42,3 +30,14 @@
  	rm -f $(DESTDIR)$(libdir)/$(SHLIB)
  	rm -f $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
  	rm -f $(DESTDIR)$(libdir)/libvolume_id.so
+--- udev-111/extras/volume_id/Makefile.orig	2007-05-10 12:42:56.000000000 +0200
++++ udev-111/extras/volume_id/Makefile	2008-02-12 14:41:53.000000000 +0100
+@@ -15,7 +15,7 @@ sbindir =	${prefix}/sbin
+ usrbindir =	${prefix}/usr/bin
+ usrsbindir =	${prefix}/usr/sbin
+ libudevdir =	${prefix}/lib/udev
+-mandir =	${prefix}/usr/share/man
++mandir =	${prefix}/share/man
+ configdir =	${etcdir}/udev/
+ 
+ INSTALL = install -c