update to last Debian upload. Dumbass Debian maintainer forgets to check

stuff in.

5 files changed, 40 insertions, 26 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 53bac4647..fd3919ead 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,15 +1,12 @@
 
+The script mksnapshot will automatically download a new snapshot
+from the uClibc CVS server.
 
+Notes on Build-Depends:
 
-Notes about building:
+  kernel-headers | kernel-headers-2.4.10 autobuilt on i386 and powerpc
 
-The script mksnapshot will automatically download a new snapshot
-from the uClibc CVS server.  This uses the uclinux.org anonymous
-CVS repository, which is a read-only mirror of the actual upstream
-repository.
+  kernel-headers-2.4 autobuilt on xxx
 
-Building depends on the kernel-source-2.4.18 package.  Doing this
-is really the most convenient way of getting kernel headers, and
-it works consistently on all architectures.
 
 
diff --git a/debian/changelog b/debian/changelog
index 58239b31d..35fcebfb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,29 @@
+uclibc (0.9.12-2) unstable; urgency=low
+
+  * Make sure MAS_MMU=true on m68k
+
+ -- David Schleef <ds@schleef.org>  Thu, 27 Jun 2002 15:04:59 -0700
+
+uclibc (0.9.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Attempt to fix MIPS build again. (Closes: #150313)
+
+ -- David Schleef <ds@schleef.org>  Mon, 24 Jun 2002 16:26:18 -0700
+
+uclibc (0.9.11-cvs20020619-1) unstable; urgency=low
+
+  * This is an automatic snapshot of uClibc CVS
+  * new snapshot
+  * MIPS build should have been fixed in the last entry, which
+    was not actually uploaded (Closes: #150313).
+
+ -- David Schleef <ds@schleef.org>  Wed, 19 Jun 2002 11:45:59 -0700
+
 uclibc (0.9.11-cvs20020420-1) unstable; urgency=low
 
   * Many of the configs have broken CROSS definitions.  Compensate
     for that in debian/rules.
-  * Install more documentation
 
  -- David Schleef <ds@schleef.org>  Sat, 20 Apr 2002 15:40:39 -0700
 
diff --git a/debian/docs b/debian/docs
index 5460d353e..724e08449 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,6 +1,2 @@
 README
 TODO
-Changelog.full
-BUGS
-docs/threads.txt
-docs/uclibc.org/
diff --git a/debian/mksnapshot b/debian/mksnapshot
index 86795b448..7a8c8d475 100755
--- a/debian/mksnapshot
+++ b/debian/mksnapshot
@@ -3,21 +3,18 @@
 
 topdir=$(pwd)
 today=$(date +%Y%m%d)
-version=0.9.11
+version=0.9.12
 dir=uclibc-${version}-cvs${today}
 
 mkdir -p ${topdir}/uclibc-tmp
 cd ${topdir}/uclibc-tmp
 
-if [ "$(whoami)" = "ds" ];then
-	export CVSROOT='ds@cvs.uclibc.org:/var/cvs'
-else
-	export CVSROOT=':pserver:anonymous@cvs.uclibc.org:/var/cvs'
-	if ! grep -q '^.pserver.anonymous.cvs.uclibc.org..var.cvs' ~/.cvspass
-	then
-		echo "$CVSROOT" 'Ay=0=a%0bZ' >>~/.cvspass
-	fi
+export CVSROOT=':pserver:anonymous@cvs.uclibc.org:/var/cvs'
+if ! grep -q '^.pserver.anonymous.cvs.uclibc.org..var.cvs' ~/.cvspass
+then
+	echo "$CVSROOT" 'A' >>~/.cvspass
 fi
+#export CVSROOT='ds@cvs.uclibc.org:/var/cvs'
 
 cvs co -d ${dir} uClibc
 
diff --git a/debian/rules b/debian/rules
index 36777ee55..7595b8ba8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ major=$(shell grep '^MAJOR_VERSION' Rules.mak|sed 's/.*=//')
 minor=$(shell grep '^MINOR_VERSION' Rules.mak|sed 's/.*=//')
 version:=$(strip $(major)).$(strip $(minor))
 
-kernel_source=kernel-source-2.4.18
+kernel_version=2.4.18
+kernel_source=kernel-source-$(kernel_version)
 
 target=$(DEB_HOST_GNU_CPU)
 #target=arm
@@ -77,15 +78,16 @@ build-stamp: debian/control
 	# Various stupid programs use linux/version.h to find the
 	# Linux version.
 	( \
-		echo '#define UTS_RELEASE "2.4.16"' \
-		echo '#define LINUX_VERSION_CODE 132112' \
-		echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' \
+		echo '#define UTS_RELEASE "$(kernel_version)"'; \
+		echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \
+		echo '#define LINUX_VERSION_CODE KERNEL_VERSION($(shell echo $(kernel_version) | sed s/\\./,/g))'; \
 	) >$(kernel_source)/include/linux/version.h
 
 	extra/Configs/uClibc_config_fix.pl \
 		--arch=$(target) \
 		$(cross_options) \
 		--devel_prefix=/usr/$(target)-linux-uclibc \
+		--system_devel_prefix=/usr \
 		--kernel_dir=`pwd`/$(kernel_source) \
 		--large_file=true \
 		--rpc_support=true \
@@ -94,6 +96,7 @@ build-stamp: debian/control
 		--long_long=true \
 		--float=true \
 		--shadow=true \
+		--mmu=true \
 		--ldso_path="/lib" \
 		--shared_support=$(shared_libs_true) \
 		--file=$(config_orig) \