diff -Nru base-files-4.0.4/debian/changelog base-files-4.0.4ubuntu1/debian/changelog --- base-files-4.0.4/debian/changelog 2008-05-18 16:26:43.000000000 +0200 +++ base-files-4.0.4ubuntu1/debian/changelog 2008-08-08 10:04:27.000000000 +0200 @@ -1,3 +1,26 @@ +base-files (4.0.4ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #247082), remaining changes: + - Branding changes + - Add /etc/lsb-release file + - Add lsb-release-udeb package + - Record md5sums of unmodified /etc/profile versions so that we can + upgrade it automatically + - Various bashrc extensions + - Restore order line in /etc/host.conf with a comment + - Add default /etc/networks file + - Implement LSB-3.1, 16.2 (/etc/profile.d) + - Added information about the docs web page + - Update the motd upgrade handling to know about /etc/motd.tail + - Do not install /usr/local dirs with staff group writeability, as there + are cases where somebody can become any user but root (like NFS) + * Dropped changes (transitional code): + - Add default /etc/networks file on upgrade + - Fix 4.0.1ubuntu3 motd upgrade + - On amd64, depend on a libc6 that ships /lib64 to avoid broken upgrades + + -- Thierry Carrez Fri, 08 Aug 2008 10:02:16 +0200 + base-files (4.0.4) unstable; urgency=low * Added Apache-2.0 to common-licenses. Closes: #471736. @@ -20,6 +43,62 @@ -- Santiago Vila Mon, 19 Nov 2007 19:04:10 +0100 +base-files (4.0.1ubuntu6) intrepid; urgency=low + + * Update for Intrepid: etc/{lsb-release,issue,issue.net} + + -- Adam Conrad Mon, 28 Apr 2008 12:24:54 -0600 + +base-files (4.0.1ubuntu5) hardy; urgency=low + + * Prepare for Hardy release: etc/{lsb-release,issue,issue.net}. + + -- Steve Langasek Tue, 15 Apr 2008 05:05:24 +0000 + +base-files (4.0.1ubuntu4) hardy; urgency=low + + * Update the motd upgrade handling to know about /etc/motd.tail, which + is where the static contents of the motd are stored now with + initscripts 2.86.ds1-7 and above; and handle fixing the broken + upgrades introduced in 4.0.1ubuntu3. LP: #214853 + + -- Steve Langasek Thu, 10 Apr 2008 00:02:43 +0000 + +base-files (4.0.1ubuntu3) hardy; urgency=low + + * Added information about the docs web page (LP: #159371) + + -- Nicolas Valcarcel Thu, 03 Apr 2008 00:13:05 -0500 + +base-files (4.0.1ubuntu2) hardy; urgency=low + + * Implement LSB-3.1, 16.2 (/etc/profile.d). Addresses LP #102105. + According to Debian policy 9.9 (Environment variables), programs + installed by packages must not depend on environment variables + to get reasonable defaults. Do not use this LSB feature to set + or modify environment variables. + + -- Matthias Klose Wed, 06 Feb 2008 15:27:17 +0100 + +base-files (4.0.1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Branding changes. + - Add /etc/lsb-release file. + - Add lsb-release-udeb package. + - Record md5sums of unmodified /etc/profile versions so that we can + upgrade it automatically. + - Various bashrc extensions. + - Restore order line in /etc/host.conf with a comment. + - Add default /etc/networks file. + * Ubuntu changes dropped: + - Added version 3 of the LGPL license, taken from + http://www.gnu.org/licenses/lgpl-3.0.txt + * ubuntu-devel -> ubuntu-devel-discuss for the Maintainer field. + + -- Steve Kowalik Mon, 29 Oct 2007 07:31:52 +1100 + base-files (4.0.1) unstable; urgency=low * Added GPL-3 and LGPL-3 to common-licenses, as they are expected to @@ -30,6 +109,54 @@ -- Santiago Vila Sun, 19 Aug 2007 19:15:30 +0200 +base-files (4.0.0ubuntu6) hardy; urgency=low + + * Update for Hardy: etc/{lsb-release,issue,issue.net}. + + -- Matthias Klose Fri, 19 Oct 2007 19:24:18 +0000 + +base-files (4.0.0ubuntu5) gutsy; urgency=low + + * Prepare for Gutsy release: etc/{lsb-release,issue,issue.net}. + + -- Martin Pitt Mon, 08 Oct 2007 11:21:08 +0200 + +base-files (4.0.0ubuntu4) gutsy; urgency=low + + * Trigger rebuild for hppa. + + -- LaMont Jones Fri, 28 Sep 2007 10:22:50 -0600 + +base-files (4.0.0ubuntu3) gutsy; urgency=low + + * Added version 3 of the LGPL license, taken from + http://www.gnu.org/licenses/lgpl-3.0.txt + (LP: #126565) + + -- Mario Limonciello Tue, 17 Jul 2007 09:52:08 -0500 + +base-files (4.0.0ubuntu2) gutsy; urgency=low + + * Added version 3 of the GPL license, taken from + http://www.gnu.org/licenses/gpl-3.0.txt (Siegfried-Angel Gevatter Pujals). + Closes: LP #123139. + + -- Matthias Klose Tue, 03 Jul 2007 17:25:11 +0200 + +base-files (4.0.0ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian (LP: #27924). Remaining changes: + - Branding changes. + - Add /etc/lsb-release file. + - Add lsb-release-udeb package. + - Record md5sums of unmodified /etc/profile versions so that we can + upgrade it automatically. + - Various bashrc extensions. + - Restore order line in /etc/host.conf with a comment. + - Add default /etc/networks file. + + -- Colin Watson Tue, 15 May 2007 17:10:18 +0100 + base-files (4.0.0) unstable; urgency=low * Added GFDL-1.2 from ftp://ftp.gnu.org/gnu/Licenses/COPYING.DOC-1.2 @@ -37,6 +164,21 @@ -- Santiago Vila Tue, 24 Apr 2007 09:39:36 +0200 +base-files (4.0ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Branding changes. + - Add /etc/lsb-release file. + - Add lsb-release-udeb package. + - Record md5sums of unmodified /etc/profile versions so that we can + upgrade it automatically. + - Various bashrc extensions. + - Restore order line in /etc/host.conf with a comment. + - Add default /etc/networks file. + * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Gutsy! + + -- Colin Watson Fri, 20 Apr 2007 15:03:56 +0100 + base-files (4.0) unstable; urgency=low * Changed issue, issue.net and debian_version to read "lenny/sid". @@ -44,6 +186,27 @@ -- Santiago Vila Tue, 3 Apr 2007 11:45:30 +0200 +base-files (4ubuntu2) feisty; urgency=low + + * Feisty is about to release, so change codenames to version numbers in + /etc/issue{,.net} and the lsb_release output. + + -- Tollef Fog Heen Thu, 12 Apr 2007 08:04:33 +0200 + +base-files (4ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Branding changes. + - Add /etc/lsb-release file. + - Add lsb-release-udeb package. + - Record md5sums of unmodified /etc/profile versions so that we can + upgrade it automatically. + - Various bashrc extensions. + - Restore order line in /etc/host.conf with a comment. + - Add default /etc/networks file. + + -- Colin Watson Wed, 20 Dec 2006 15:54:41 +0000 + base-files (4) unstable; urgency=low * Changed issue, issue.net and debian_version to read "4.0". @@ -52,6 +215,26 @@ -- Santiago Vila Sat, 28 Oct 2006 15:44:00 +0200 +base-files (3.1.16ubuntu2) feisty; urgency=low + + * Add share/networks: Default networks file with a small explanation and + 'link-local 169.254.0.0'. (See https://wiki.ubuntu.com/ZeroConfNetworking + spec). + * debian/postinst: Install that file as /etc/networks if it does not exist + yet, on both new installations and upgrades. + + -- Martin Pitt Mon, 27 Nov 2006 12:56:59 +0100 + +base-files (3.1.16ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. + * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Feisty! + * /etc/host.conf: Restore order line with a comment that it is not used by + current libc, since removing it breaks old statically linked binaries + (see Debian bug #354115). + + -- Colin Watson Fri, 27 Oct 2006 11:04:47 +0100 + base-files (3.1.16) unstable; urgency=low * Changed comment in default /etc/nsswitch.conf so that it refers to @@ -76,6 +259,25 @@ -- Santiago Vila Mon, 7 Aug 2006 19:21:54 +0200 +base-files (3.1.13ubuntu2) edgy; urgency=low + + * /etc/lsb-release, /etc/issue, /etc/issue.net: Ubuntu 6.10. + + -- Tollef Fog Heen Thu, 19 Oct 2006 10:16:59 +0200 + +base-files (3.1.13ubuntu1) edgy; urgency=low + + * Merge from debian unstable; remaining changes: + - branding changes, + - /etc/lsb-release file, + - lsb-release-udeb package, + - profile md5sum checking, + - extended bashrc. + + * Fix missing space from share/profile so the md5sum matches. + + -- Scott James Remnant Mon, 3 Jul 2006 17:17:41 +0100 + base-files (3.1.13) unstable; urgency=low * Updated LGPL-2 from ftp://ftp.gnu.org/gnu/Licenses (Closes: #332390). @@ -104,6 +306,78 @@ -- Santiago Vila Thu, 9 Feb 2006 18:41:22 +0100 +base-files (3.1.9ubuntu9) edgy; urgency=low + + * And due to the changes in the last upload, we need to depend on a + libc6 new enough that we get /lib64 created BEFORE we remove our + copy, so dpkg doesn't suddenly stop working, mid-unpack. + + -- Adam Conrad Thu, 8 Jun 2006 23:31:35 +1000 + +base-files (3.1.9ubuntu8) edgy; urgency=low + + * /etc/{lsb-release,issue,issue.net}: Welcome to edgy! + * Stop shipping /usr/lib64 and /lib64 symlinks, moved to libc6. + * Drop /usr/X11R6/lib64 as a final step toward X11R7 nirvana. + + -- Adam Conrad Thu, 8 Jun 2006 19:34:02 +1000 + +base-files (3.1.9ubuntu7) dapper; urgency=low + + * /etc/lsb-release: Revert DISTRIB_RELEASE to 6.06; code relies on this + and it's too late to change it. + + -- Colin Watson Mon, 22 May 2006 09:44:40 +0100 + +base-files (3.1.9ubuntu6) dapper; urgency=low + + * /etc/lsb-release, /etc/issue, /etc/issue.net: s/6.06LTS/6.06 LTS/ for + everything except the LSB DISTRIB_RELEASE, which is a version number. + + -- Adam Conrad Mon, 22 May 2006 09:24:28 +1000 + +base-files (3.1.9ubuntu5) dapper; urgency=low + + * /etc/lsb-release, /etc/issue, /etc/issue.net: Ubuntu 6.06LTS + + -- Matt Zimmerman Sun, 21 May 2006 10:54:36 -0700 + +base-files (3.1.9ubuntu4) dapper; urgency=low + + * /etc/lsb-release, /etc/issue, /etc/issue.net: Change Dapper version + number to 6.06 (closes: Malone #36820). + + -- Colin Watson Mon, 27 Mar 2006 10:17:18 +0100 + +base-files (3.1.9ubuntu3) dapper; urgency=low + + * Implement OneTruePathSpec: + * share/profile: Remove PATH setting. + * debian/control: Add dependency libpam-modules (>= 0.79-3ubuntu3) so that + the user does not end up without any $PATH at all. + * Add share/profile.md5sums: Record the md5sums of unmodified /etc/profile + of warty, hoary, breezy, current dapper, and this new version for dapper. + * debian/postinst: If /etc/profile matches one of the recorded md5sums, + replace it with the current version on upgrades. + * debian/rules, clean rule: Automatically update share/profile.md5sums with + the current md5sum of share/profile. + + -- Martin Pitt Wed, 18 Jan 2006 11:32:32 +0100 + +base-files (3.1.9ubuntu2) dapper; urgency=low + + * Supply /etc/lsb-release and lsb-release-udeb, moved from the lsb-release + package. + + -- Colin Watson Wed, 9 Nov 2005 15:43:25 -0500 + +base-files (3.1.9ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * /etc/issue, /etc/issue.net: Welcome to Dapper! + + -- Colin Watson Tue, 25 Oct 2005 11:49:43 +0100 + base-files (3.1.9) unstable; urgency=low * The file /etc/inputrc is now handled by readline-common. @@ -134,6 +408,31 @@ -- Santiago Vila Tue, 12 Jul 2005 17:29:48 +0200 +base-files (3.1.5ubuntu4) breezy; urgency=low + + * Breezy's about to release, so drop "Development Branch" from /etc/issue + and /etc/issue.net. + + -- Colin Watson Wed, 5 Oct 2005 10:08:47 +0100 + +base-files (3.1.5ubuntu3) breezy; urgency=low + + * inputrc: Remove trailing whitespace. + + -- Matthias Klose Mon, 12 Sep 2005 12:20:50 +0000 + +base-files (3.1.5ubuntu2) breezy; urgency=low + + * /root/.bashrc: sync with bash skeleton file. + + -- Matthias Klose Mon, 5 Sep 2005 18:30:12 +0200 + +base-files (3.1.5ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Tue, 19 Jul 2005 18:51:32 +0100 + base-files (3.1.5) unstable; urgency=medium * Updated GPL-2 and LGPL-2.1 from ftp://ftp.gnu.org/gnu/Licenses again. @@ -157,6 +456,13 @@ -- Santiago Vila Mon, 6 Jun 2005 19:32:20 +0200 +base-files (3.1.2ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + * /etc/issue, /etc/issue.net: Welcome to Breezy! + + -- Colin Watson Thu, 14 Apr 2005 09:45:02 +0100 + base-files (3.1.2) unstable; urgency=low * Changed example line in default /root/.bashrc from eval `dircolors` to @@ -173,6 +479,30 @@ -- Santiago Vila Tue, 14 Dec 2004 19:06:00 +0100 +base-files (3.1.0ubuntu3) hoary; urgency=low + + * Hoary's about to release, so drop "Development Branch" from /etc/issue + and /etc/issue.net. + + -- Colin Watson Thu, 31 Mar 2005 19:27:50 +0100 + +base-files (3.1.0ubuntu2) hoary; urgency=low + + * debian/postinst: Do not install /usr/local and subdirectories with "staff" + group writeability. This group is essentially root-equivalent, but there + are cases where somebody can become any user but root (like NFS). + * debian/rules: Do not install /home as root:staff, it makes no sense. + * debian/2775-dirs: Remove "home". + * Ubuntu bug #7449 + + -- Martin Pitt Fri, 11 Mar 2005 11:30:07 +0100 + +base-files (3.1.0ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Wed, 17 Nov 2004 12:35:43 +0000 + base-files (3.1.0) unstable; urgency=low * Moved PATH definition for root from the default /root/.profile to the @@ -183,12 +513,64 @@ -- Santiago Vila Wed, 10 Nov 2004 17:32:00 +0100 +base-files (3.1ubuntu2) hoary; urgency=low + + * /etc/inputrc: Enable some key bindings by default (closes: #2525). + + -- Matthias Klose Wed, 17 Nov 2004 00:46:24 +0000 + +base-files (3.1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * /etc/issue, /etc/issue.net: Welcome to Hoary! + + -- Colin Watson Fri, 29 Oct 2004 15:38:49 +0100 + base-files (3.1) unstable; urgency=high * Changed issue, issue.net and debian_version to read "3.1". -- Santiago Vila Mon, 26 Jul 2004 20:25:32 +0200 +base-files (3.0.16ubuntu6) warty; urgency=low + + * /etc/profile: source /etc/bash.bashrc for the bash case. + * /root/.profile: only source /root/.bashrc for the bash case. + * /root/.bashrc, /root/.profile, /etc/bash.bashrc: sync with bash + skeleton files. + + -- Matthias Klose Tue, 21 Sep 2004 18:51:00 +0200 + +base-files (3.0.16ubuntu5) warty; urgency=low + + * etc/profile: Add sbin directories to default PATH + + -- Matt Zimmerman Wed, 8 Sep 2004 19:04:58 -0700 + +base-files (3.0.16ubuntu4) warty; urgency=low + + * share/dot.bashrc: color ls and (optional) color prompt for root + + -- Nathaniel McCallum Tue, 24 Aug 2004 09:49:29 -0400 + +base-files (3.0.16ubuntu3) warty; urgency=low + + * etc/motd, etc/issue, etc/issue.net, share/info.dir: Ubuntu branding. + + -- Colin Watson Mon, 23 Aug 2004 23:50:03 +0100 + +base-files (3.0.16ubuntu2) warty; urgency=low + + * Only deliver said links on amd64. + + -- LaMont Jones Tue, 13 Jul 2004 22:53:11 +0000 + +base-files (3.0.16ubuntu1) unstable; urgency=low + + * Added lib64 symlinks for the amd64. From debian-amd64. + + -- LaMont Jones Tue, 13 Jul 2004 21:31:10 +0100 + base-files (3.0.16) unstable; urgency=low * Changed -a to && in postinst (Closes #254781). @@ -863,3 +1245,4 @@ /etc/passwd and /etc/group are installed by the "base-passwd" package. -- Bruce Perens Thu, 14 Nov 1996 21:02:09 -0800 + diff -Nru base-files-4.0.4/debian/conffiles base-files-4.0.4ubuntu1/debian/conffiles --- base-files-4.0.4/debian/conffiles 2006-03-04 13:26:57.000000000 +0100 +++ base-files-4.0.4ubuntu1/debian/conffiles 2008-05-19 00:44:17.000000000 +0200 @@ -2,3 +2,4 @@ /etc/host.conf /etc/issue /etc/issue.net +/etc/lsb-release diff -Nru base-files-4.0.4/debian/control base-files-4.0.4ubuntu1/debian/control --- base-files-4.0.4/debian/control 2006-08-20 12:44:36.000000000 +0200 +++ base-files-4.0.4ubuntu1/debian/control 2008-05-19 00:44:17.000000000 +0200 @@ -1,18 +1,25 @@ Source: base-files Section: admin Priority: required -Maintainer: Santiago Vila +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Santiago Vila Standards-Version: 3.7.2 Package: base-files Provides: base Architecture: any -Depends: awk, base-passwd (>= 2.0.3.4) +Depends: awk, base-passwd (>= 2.0.3.4), libpam-modules (>= 0.79-3ubuntu3) Essential: yes Priority: required -Replaces: base, miscutils +Replaces: base, miscutils, lsb-release (<< 3.0-8) Description: Debian base system miscellaneous files This package contains the basic filesystem hierarchy of a Debian system, and several important miscellaneous files, such as /etc/debian_version, /etc/host.conf, /etc/issue, /etc/motd, /etc/profile, /etc/nsswitch.conf, and others, and the text of several common licenses in use on Debian systems. + +Package: lsb-release-udeb +Section: debian-installer +Architecture: all +Priority: extra +Description: LSB release information diff -Nru base-files-4.0.4/debian/directory-list base-files-4.0.4ubuntu1/debian/directory-list --- base-files-4.0.4/debian/directory-list 2005-07-12 17:31:01.000000000 +0200 +++ base-files-4.0.4ubuntu1/debian/directory-list 2008-05-19 00:44:17.000000000 +0200 @@ -4,6 +4,7 @@ etc etc/default etc/skel +etc/profile.d home lib mnt diff -Nru base-files-4.0.4/debian/postinst base-files-4.0.4ubuntu1/debian/postinst --- base-files-4.0.4/debian/postinst 2008-03-11 11:02:27.000000000 +0100 +++ base-files-4.0.4ubuntu1/debian/postinst 2008-08-08 09:38:49.000000000 +0200 @@ -5,8 +5,8 @@ if [ ! -d $1 ]; then mkdir -p $1 fi - chown root:staff $1 2> /dev/null || true - chmod 2775 $1 2> /dev/null || true + #chown root:staff $1 2> /dev/null || true + #chmod 2775 $1 2> /dev/null || true } install_from_default() { @@ -36,6 +36,7 @@ install_from_default /usr/share/base-files/dot.bashrc /root/.bashrc install_from_default /usr/share/base-files/profile /etc/profile install_from_default /usr/share/base-files/motd /etc/motd + install_from_default /usr/share/base-files/networks /etc/networks install_directory srv 755 root install_directory opt 755 root install_directory etc/opt 755 root @@ -116,9 +117,17 @@ rm -f /etc/base-files.mailsymlink if [ "$1" = "configure" ] && [ "$2" != "" ]; then - if [ -f /etc/motd ]; then + newmd=`awk 'NR > 2' /usr/share/base-files/motd | md5sum | awk '{print $1}'` + if [ -f /etc/motd.tail ]; then + oldmd=`awk 'NR > 1' /etc/motd.tail | md5sum | awk '{print $1}'` + if [ "$oldmd" != "$newmd" ]; then + if grep -q "$oldmd" /usr/share/base-files/motd.md5sums; then + mv /etc/motd.tail /etc/motd.tail.old + awk 'NR > 1' /usr/share/base-files/motd > /etc/motd.tail + fi + fi + elif [ -f /etc/motd ] && [ ! -L /etc/motd ]; then oldmd=`awk 'NR > 2' /etc/motd | md5sum | awk '{print $1}'` - newmd=`awk 'NR > 2' /usr/share/base-files/motd | md5sum | awk '{print $1}'` if [ "$oldmd" != "$newmd" ]; then if grep -q "$oldmd" /usr/share/base-files/motd.md5sums; then awk 'NR <= 2' /etc/motd > /etc/motd.new @@ -128,6 +137,13 @@ fi fi fi + + if [ -f /etc/profile ]; then + md5=`md5sum /etc/profile | cut -f 1 -d\ ` + if grep -qw "$md5" /usr/share/base-files/profile.md5sums; then + cp /usr/share/base-files/profile /etc/profile + fi + fi fi if [ -f /var/lib/dpkg/info/base.list ]; then diff -Nru base-files-4.0.4/debian/rules base-files-4.0.4ubuntu1/debian/rules --- base-files-4.0.4/debian/rules 2008-03-11 11:02:27.000000000 +0100 +++ base-files-4.0.4ubuntu1/debian/rules 2008-08-08 09:39:20.000000000 +0200 @@ -13,6 +13,8 @@ VERSION = $(shell cat etc/debian_version) +DEBVERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) + build: cd debian && sed -e "s&#VERSION#&$(VERSION)&" preinst.in > preinst touch build @@ -20,7 +22,11 @@ clean: rm -f build debian/preinst rm -f `find . -name "*~"` - rm -rf debian/tmp debian/files* core debian/substvars + rm -rf debian/tmp debian/lsb-release-udeb debian/files* core debian/substvars + + # update md5sums list for profile + LIST="`md5sum share/profile | cut -f 1 -d\ | cat share/profile.md5sums - | sort -u`"; \ + echo "$$LIST" > share/profile.md5sums binary-arch: build rm -rf debian/tmp @@ -61,10 +67,22 @@ cd debian/tmp && chmod 755 `find . -type d` cd debian/tmp && chmod 1777 `cat ../1777-dirs` cd debian/tmp && chmod 2775 `cat ../2775-dirs` - dpkg-gencontrol -isp + dpkg-gencontrol -pbase-files -isp dpkg --build debian/tmp .. binary-indep: build + rm -rf debian/lsb-release-udeb + install -d debian/lsb-release-udeb/DEBIAN debian/lsb-release-udeb/etc + install -p -m 644 etc/lsb-release debian/lsb-release-udeb/etc + chown -R root:root debian/lsb-release-udeb + cd debian/lsb-release-udeb && chmod 755 `find . -type d` + dpkg-gencontrol -plsb-release-udeb \ + -Tdebian/lsb-release-udeb.substvars -Pdebian/lsb-release-udeb \ + -isp -fdebian/files~ + dpkg-distaddfile lsb-release-udeb_$(DEBVERSION)_all.udeb \ + debian-installer extra + dpkg --build debian/lsb-release-udeb \ + ../lsb-release-udeb_$(DEBVERSION)_all.udeb binary: binary-indep binary-arch diff -Nru base-files-4.0.4/etc/host.conf base-files-4.0.4ubuntu1/etc/host.conf --- base-files-4.0.4/etc/host.conf 2006-08-07 19:14:09.000000000 +0200 +++ base-files-4.0.4ubuntu1/etc/host.conf 2008-05-19 00:44:17.000000000 +0200 @@ -1 +1,3 @@ +# The "order" line is only used by old versions of the C library. +order hosts,bind multi on diff -Nru base-files-4.0.4/etc/issue base-files-4.0.4ubuntu1/etc/issue --- base-files-4.0.4/etc/issue 2007-04-01 13:47:13.000000000 +0200 +++ base-files-4.0.4ubuntu1/etc/issue 2008-05-19 00:44:17.000000000 +0200 @@ -1,2 +1,2 @@ -Debian #OSNAME# lenny/sid \n \l +Ubuntu intrepid (development branch) \n \l diff -Nru base-files-4.0.4/etc/issue.net base-files-4.0.4ubuntu1/etc/issue.net --- base-files-4.0.4/etc/issue.net 2007-04-01 13:47:19.000000000 +0200 +++ base-files-4.0.4ubuntu1/etc/issue.net 2008-05-19 00:44:18.000000000 +0200 @@ -1 +1 @@ -Debian #OSNAME# lenny/sid +Ubuntu intrepid (development branch) diff -Nru base-files-4.0.4/etc/lsb-release base-files-4.0.4ubuntu1/etc/lsb-release --- base-files-4.0.4/etc/lsb-release 1970-01-01 01:00:00.000000000 +0100 +++ base-files-4.0.4ubuntu1/etc/lsb-release 2008-04-28 20:24:48.000000000 +0200 @@ -0,0 +1,4 @@ +DISTRIB_ID=Ubuntu +DISTRIB_RELEASE=8.10 +DISTRIB_CODENAME=intrepid +DISTRIB_DESCRIPTION="Ubuntu intrepid (development branch)" diff -Nru base-files-4.0.4/etc/motd base-files-4.0.4ubuntu1/etc/motd --- base-files-4.0.4/etc/motd 2002-11-19 21:32:41.000000000 +0100 +++ base-files-4.0.4ubuntu1/etc/motd 2008-05-19 00:44:17.000000000 +0200 @@ -1,8 +1,11 @@ -The programs included with the Debian #OSNAME# system are free software; +The programs included with the Ubuntu system are free software; the exact distribution terms for each program are described in the individual files in /usr/share/doc/*/copyright. -Debian #OSNAME# comes with ABSOLUTELY NO WARRANTY, to the extent -permitted by applicable law. +Ubuntu comes with ABSOLUTELY NO WARRANTY, to the extent permitted by +applicable law. + +To access official Ubuntu documentation, please visit: +http://help.ubuntu.com/ diff -Nru base-files-4.0.4/share/dot.bashrc base-files-4.0.4ubuntu1/share/dot.bashrc --- base-files-4.0.4/share/dot.bashrc 2004-12-15 23:53:27.000000000 +0100 +++ base-files-4.0.4ubuntu1/share/dot.bashrc 2008-05-19 00:44:18.000000000 +0200 @@ -1,16 +1,72 @@ # ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples -export PS1='\h:\w\$ ' -umask 022 +# If not running interactively, don't do anything +[ -z "$PS1" ] && return -# You may uncomment the following lines if you want `ls' to be colorized: -# export LS_OPTIONS='--color=auto' -# eval "`dircolors`" -# alias ls='ls $LS_OPTIONS' -# alias ll='ls $LS_OPTIONS -l' -# alias l='ls $LS_OPTIONS -lA' -# -# Some more alias to avoid making mistakes: -# alias rm='rm -i' -# alias cp='cp -i' -# alias mv='mv -i' +# don't put duplicate lines in the history. See bash(1) for more options +#export HISTCONTROL=ignoredups + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "$debian_chroot" -a -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in +xterm-color) + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' + ;; +*) + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + ;; +esac + +# Comment in the above and uncomment this below for a color prompt +#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"' + ;; +*) + ;; +esac + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +#if [ -f ~/.bash_aliases ]; then +# . ~/.bash_aliases +#fi + +# enable color support of ls and also add handy aliases +if [ "$TERM" != "dumb" ]; then + eval "`dircolors -b`" + alias ls='ls --color=auto' + #alias dir='ls --color=auto --format=vertical' + #alias vdir='ls --color=auto --format=long' +fi + +# some more ls aliases +#alias ll='ls -l' +#alias la='ls -A' +#alias l='ls -CF' + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +#if [ -f /etc/bash_completion ]; then +# . /etc/bash_completion +#fi diff -Nru base-files-4.0.4/share/info.dir base-files-4.0.4ubuntu1/share/info.dir --- base-files-4.0.4/share/info.dir 2006-04-15 18:36:50.000000000 +0200 +++ base-files-4.0.4ubuntu1/share/info.dir 2008-05-19 00:44:18.000000000 +0200 @@ -11,7 +11,7 @@ it. --- PLEASE ADD DOCUMENTATION TO THIS TREE. (See INFO topic first.) --- -In Debian #OSNAME#, Info `dir' entries are added with the command +In Ubuntu, Info `dir' entries are added with the command `install-info'. Please refer to install-info(8) for usage details. * Menu: The list of major topics begins on the next line. diff -Nru base-files-4.0.4/share/motd.md5sums base-files-4.0.4ubuntu1/share/motd.md5sums --- base-files-4.0.4/share/motd.md5sums 2004-12-14 19:03:56.000000000 +0100 +++ base-files-4.0.4ubuntu1/share/motd.md5sums 2008-05-19 00:44:18.000000000 +0200 @@ -5,3 +5,4 @@ 2bc53664e2502f75c339c652fcb86fd0 3.0.2 woody Hurd efd9f20ea448edfcf103a460f5cfad34 3.1.1 sarge Linux b66cc7941b4d76c335e435dff8e19336 3.1.1 sarge Hurd +b96a46f1f55c293787c096d1e5f5ce31 7.10 gutsy Linux diff -Nru base-files-4.0.4/share/networks base-files-4.0.4ubuntu1/share/networks --- base-files-4.0.4/share/networks 1970-01-01 01:00:00.000000000 +0100 +++ base-files-4.0.4ubuntu1/share/networks 2007-05-15 18:07:13.000000000 +0200 @@ -0,0 +1,2 @@ +# symbolic names for networks, see networks(5) for more information +link-local 169.254.0.0 diff -Nru base-files-4.0.4/share/profile base-files-4.0.4ubuntu1/share/profile --- base-files-4.0.4/share/profile 2006-10-28 15:42:16.000000000 +0200 +++ base-files-4.0.4ubuntu1/share/profile 2008-05-19 00:44:18.000000000 +0200 @@ -1,15 +1,21 @@ # /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). -if [ "`id -u`" -eq 0 ]; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -else - PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" +if [ -d /etc/profile.d ]; then + for i in /etc/profile.d/*.sh; do + if [ -r $i ]; then + . $i + fi + done + unset i fi if [ "$PS1" ]; then if [ "$BASH" ]; then PS1='\u@\h:\w\$ ' + if [ -f /etc/bash.bashrc ]; then + . /etc/bash.bashrc + fi else if [ "`id -u`" -eq 0 ]; then PS1='# ' @@ -19,6 +25,4 @@ fi fi -export PATH - umask 022 diff -Nru base-files-4.0.4/share/profile.md5sums base-files-4.0.4ubuntu1/share/profile.md5sums --- base-files-4.0.4/share/profile.md5sums 1970-01-01 01:00:00.000000000 +0100 +++ base-files-4.0.4ubuntu1/share/profile.md5sums 2008-08-08 10:04:37.000000000 +0200 @@ -0,0 +1,5 @@ +61a3f85a2dc30f4e920f615109137be5 +9519666d98e08940df6f25dcf4598bef +9a279ae6bdd1251f64b7e70e960ef00d +b59ea6ac3a1ad8c0527ec94f73bafca0 +c3a1d42cddcc565f16b48eb9c2119d9d