r2458 - in glibc-package/trunk/debian: . debhelper.in rules.d
Author: aurel32
Date: 2007-07-25 17:46:53 +0000 (Wed, 25 Jul 2007)
New Revision: 2458
Added:
glibc-package/trunk/debian/debhelper.in/libc.NEWS
glibc-package/trunk/debian/debhelper.in/locales.NEWS
glibc-package/trunk/debian/debhelper.in/nscd.NEWS
Removed:
glibc-package/trunk/debian/debhelper.in/libc.NEWS.Debian
glibc-package/trunk/debian/debhelper.in/locales.NEWS.Debian
glibc-package/trunk/debian/debhelper.in/nscd.NEWS.Debian
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Fix installation of NEWS.Debian files
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-25 16:04:59 UTC (rev 2457)
+++ glibc-package/trunk/debian/changelog 2007-07-25 17:46:53 UTC (rev 2458)
@@ -18,8 +18,8 @@
* debian/control: Build-depend on gcc-4.1 on powerpc
* debian/control: Build-depend on g++-4.1/g++-4.2 and
g++-4.1-multilib/g++-4.2-multilib.
- * debian/*.NEWS.Debian: move to debian/debhelper.in/*.NEWS.Debian.
- * rules.d/debhelper.mk: remove debian/*.NEWS.Debian on clean.
+ * debian/*.NEWS: move to debian/debhelper.in/*.NEWS.
+ * rules.d/debhelper.mk: remove debian/*.NEWS on clean.
-- Aurelien Jarno <aurel32@debian.org> Wed, 25 Jul 2007 18:04:03 +0200
Copied: glibc-package/trunk/debian/debhelper.in/libc.NEWS (from rev 2456, glibc-package/trunk/debian/debhelper.in/libc.NEWS.Debian)
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.NEWS (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/libc.NEWS 2007-07-25 17:46:53 UTC (rev 2458)
@@ -0,0 +1,15 @@
+glibc (2.5-1) unstable; urgency=low
+
+ Starting with version 2.5-1, the glibc requires a 2.6.1 or later
+ kernel. If you use a 2.4 kernel, please upgrade it *before*
+ installing glibc.
+
+ This also means that it is not possible to use LD_ASSUME_KERNEL with a
+ version lower than 2.6.1. If you have set such a thing in /etc/profile,
+ ~/.bashrc or any other initialization file (something you should have
+ never done!!!), please remove that *before* installing glibc.
+
+ Note: This does not apply to the m68k architecture and to non-Linux
+ kernels.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 24 Apr 2007 00:26:48 +0200
Deleted: glibc-package/trunk/debian/debhelper.in/libc.NEWS.Debian
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.NEWS.Debian 2007-07-25 16:04:59 UTC (rev 2457)
+++ glibc-package/trunk/debian/debhelper.in/libc.NEWS.Debian 2007-07-25 17:46:53 UTC (rev 2458)
@@ -1,15 +0,0 @@
-glibc (2.5-1) unstable; urgency=low
-
- Starting with version 2.5-1, the glibc requires a 2.6.1 or later
- kernel. If you use a 2.4 kernel, please upgrade it *before*
- installing glibc.
-
- This also means that it is not possible to use LD_ASSUME_KERNEL with a
- version lower than 2.6.1. If you have set such a thing in /etc/profile,
- ~/.bashrc or any other initialization file (something you should have
- never done!!!), please remove that *before* installing glibc.
-
- Note: This does not apply to the m68k architecture and to non-Linux
- kernels.
-
- -- Aurelien Jarno <aurel32@debian.org> Tue, 24 Apr 2007 00:26:48 +0200
Copied: glibc-package/trunk/debian/debhelper.in/locales.NEWS (from rev 2456, glibc-package/trunk/debian/debhelper.in/locales.NEWS.Debian)
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.NEWS (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/locales.NEWS 2007-07-25 17:46:53 UTC (rev 2458)
@@ -0,0 +1,11 @@
+locales (2.3.6-7) unstable; urgency=low
+
+ * Locale variables are now stored in /etc/default/locale and no more
+ /etc/environment. The reason is that Debian Policy forbids modifying
+ configuration files of other packages, and /etc/environment is a
+ configuration file for PAM.
+ Make sure to remove old definitions from /etc/environment, this file
+ is no more modified for the reason explained above.
+
+ -- Denis Barbier <barbier@debian.org> Tue, 11 Apr 2006 21:24:13 +0200
+
Deleted: glibc-package/trunk/debian/debhelper.in/locales.NEWS.Debian
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.NEWS.Debian 2007-07-25 16:04:59 UTC (rev 2457)
+++ glibc-package/trunk/debian/debhelper.in/locales.NEWS.Debian 2007-07-25 17:46:53 UTC (rev 2458)
@@ -1,11 +0,0 @@
-locales (2.3.6-7) unstable; urgency=low
-
- * Locale variables are now stored in /etc/default/locale and no more
- /etc/environment. The reason is that Debian Policy forbids modifying
- configuration files of other packages, and /etc/environment is a
- configuration file for PAM.
- Make sure to remove old definitions from /etc/environment, this file
- is no more modified for the reason explained above.
-
- -- Denis Barbier <barbier@debian.org> Tue, 11 Apr 2006 21:24:13 +0200
-
Copied: glibc-package/trunk/debian/debhelper.in/nscd.NEWS (from rev 2456, glibc-package/trunk/debian/debhelper.in/nscd.NEWS.Debian)
===================================================================
--- glibc-package/trunk/debian/debhelper.in/nscd.NEWS (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/nscd.NEWS 2007-07-25 17:46:53 UTC (rev 2458)
@@ -0,0 +1,11 @@
+glibc (2.5-5) unstable; urgency=low
+
+ Since this release, hosts caching in nscd is off by default: for some of the
+ libc calls (gethostby* calls) nscd does not respect the DNS TTLs. It can
+ lead to system lockups (e.g. if you are using pam-ldap and change the IP of
+ your authentication server) hence is not considered safe.
+
+ See debian bug #335476 and how upstream answered to that in
+ http://sourceware.org/bugzilla/show_bug.cgi?id=4428.
+
+ -- Pierre Habouzit <madcoder@debian.org> Sat, 28 Apr 2007 11:10:56 +0200
Deleted: glibc-package/trunk/debian/debhelper.in/nscd.NEWS.Debian
===================================================================
--- glibc-package/trunk/debian/debhelper.in/nscd.NEWS.Debian 2007-07-25 16:04:59 UTC (rev 2457)
+++ glibc-package/trunk/debian/debhelper.in/nscd.NEWS.Debian 2007-07-25 17:46:53 UTC (rev 2458)
@@ -1,11 +0,0 @@
-glibc (2.5-5) unstable; urgency=low
-
- Since this release, hosts caching in nscd is off by default: for some of the
- libc calls (gethostby* calls) nscd does not respect the DNS TTLs. It can
- lead to system lockups (e.g. if you are using pam-ldap and change the IP of
- your authentication server) hence is not considered safe.
-
- See debian bug #335476 and how upstream answered to that in
- http://sourceware.org/bugzilla/show_bug.cgi?id=4428.
-
- -- Pierre Habouzit <madcoder@debian.org> Sat, 28 Apr 2007 11:10:56 +0200
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2007-07-25 16:04:59 UTC (rev 2457)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2007-07-25 17:46:53 UTC (rev 2458)
@@ -32,16 +32,6 @@
install --mode=0644 debian/FAQ debian/$(curpass)/usr/share/doc/$(curpass)/README.Debian
endef
-define locales_extra_debhelper_pkg_install
- install --mode=0644 $(DEB_SRCDIR)/localedata/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
- install --mode=0644 debian/locales.NEWS.Debian debian/$(curpass)/usr/share/doc/locales/NEWS.Debian
-endef
-
-define glibc-doc_extra_debhelper_pkg_install
- install --mode=0644 $(DEB_SRCDIR)/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
-# install --mode=0644 $(DEB_SRCDIR)/linuxthreads/FAQ.html debian/$(curpass)/usr/share/doc/$(curpass)/FAQ.linuxthreads.html
-endef
-
# Should each of these have per-package options?
$(patsubst %,binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES)) :: binaryinst_% : $(stamp)binaryinst_%
@@ -269,6 +259,6 @@
rm -f debian/*.generated
rm -f debian/*.lintian
rm -f debian/*.linda
- rm -f debian/*.NEWS.Debian
+ rm -f debian/*.NEWS
rm -f $(stamp)binaryinst*
Reply to: