r1630 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/control.in branches/glibc-2.4/debian/debhelper.in trunk/debian trunk/debian/control.in trunk/debian/debhelper.in
Author: aurel32
Date: 2006-06-07 21:12:39 +0000 (Wed, 07 Jun 2006)
New Revision: 1630
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/compat
glibc-package/branches/glibc-2.4/debian/control
glibc-package/branches/glibc-2.4/debian/control.in/main
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-alt-dev.install
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/compat
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install
Log:
* debian/compat, debian/control.in/main: switch to debhelper 5.0.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 21:12:39 UTC (rev 1630)
@@ -156,6 +156,7 @@
from m32r/configure by Kazuhiro Inaoka. (Closes: #371052)
* rules.d/debhelper.mk: don't install librpcsvc.a when cross-compiling.
(Closes: #369657)
+ * debian/compat, debian/control.in/main: switch to debhelper 5.0.
[ Denis Barbier ]
* debian/main/control.in: make locales Conflicts: belocs-locales-data.
Modified: glibc-package/branches/glibc-2.4/debian/compat
===================================================================
--- glibc-package/branches/glibc-2.4/debian/compat 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/branches/glibc-2.4/debian/compat 2006-06-07 21:12:39 UTC (rev 1630)
@@ -1 +1 @@
-4
+5
Modified: glibc-package/branches/glibc-2.4/debian/control
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/branches/glibc-2.4/debian/control 2006-06-07 21:12:39 UTC (rev 1630)
@@ -29,7 +29,7 @@
Section: libs
Priority: standard
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: base-config
+Conflicts: base-config, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
Modified: glibc-package/branches/glibc-2.4/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-07 21:12:39 UTC (rev 1630)
@@ -6,7 +6,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.1, binutils (>= 2.16.1cvs20051109-1),
- autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
+ autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-alt-dev.install
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-alt-dev.install 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-alt-dev.install 2006-06-07 21:12:39 UTC (rev 1630)
@@ -14,7 +14,6 @@
TMPDIR/LIBDIR/libpthread.a LIBDIR
TMPDIR/LIBDIR/libpthread_nonshared.a LIBDIR
TMPDIR/LIBDIR/libresolv.a LIBDIR
-TMPDIR/LIBDIR/librpcsvc.a* LIBDIR
TMPDIR/LIBDIR/librt.a LIBDIR
TMPDIR/LIBDIR/libutil.a LIBDIR
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/trunk/debian/changelog 2006-06-07 21:12:39 UTC (rev 1630)
@@ -21,6 +21,7 @@
from m32r/configure by Kazuhiro Inaoka. (Closes: #371052)
* rules.d/debhelper.mk: don't install librpcsvc.a when cross-compiling.
(Closes: #369657)
+ * debian/compat, debian/control.in/main: switch to debhelper 5.0.
[ Denis Barbier ]
* debian/patches/localedata/tailor-iso14651_t1.diff: Fix several collation
Modified: glibc-package/trunk/debian/compat
===================================================================
--- glibc-package/trunk/debian/compat 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/trunk/debian/compat 2006-06-07 21:12:39 UTC (rev 1630)
@@ -1 +1 @@
-4
+5
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/trunk/debian/control 2006-06-07 21:12:39 UTC (rev 1630)
@@ -7,7 +7,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
- autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
+ autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
@@ -32,7 +32,7 @@
Section: libs
Priority: standard
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: base-config
+Conflicts: base-config, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/trunk/debian/control.in/main 2006-06-07 21:12:39 UTC (rev 1630)
@@ -7,7 +7,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
- autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
+ autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install 2006-06-07 17:22:37 UTC (rev 1629)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install 2006-06-07 21:12:39 UTC (rev 1630)
@@ -14,7 +14,6 @@
TMPDIR/LIBDIR/libpthread.a LIBDIR
TMPDIR/LIBDIR/libpthread_nonshared.a LIBDIR
TMPDIR/LIBDIR/libresolv.a LIBDIR
-TMPDIR/LIBDIR/librpcsvc.a* LIBDIR
TMPDIR/LIBDIR/librt.a LIBDIR
TMPDIR/LIBDIR/libutil.a LIBDIR
Reply to: