New upstream git snapshot

Update debian/copyright to point to the git repository.
Sync with upstream:
- debian/patches/14_alloc_params.patch: Remove, merged upstream.
- debian/patches/16_ide_multsect.patch: Likewise.
- debian/patches/05_halt_on_panic_flag.patch: Refresh.

6 files changed, 21 insertions, 98 deletions

diff --git a/debian/changelog b/debian/changelog
index b71a3ff..b9de0ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gnumach (2:1.3.99.dfsg.git20091114-1) UNRELEASED; urgency=low
+
+  * New upstream git snapshot.
+
+  [ Guillem Jover ]
+  * Update debian/copyright to point to the git repository.
+  * Sync with upstream:
+    - debian/patches/14_alloc_params.patch: Remove, merged upstream.
+    - debian/patches/16_ide_multsect.patch: Likewise.
+    - debian/patches/05_halt_on_panic_flag.patch: Refresh.
+
+ -- Guillem Jover <guillem@debian.org>  Sat, 14 Nov 2009 05:33:52 +0100
+
 gnumach (2:1.3.99.dfsg.cvs20090220-2) unstable; urgency=low
 
   [ Guillem Jover ]
diff --git a/debian/copyright b/debian/copyright
index 7801e30..813d368 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,9 @@ This package was originally debianized by Marcus Brinkmann
 It is currently maintained by its upstream authors, who can be reached
 via <bug-hurd@gnu.org>.
 
-It was downloaded from CVS:
+It was downloaded from:
 
-    CVSROOT=:ext:anoncvs@savannah.gnu.org:/cvsroot/hurd
-    BRANCH=gnumach-1-branch
-    cvs -d $CVSROOT co -r $BRANCH gnumach
+    <git://git.sv.gnu.org/hurd/gnumach.git>
 
 License statement:
 
diff --git a/debian/patches/05_halt_on_panic_flag.patch b/debian/patches/05_halt_on_panic_flag.patch
index b14101f..5c4555b 100644
--- a/debian/patches/05_halt_on_panic_flag.patch
+++ b/debian/patches/05_halt_on_panic_flag.patch
@@ -7,8 +7,11 @@
 	argument.
 
 
-Index: b/i386/i386at/model_dep.c
-===================================================================
+---
+ i386/i386at/model_dep.c |    9 +++++++++
+ kern/debug.c            |    6 +++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
 --- a/i386/i386at/model_dep.c
 +++ b/i386/i386at/model_dep.c
 @@ -110,6 +110,10 @@ void		inittodr();	/* forward */
@@ -22,7 +25,7 @@ Index: b/i386/i386at/model_dep.c
  /* XX interrupt stack pointer and highwater mark, for locore.S.  */
  vm_offset_t int_stack_top, int_stack_high;
  
-@@ -394,6 +398,11 @@ void c_boot_entry(vm_offset_t bi)
+@@ -434,6 +438,11 @@ void c_boot_entry(vm_offset_t bi)
  		cninit();		/* need console for debugger */
  		Debugger("init");
  	}
@@ -34,8 +37,6 @@ Index: b/i386/i386at/model_dep.c
  #endif	/* MACH_KDB */
  
  	machine_slot[0].is_cpu = TRUE;
-Index: b/kern/debug.c
-===================================================================
 --- a/kern/debug.c
 +++ b/kern/debug.c
 @@ -126,6 +126,10 @@ panic_init(void)
diff --git a/debian/patches/14_alloc_params.patch b/debian/patches/14_alloc_params.patch
deleted file mode 100644
index 08edede..0000000
--- a/debian/patches/14_alloc_params.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-2009-06-11  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* i386/i386at/model_dep.c (mem_size_init): Reserve 128MiB for virtual
-	memory space, to make room for the zalloc area.
-
-2008-12-29  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* kern/zalloc.c (zone_map_size): Increase from 12 to 64 MiB.
-
-2007-12-30  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* vm/vm_map.h (VM_MAP_COPY_PAGE_LIST_MAX): Increase to 64.
-
-2007-08-20  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* vm/vm_object.c (vm_object_cached_max): Increase from 200 to 4000.
-
-Index: b/kern/zalloc.c
-===================================================================
---- a/kern/zalloc.c
-+++ b/kern/zalloc.c
-@@ -105,7 +105,7 @@ zone_t		zone_zone;	/* this is the zone c
- boolean_t	zone_ignore_overflow = TRUE;
- 
- vm_map_t	zone_map = VM_MAP_NULL;
--vm_size_t	zone_map_size = 12 * 1024 * 1024;
-+vm_size_t	zone_map_size = 64 * 1024 * 1024;
- 
- /*
-  *	The VM system gives us an initial chunk of memory.
-Index: b/vm/vm_object.c
-===================================================================
---- a/vm/vm_object.c
-+++ b/vm/vm_object.c
-@@ -179,7 +179,7 @@ vm_object_t	kernel_object;
-  */
- queue_head_t	vm_object_cached_list;
- int		vm_object_cached_count;
--int		vm_object_cached_max = 200;	/* may be patched*/
-+int		vm_object_cached_max = 4000;	/* may be patched*/
- 
- decl_simple_lock_data(,vm_object_cached_lock_data)
- 
-Index: b/vm/vm_map.h
-===================================================================
---- a/vm/vm_map.h
-+++ b/vm/vm_map.h
-@@ -226,7 +226,7 @@ typedef struct vm_map_version {
-  *		(returned) and an abort flag (abort if TRUE).
-  */
- 
--#define VM_MAP_COPY_PAGE_LIST_MAX	8
-+#define VM_MAP_COPY_PAGE_LIST_MAX	64
- 
- typedef struct vm_map_copy {
- 	int			type;
-Index: b/i386/i386at/model_dep.c
-===================================================================
---- a/i386/i386at/model_dep.c	10 Nov 2008 15:18:47 -0000	1.9.2.19
-+++ b/i386/i386at/model_dep.c	11 Jun 2009 00:32:30 -0000
-@@ -231,10 +232,10 @@ mem_size_init(void)
- 	printf("AT386 boot: physical memory from 0x%x to 0x%x\n",
- 	       phys_first_addr, phys_last_addr);
- 
--	/* Reserve 1/16 of the memory address space for virtual mappings.
-+	/* Reserve 1/8 of the memory address space for virtual mappings.
- 	 * Yes, this loses memory.  Blame i386.  */
--	if (phys_last_addr > (VM_MAX_KERNEL_ADDRESS / 16) * 15)
--		phys_last_addr = (VM_MAX_KERNEL_ADDRESS / 16) * 15;
-+	if (phys_last_addr > (VM_MAX_KERNEL_ADDRESS / 8) * 7)
-+		phys_last_addr = (VM_MAX_KERNEL_ADDRESS / 8) * 7;
- 
- 	phys_first_addr = round_page(phys_first_addr);
- 	phys_last_addr = trunc_page(phys_last_addr);
diff --git a/debian/patches/16_ide_multsect.patch b/debian/patches/16_ide_multsect.patch
deleted file mode 100644
index b12f7ff..0000000
--- a/debian/patches/16_ide_multsect.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/linux/src/drivers/block/ide.h
-===================================================================
---- a/linux/src/drivers/block/ide.h
-+++ b/linux/src/drivers/block/ide.h
-@@ -23,7 +23,7 @@
-  * REALLY_SLOW_IO can be defined in ide.c and ide-cd.c, if necessary
-  */
- #undef REALLY_FAST_IO			/* define if ide ports are perfect */
--#define INITIAL_MULT_COUNT	0	/* off=0; on=2,4,8,16,32, etc.. */
-+#define INITIAL_MULT_COUNT	16	/* off=0; on=2,4,8,16,32, etc.. */
- 
- #ifndef SUPPORT_SLOW_DATA_PORTS		/* 1 to support slow data ports */
- #define SUPPORT_SLOW_DATA_PORTS	1	/* 0 to reduce kernel size */
diff --git a/debian/patches/series b/debian/patches/series
index 5e0fce4..3a9681f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,9 +3,7 @@
 10_cdromlock.patch
 12_sis900.patch
 13_ide_dma.patch
-14_alloc_params.patch
 15_mem_obj_proxy.patch
-16_ide_multsect.patch
 20_xmm_support.patch
 24_pci_irq_fix.patch
 40_iopl_mmap.patch