r1174 - in glibc-package/trunk/debian: . control.in
Author: barbier
Date: 2006-02-14 23:00:07 +0000 (Tue, 14 Feb 2006)
New Revision: 1174
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
Log:
debian/control: Clean up. Remove versioned dependencies on gettext,
debianutils, tar, texinfo; these versions were already in oldstable.
Drop references to localebin, wg15-locale, i18ndata, locale-ja, locale-ko,
locale-vi, locale-zh, libc6-doc, glibcdoc and libc6 (<< 2.1-4).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-14 21:52:33 UTC (rev 1173)
+++ glibc-package/trunk/debian/changelog 2006-02-14 23:00:07 UTC (rev 1174)
@@ -7,6 +7,10 @@
a smooth upgrade in unstable when locales require changes in localedef.
This is the first part for solving #352620, the proper dependency for
locales will be set by the next upload.
+ * debian/control: Clean up. Remove versioned dependencies on gettext,
+ debianutils, tar, texinfo; these versions were already in oldstable.
+ Drop references to localebin, wg15-locale, i18ndata, locale-ja, locale-ko,
+ locale-vi, locale-zh, libc6-doc, glibcdoc and libc6 (<< 2.1-4).
[ Clint Adams ]
* Add hurd-getresuid-dyslexia.diff (fixes incorrect ordering of
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-02-14 21:52:33 UTC (rev 1173)
+++ glibc-package/trunk/debian/control 2006-02-14 23:00:07 UTC (rev 1174)
@@ -1,7 +1,7 @@
Source: glibc
Section: libs
Priority: required
-Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.13.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-4.0 [!powerpc !m68k !hppa !hurd-i386], gcc-3.4 (>= 3.4.4-6) [powerpc], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], autoconf, binutils (>= 2.16.1cvs20051109-1), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76), libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], quilt
+Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), debianutils, tar, bzip2, texinfo, linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-4.0 [!powerpc !m68k !hppa !hurd-i386], gcc-3.4 (>= 3.4.4-6) [powerpc], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], autoconf, binutils (>= 2.16.1cvs20051109-1), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76), libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], quilt
Build-Depends-Indep: perl, po-debconf
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Denis Barbier <barbier@debian.org>
@@ -11,8 +11,8 @@
Architecture: all
Section: doc
Priority: optional
-Conflicts: libc-doc, libc6-doc, glibcdoc
-Replaces: libc-doc, libc6-doc, glibcdoc
+Conflicts: libc-doc
+Replaces: libc-doc
Provides: libc-doc
Description: GNU C Library: Documentation
Contains The GNU C Library Reference manual in info and html format as
@@ -23,10 +23,9 @@
Architecture: all
Section: libs
Priority: standard
-Provides: i18ndata
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: localebin, wg15-locale, i18ndata, locale-ja, locale-ko, locale-vi, locale-zh, base-config
-Replaces: localebin, wg15-locale, libc6-bin, i18ndata, glibc2, locale-ja, locale-ko, locale-vi, locale-zh, base-config
+Conflicts: base-config
+Replaces: base-config
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
C library for localization (l10n) and internationalization (i18n) support.
@@ -42,7 +41,6 @@
Section: admin
Priority: optional
Depends: libc6 (>= ${Source-Version})
-Replaces: libc6 (<< 2.1-4)
Description: GNU C Library: Name Service Cache Daemon
A daemon which handles passwd, group and host lookups
for running programs and caches the results for the next
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-02-14 21:52:33 UTC (rev 1173)
+++ glibc-package/trunk/debian/control.in/main 2006-02-14 23:00:07 UTC (rev 1174)
@@ -1,7 +1,7 @@
Source: @glibc@
Section: libs
Priority: required
-Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.13.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-4.0 [!powerpc !m68k !hppa !hurd-i386], gcc-3.4 (>= 3.4.4-6) [powerpc], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], autoconf, binutils (>= 2.16.1cvs20051109-1), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76), libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], quilt
+Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), debianutils, tar, bzip2, texinfo, linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-4.0 [!powerpc !m68k !hppa !hurd-i386], gcc-3.4 (>= 3.4.4-6) [powerpc], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], autoconf, binutils (>= 2.16.1cvs20051109-1), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76), libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], quilt
Build-Depends-Indep: perl, po-debconf
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Denis Barbier <barbier@debian.org>
@@ -11,8 +11,8 @@
Architecture: all
Section: doc
Priority: optional
-Conflicts: libc-doc, libc6-doc, glibcdoc
-Replaces: libc-doc, libc6-doc, glibcdoc
+Conflicts: libc-doc
+Replaces: libc-doc
Provides: libc-doc
Description: GNU C Library: Documentation
Contains The GNU C Library Reference manual in info and html format as
@@ -23,10 +23,9 @@
Architecture: all
Section: libs
Priority: standard
-Provides: i18ndata
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: localebin, wg15-locale, i18ndata, locale-ja, locale-ko, locale-vi, locale-zh, base-config
-Replaces: localebin, wg15-locale, @libc@-bin, i18ndata, glibc2, locale-ja, locale-ko, locale-vi, locale-zh, base-config
+Conflicts: base-config
+Replaces: base-config
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
C library for localization (l10n) and internationalization (i18n) support.
@@ -42,7 +41,6 @@
Section: admin
Priority: optional
Depends: @libc@ (>= ${Source-Version})
-Replaces: @libc@ (<< 2.1-4)
Description: GNU C Library: Name Service Cache Daemon
A daemon which handles passwd, group and host lookups
for running programs and caches the results for the next
Reply to: