[Glibc-bsd-commits] r1392 - in trunk: freebsd-libs/debian libbsd libfreebsd libfreebsd/debian

[Robert Millan]

Author: rmh
Date: 2006-03-25 20:03:00 +0000 (Sat, 25 Mar 2006)
New Revision: 1392

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/libkvm0.install
   trunk/freebsd-libs/debian/rules
   trunk/libbsd/Makefile
   trunk/libfreebsd/Makefile
   trunk/libfreebsd/debian/changelog
   trunk/libfreebsd/debian/libfreebsd0.install
Log:
Move shared object of libbsd, libfreebsd and libkvm to /lib (unfucks freebsd-utils).

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2006-03-25 20:01:40 UTC (rev 1391)
+++ trunk/freebsd-libs/debian/changelog	2006-03-25 20:03:00 UTC (rev 1392)
@@ -2,8 +2,9 @@
 
   * Add kfreebsd-amd64.
   * Add missing libgdbm-dev to Build-Depends.
+  * Move shared object so /lib (unfucks freebsd-utils).
 
- -- Robert Millan <rmh at aybabtu.com>  Sat, 25 Mar 2006 21:01:17 +0100
+ -- Robert Millan <rmh at aybabtu.com>  Sat, 25 Mar 2006 21:01:49 +0100
 
 freebsd-libs (5.4-6) unreleased; urgency=low
 

Modified: trunk/freebsd-libs/debian/libkvm0.install
===================================================================
--- trunk/freebsd-libs/debian/libkvm0.install	2006-03-25 20:01:40 UTC (rev 1391)
+++ trunk/freebsd-libs/debian/libkvm0.install	2006-03-25 20:03:00 UTC (rev 1392)
@@ -1 +1 @@
-usr/lib/libkvm*.so.*
+usr/lib/libkvm*.so.*		lib

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2006-03-25 20:01:40 UTC (rev 1391)
+++ trunk/freebsd-libs/debian/rules	2006-03-25 20:03:00 UTC (rev 1392)
@@ -81,6 +81,8 @@
 	cd $(SRC_DIR)/libcam && $(PMAKE) install
 	cd $(SRC_DIR)/libipx && $(PMAKE) install
 	cd $(SRC_DIR)/libkvm && $(PMAKE) install
+	# move libkvm.so to /lib
+	ln -sf /lib/libkvm.so.0 $(DESTDIR)/usr/lib/libkvm.so
 	cd $(SRC_DIR)/libusbhid && $(PMAKE) install
 
 	dh_install -s --list-missing --sourcedir=debian/tmp

Modified: trunk/libbsd/Makefile
===================================================================
--- trunk/libbsd/Makefile	2006-03-25 20:01:40 UTC (rev 1391)
+++ trunk/libbsd/Makefile	2006-03-25 20:03:00 UTC (rev 1392)
@@ -53,15 +53,15 @@
 	  -o $@ $^
 
 install: libs
-	mkdir -p $(DESTDIR)/usr/lib/
+	mkdir -p $(DESTDIR)/usr/lib/ $(DESTDIR)/lib/
 	mkdir -p $(DESTDIR)/usr/include/bsd/
 	mkdir -p $(DESTDIR)/usr/share/man/man3
 	install -m644 $(LIB_STATIC) $(DESTDIR)/usr/lib/
-	install -m644 $(LIB_SHARED) $(DESTDIR)/usr/lib/
+	install -m644 $(LIB_SHARED) $(DESTDIR)/lib/
 	for i in $(LIB_INCLUDES) ; do install -m644 include/$$i $(DESTDIR)/usr/include/$$i ; done
 	install -m644 $(LIB_MANS) $(DESTDIR)/usr/share/man/man3
-	cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SHARED_SO)
-	cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SONAME)
+	ln -sf /lib/$(LIB_SHARED) $(DESTDIR)/usr/lib/$(LIB_SHARED_SO)
+	ln -sf $(LIB_SHARED) $(DESTDIR)/lib/$(LIB_SONAME)
 
 clean:
 	rm -f $(LIB_STATIC_OBJS)

Modified: trunk/libfreebsd/Makefile
===================================================================
--- trunk/libfreebsd/Makefile	2006-03-25 20:01:40 UTC (rev 1391)
+++ trunk/libfreebsd/Makefile	2006-03-25 20:03:00 UTC (rev 1392)
@@ -50,16 +50,16 @@
 	  -o $@ $^
 
 install: libs
-	mkdir -p $(DESTDIR)/usr/lib/
+	mkdir -p $(DESTDIR)/usr/lib/ $(DESTDIR)/lib/
 	mkdir -p $(DESTDIR)/usr/include/freebsd/
 	mkdir -p $(DESTDIR)/usr/share/man/man3
 	install -m644 $(LIB_STATIC) $(DESTDIR)/usr/lib/
-	install -m644 $(LIB_SHARED) $(DESTDIR)/usr/lib/
+	install -m644 $(LIB_SHARED) $(DESTDIR)/lib/
 	install -m644 $(LIB_INCLUDES) $(DESTDIR)/usr/include/
 	install -m644 $(LIB_FREEBSDINCLUDES) $(DESTDIR)/usr/include/freebsd
 	install -m644 $(LIB_MANS) $(DESTDIR)/usr/share/man/man3
-	cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SHARED_SO)
-	cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SONAME)
+	ln -sf /lib/$(LIB_SHARED) $(DESTDIR)/usr/lib/$(LIB_SHARED_SO)
+	ln -sf $(LIB_SHARED) $(DESTDIR)/lib/$(LIB_SONAME)
 
 clean:
 	rm -f $(LIB_STATIC_OBJS)

Modified: trunk/libfreebsd/debian/changelog
===================================================================
--- trunk/libfreebsd/debian/changelog	2006-03-25 20:01:40 UTC (rev 1391)
+++ trunk/libfreebsd/debian/changelog	2006-03-25 20:03:00 UTC (rev 1392)
@@ -3,8 +3,9 @@
   * Add kfreebsd-amd64.
   * paths.h: Define _PATH_SYSPATH.
   * Add devname{,_r}, sysctlnametomib and sysctlbyname.
+  * Move shared object so /lib (unfucks freebsd-utils).
 
- -- Robert Millan <rmh at aybabtu.com>  Mon, 20 Mar 2006 16:54:51 +0100
+ -- Robert Millan <rmh at aybabtu.com>  Sat, 25 Mar 2006 21:00:51 +0100
 
 libfreebsd (0.0-1) unreleased; urgency=low
 

Modified: trunk/libfreebsd/debian/libfreebsd0.install
===================================================================
--- trunk/libfreebsd/debian/libfreebsd0.install	2006-03-25 20:01:40 UTC (rev 1391)
+++ trunk/libfreebsd/debian/libfreebsd0.install	2006-03-25 20:03:00 UTC (rev 1392)
@@ -1 +1 @@
-usr/lib/*.so.*
+lib/*.so.*