r3715 - in glibc-package/branches/multiarch/debian: . control.in
Author: aurel32
Date: 2009-07-29 14:42:31 +0000 (Wed, 29 Jul 2009)
New Revision: 3715
Modified:
glibc-package/branches/multiarch/debian/control
glibc-package/branches/multiarch/debian/control.in/libc
Log:
Merge two suggests field
Modified: glibc-package/branches/multiarch/debian/control
===================================================================
--- glibc-package/branches/multiarch/debian/control 2009-07-29 14:39:11 UTC (rev 3714)
+++ glibc-package/branches/multiarch/debian/control 2009-07-29 14:42:31 UTC (rev 3715)
@@ -99,11 +99,10 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Suggests: glibc-doc
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Breaks: nscd (<< 2.9)
-Suggests: debconf | debconf-2.0, locales [!hurd-i386]
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -174,11 +173,10 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Suggests: glibc-doc
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Breaks: nscd (<< 2.9)
-Suggests: debconf | debconf-2.0, locales [!hurd-i386]
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -249,11 +247,10 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Suggests: glibc-doc
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Breaks: nscd (<< 2.9)
-Suggests: debconf | debconf-2.0, locales [!hurd-i386]
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -324,11 +321,10 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Suggests: glibc-doc
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Breaks: nscd (<< 2.9)
-Suggests: debconf | debconf-2.0, locales [!hurd-i386]
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
Modified: glibc-package/branches/multiarch/debian/control.in/libc
===================================================================
--- glibc-package/branches/multiarch/debian/control.in/libc 2009-07-29 14:39:11 UTC (rev 3714)
+++ glibc-package/branches/multiarch/debian/control.in/libc 2009-07-29 14:42:31 UTC (rev 3715)
@@ -3,11 +3,10 @@
Section: libs
Priority: required
Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Suggests: glibc-doc
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Breaks: nscd (<< 2.9)
-Suggests: debconf | debconf-2.0, locales [!hurd-i386]
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
Reply to: