Changed uclibc-gcc to uclibc-toolchain. Added fixups for changes

in the Makefiles.

debian/control

@@ -23,10 +23,12 @@ Description: A small implementation of the C library
  much smaller than glibc, which makes it useful for embedded
  systems.
 
-Package: uclibc-gcc
+Package: uclibc-toolchain
 Section: devel
 Architecture: any
 Depends: gcc|c-compiler, binutils, ${shlibs:Depends}
+Conflicts: uclibc-gcc
+Replaces: uclibc-gcc
 Description: A compiler wrapper for uClibc
  This is a small wrapper for gcc, ld, and other toolchain utilities
  to do compilation against uClibc instead of the native libc.

debian/control.in

@@ -23,10 +23,12 @@ Description: A small implementation of the C library
  much smaller than glibc, which makes it useful for embedded
  systems.
 
-Package: uclibc_TARGET_-gcc
+Package: uclibc_TARGET_-toolchain
 Section: devel
 Architecture: any
 Depends: gcc|c-compiler, binutils, ${shlibs:Depends}
+Conflicts: uclibc_TARGET_-gcc
+Replaces: uclibc_TARGET_-gcc
 Description: A compiler wrapper for uClibc
  This is a small wrapper for gcc, ld, and other toolchain utilities
  to do compilation against uClibc instead of the native libc.

debian/rules

@@ -104,6 +104,13 @@ ifeq ($(target),$(DEB_HOST_GNU_CPU))
 	  debian/$(p_lib)/lib/ld-uClibc.so.0
 endif
 endif
+	
+	install -d debian/$(p_gcc)/usr/bin
+	mv debian/$(p_gcc)/usr/$(target)-linux-uclibc/bin/$(target)-* \
+		debian/$(p_gcc)/usr/bin
+	install -d debian/$(p_lib)/usr/bin
+	mv debian/$(p_lib)/usr/$(target)-linux-uclibc/bin/$(target)-* \
+		debian/$(p_lib)/usr/bin
 
 # Build architecture-independent files here.
 binary-indep: