Fix: libuclibc-dev should depend on libuclibc0. Elaborated descriptions.

2 files changed, 36 insertions, 14 deletions

diff --git a/debian/control b/debian/control
index 5f84564b5..63c11451b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,17 @@ Section: devel
 Priority: optional
 Maintainer: David Schleef <ds@schleef.org>
 Build-Depends: debhelper, kernel-headers-2.4
-Standards-Version: 3.5.2
+Standards-Version: 3.5.6
 
 Package: libuclibc-dev
 Section: devel
 Architecture: i386 powerpc mipsel sh m68k arm
-Depends: ${shlibs:Depends}
+Depends: libuclibc0 (= ${Source-Version}), ${shlibs:Depends}
 Description: A small implementation of the C library
  uClibc is an implementation of the standard C library that is
  much smaller than glibc, which makes it useful for embedded
- systems.
+ systems.  This package includes header files and development
+ libraries necessary to compile applications that use uClibc.
 
 Package: libuclibc0
 Section: libs
@@ -20,16 +21,26 @@ Architecture: i386 powerpc mipsel sh m68k arm
 Description: A small implementation of the C library
  uClibc is an implementation of the standard C library that is
  much smaller than glibc, which makes it useful for embedded
- systems.
+ systems.  This package provides only the run-time libraries.
+ .
+ The Debian binary packages for uClibc do not provide the necessary
+ components for using uClibc as the primary library on a system,
+ as might be done for an embedded system.
 
 Package: uclibc-toolchain
 Section: devel
 Architecture: i386 powerpc mipsel sh m68k arm
 Depends: gcc|c-compiler, binutils, ${shlibs:Depends}
+Recommends: libuclibc-dev
 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.
- This package is used for cross compiling.
+ This package includes utilities that function as a toolchain for
+ compiling with uClibc instead of the native libc.  The utilities
+ have names such as powerpc-uclibc-gcc (depending on the architecture),
+ and should behave identically to the base utilities, except that
+ they use headers and libraries provided in the libuclibc-dev
+ package.  Most utilities are symbolic links to the correct underlying
+ utility, although gcc and ld are implemented as wrapper binaries that
+ call gcc and ld with the necessary arguments and command line options.
 
diff --git a/debian/control.in b/debian/control.in
index ebfe58cd9..30f39e2e9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,16 +3,17 @@ Section: devel
 Priority: optional
 Maintainer: David Schleef <ds@schleef.org>
 Build-Depends: debhelper, kernel-headers-2.4
-Standards-Version: 3.5.2
+Standards-Version: 3.5.6
 
 Package: libuclibc-dev_TARGET_
 Section: devel
 Architecture: _ARCHS_
-Depends: ${shlibs:Depends}
+Depends: libuclibc0_TARGET_ (= ${Source-Version}), ${shlibs:Depends}
 Description: A small implementation of the C library
  uClibc is an implementation of the standard C library that is
  much smaller than glibc, which makes it useful for embedded
- systems.
+ systems.  This package includes header files and development
+ libraries necessary to compile applications that use uClibc.
 
 Package: libuclibc0_TARGET_
 Section: libs
@@ -20,16 +21,26 @@ Architecture: _ARCHS_
 Description: A small implementation of the C library
  uClibc is an implementation of the standard C library that is
  much smaller than glibc, which makes it useful for embedded
- systems.
+ systems.  This package provides only the run-time libraries.
+ .
+ The Debian binary packages for uClibc do not provide the necessary
+ components for using uClibc as the primary library on a system,
+ as might be done for an embedded system.
 
 Package: uclibc_TARGET_-toolchain
 Section: devel
 Architecture: _ARCHS_
 Depends: gcc|c-compiler, binutils, ${shlibs:Depends}
+Recommends: libuclibc-dev_TARGET_
 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.
- This package is used for cross compiling.
+ This package includes utilities that function as a toolchain for
+ compiling with uClibc instead of the native libc.  The utilities
+ have names such as powerpc-uclibc-gcc (depending on the architecture),
+ and should behave identically to the base utilities, except that
+ they use headers and libraries provided in the libuclibc-dev_TARGET_
+ package.  Most utilities are symbolic links to the correct underlying
+ utility, although gcc and ld are implemented as wrapper binaries that
+ call gcc and ld with the necessary arguments and command line options.