[Pkg-uml-commit] r272 - in trunk/src/user-mode-linux/debian: . patches

[Mattia Dongili]

Author: malattia
Date: 2007-05-07 09:38:28 +0000 (Mon, 07 May 2007)
New Revision: 272

Removed:
   trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch
Modified:
   trunk/src/user-mode-linux/debian/changelog
   trunk/src/user-mode-linux/debian/patches/00list
Log:
Removed 04_include_PAGESHIFT_definition.patch, included upstream


Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog	2007-05-07 04:15:58 UTC (rev 271)
+++ trunk/src/user-mode-linux/debian/changelog	2007-05-07 09:38:28 UTC (rev 272)
@@ -4,6 +4,7 @@
   * Build against 2.6.20 which _is_ in the archive (Closes: #422398)
   * Included more crypto algorithms [Stefano Melchior] (Closes: #410597)
   * Configured more and more options (Closes: #416517) (Closes: #422145)
+  * Removed 04_include_PAGESHIFT_definition.patch, included upstream
 
  -- Mattia Dongili <malattia at debian.org>  Mon, 07 May 2007 12:20:55 +0900
 

Modified: trunk/src/user-mode-linux/debian/patches/00list
===================================================================
--- trunk/src/user-mode-linux/debian/patches/00list	2007-05-07 04:15:58 UTC (rev 271)
+++ trunk/src/user-mode-linux/debian/patches/00list	2007-05-07 09:38:28 UTC (rev 272)
@@ -1,3 +1,2 @@
 02_x-terminal-emulator.dpatch
 03_uml_switch.diff
-04_include_PAGESHIFT_definition.patch

Deleted: trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch	2007-05-07 04:15:58 UTC (rev 271)
+++ trunk/src/user-mode-linux/debian/patches/04_include_PAGESHIFT_definition.patch	2007-05-07 09:38:28 UTC (rev 272)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_include_PAGESHIFT_definition - Mattia Dongili <malattia at debian.org>
-## as per file name
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Debian's standard location for uml_net helper
-
- at DPATCH@
-
-# Author: malattia
-# Status: none
-
---- linux-source-2.6.18/arch/um/os-Linux/skas/process.c	2006-09-20 05:42:06.000000000 +0200
-+++ linux-source-2.6.18/arch/um/os-Linux/skas/process.c.clean	2006-11-04 20:20:41.764186563 +0100
-@@ -16,6 +16,7 @@
- #include <sys/user.h>
- #include <sys/time.h>
- #include <asm/unistd.h>
-+#include <asm/page.h>
- #include <asm/types.h>
- #include "user.h"
- #include "sysdep/ptrace.h"