r4765 - in glibc-package/trunk/debian: . debhelper.in rules.d
Author: aurel32
Date: 2011-06-28 21:11:38 +0000 (Tue, 28 Jun 2011)
New Revision: 4765
Added:
glibc-package/trunk/debian/debhelper.in/locales.bug-presubj
Removed:
glibc-package/trunk/debian/bug/
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
rules.d/debhelper.mk: install bug files using dh_bugfiles.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-06-28 20:47:18 UTC (rev 4764)
+++ glibc-package/trunk/debian/changelog 2011-06-28 21:11:38 UTC (rev 4765)
@@ -29,6 +29,8 @@
broken LD_LIBRARY_PATH. Closes: #630608.
* kfreebsd/local-sysdeps.diff, update to revision 3501 (from glibc-bsd),
to fix <bits/siginfo.h>. Closes: #631867.
+ * libc.postrm: remove support code from Sarge.
+ * rules.d/debhelper.mk: install bug files using dh_bugfiles.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 3467 (from glibc-bsd).
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2011-06-28 20:47:18 UTC (rev 4764)
+++ glibc-package/trunk/debian/control 2011-06-28 21:11:38 UTC (rev 4765)
@@ -2,7 +2,7 @@
Section: libs
Priority: required
Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, lzma, xz-utils, file, quilt,
- autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0), tar (>= 1.22),
+ autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 7.4.3), tar (>= 1.22),
linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
Copied: glibc-package/trunk/debian/debhelper.in/locales.bug-presubj (from rev 4758, glibc-package/trunk/debian/bug/locales/presubj)
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.bug-presubj (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/locales.bug-presubj 2011-06-28 21:11:38 UTC (rev 4765)
@@ -0,0 +1,18 @@
+locales dependencies on glibc
+=============================
+
+ If at some point (in unstable) you get messages like:
+
+ The following packages have unmet dependencies:
+ locales: Depends: glibc-2.6-1 which is a virtual package.
+
+ then please check for example on [1] that the glibc of the _same_ version as
+ the `locales` package you are trying to upgrade is in state _installed_ for
+ your architecture, and for how long.
+
+ If it's not, it is very likely that the corresponding libc has not been
+ built _and_ uploaded to the mirrors for your architecture yet, and that the
+ dependencies will be fixed soon. Please wait for the package to be installed
+ for more than 24 hours before reporting a bug about `locales` dependencies.
+
+ [1] http://buildd.debian.org/~jeroen/status/package.php?p=glibc
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2011-06-28 20:47:18 UTC (rev 4764)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2011-06-28 21:11:38 UTC (rev 4765)
@@ -49,10 +49,7 @@
dh_installdocs -p$(curpass)
dh_lintian -p $(curpass)
dh_link -p$(curpass)
- set -e; if test -d debian/bug/$(curpass); then \
- dh_installdirs -p$(curpass) usr/share/bug; \
- dh_install -p$(curpass) debian/bug/$(curpass) usr/share/bug; \
- fi
+ dh_bugfiles -p$(curpass)
# extra_debhelper_pkg_install is used for debhelper.mk only.
# when you want to install extra packages, use extra_pkg_install.
Reply to: