r901 - in glibc-package/branches/glibc-2.3.4/debian: . debhelper.in sysdeps
Author: gotom
Date: 2005-04-21 16:23:50 +0000 (Thu, 21 Apr 2005)
New Revision: 901
Removed:
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.manpages
Modified:
glibc-package/branches/glibc-2.3.4/debian/changelog
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install.hurd-i386
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.manpages
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.install
glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl
Log:
* Move sprof from libc-prof to libc-dev. (Closes: #280030)
- debian/sysdeps/depflags.pl: Add Replaces: libc-dev (<< 2.3.5-2).
- debian/debhelper.in/libc-prof.install: Remove sprof install.
- debian/debhelper.in/libc-dev.install: Install sprof moved from -prof.
- debian/debhelper.in/libc-dev.install.hurd-i386: Likewise.
- debian/debhelper.in/libc-dev.manpages: Add sprof.1 install.
- debian/debhelper.in/libc-prof.manpages: Remove file, don't install
sprof.1.
Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-21 15:40:08 UTC (rev 900)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-21 16:23:50 UTC (rev 901)
@@ -9,7 +9,7 @@
- debian/local/manpages/locale-gen.8: Delete reference to
locale.alias.5.
- debian/local/manpages/locale.gen.5: Likewise.
- - debian/debhelper.in/locales.links: Removed file, don't link to /etc.
+ - debian/debhelper.in/locales.links: Remove file, don't link to /etc.
- debian/debhelper.in/locales.install: Install locale.alias under
/usr/share/locale, not /etc/.
- debian/debhelper.in/locales.manpages: Don't install locale.alias.5
@@ -20,6 +20,15 @@
* Fix messages to add a patience message. (Closes: #305400)
- debian/local/usr_sbin/locale-gen
+ * Move sprof from libc-prof to libc-dev. (Closes: #280030)
+ - debian/sysdeps/depflags.pl: Add Replaces: libc-dev (<< 2.3.5-2).
+ - debian/debhelper.in/libc-prof.install: Remove sprof install.
+ - debian/debhelper.in/libc-dev.install: Install sprof moved from -prof.
+ - debian/debhelper.in/libc-dev.install.hurd-i386: Likewise.
+ - debian/debhelper.in/libc-dev.manpages: Add sprof.1 install.
+ - debian/debhelper.in/libc-prof.manpages: Remove file, don't install
+ sprof.1.
+
* A Costa <agcosta@gis.net>. (Closes: #305662, #305666)
- debian/local/manpages/tzconfig.8: Fixed typo.
- debian/local/manpages/ldconfig.8: Likewise.
Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install 2005-04-21 15:40:08 UTC (rev 900)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install 2005-04-21 16:23:50 UTC (rev 901)
@@ -1,6 +1,7 @@
debian/tmp-libc/usr/bin/gencat usr/bin
debian/tmp-libc/usr/bin/mtrace usr/bin
debian/tmp-libc/usr/bin/rpcgen usr/bin
+debian/tmp-libc/usr/bin/sprof usr/bin
debian/tmp-libc/usr/lib/libanl.a usr/lib
debian/tmp-libc/usr/lib/libBrokenLocale.a usr/lib
Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install.hurd-i386
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install.hurd-i386 2005-04-21 15:40:08 UTC (rev 900)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install.hurd-i386 2005-04-21 16:23:50 UTC (rev 901)
@@ -1,6 +1,7 @@
debian/tmp-libc/usr/bin/gencat usr/bin
debian/tmp-libc/usr/bin/mtrace usr/bin
debian/tmp-libc/usr/bin/rpcgen usr/bin
+debian/tmp-libc/usr/bin/sprof usr/bin
debian/tmp-libc/usr/lib/libBrokenLocale.a usr/lib
debian/tmp-libc/usr/lib/libbsd-compat.a usr/lib
Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.manpages
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.manpages 2005-04-21 15:40:08 UTC (rev 900)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.manpages 2005-04-21 16:23:50 UTC (rev 901)
@@ -1,3 +1,4 @@
debian/local/manpages/gencat.1
debian/local/manpages/mtrace.1
debian/local/manpages/rpcgen.1
+debian/local/manpages/sprof.1
Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.install
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.install 2005-04-21 15:40:08 UTC (rev 900)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.install 2005-04-21 16:23:50 UTC (rev 901)
@@ -1,2 +1 @@
debian/tmp-libc/usr/lib/*_p.a usr/lib
-debian/tmp-libc/usr/bin/sprof usr/bin
Deleted: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.manpages
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.manpages 2005-04-21 15:40:08 UTC (rev 900)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-prof.manpages 2005-04-21 16:23:50 UTC (rev 901)
@@ -1 +0,0 @@
-debian/local/manpages/sprof.1
Modified: glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl 2005-04-21 15:40:08 UTC (rev 900)
+++ glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl 2005-04-21 16:23:50 UTC (rev 901)
@@ -140,7 +140,8 @@
push @{$libc_dev_c{'Replaces'}}, 'kerberos4kth-dev (<< 1.2.2-10)';
# Replace libc-dev (<< 2.3.2.ds1-14) for fixing #239170.
-push @{$libc_c{'Replaces'}}, "${libc}-dev (<< 2.3.2.ds1-14)";
+# Replace libc-dev (<< 2.3.5-2) for fixing #280030.
+push @{$libc_c{'Replaces'}}, "${libc}-dev (<< 2.3.5-2)";
# Make sure we only have one version of libc-dev installed
push @{$libc_dev_c{'Provides'}}, 'libc-dev';
Reply to: