diff -u vim-7.1/debian/changelog vim-7.1/debian/changelog
--- vim-7.1/debian/changelog
+++ vim-7.1/debian/changelog
@@ -1,3 +1,13 @@
+vim (1:7.1-000+1ubuntu2) feisty; urgency=low
+
+  * patches/screen-mouse-support.diff:
+    - Enable detection of GNU screen as a mouse-capable terminal
+      (closes: #113227)
+  * patches/proc-filetype-detection-fix.diff:
+    - Fix detection of files of type Oracle ProC (closes: #86916)
+
+ -- Micah Cowan <micahcowan@ubuntu.com>  Sat, 23 Jun 2007 18:05:14 -0700
+
 vim (1:7.1-000+1ubuntu1) gutsy; urgency=low
 
   * Resynchronise with Debian. Remaining changes:
diff -u vim-7.1/patches/series vim-7.1/patches/series
--- vim-7.1/patches/series
+++ vim-7.1/patches/series
@@ -17,0 +18,2 @@
+screen-mouse-support.diff -p0
+proc-filetype-detection-fix.diff -p0
only in patch2:
unchanged:
--- vim-7.1.orig/.pc/.version
+++ vim-7.1/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- vim-7.1.orig/patches/screen-mouse-support.diff
+++ vim-7.1/patches/screen-mouse-support.diff
@@ -0,0 +1,57 @@
+Index: vim/src/os_unix.c
+===================================================================
+--- vim/src/os_unix.c.orig
++++ vim/src/os_unix.c
+@@ -2034,6 +2034,21 @@
+ 		|| STRCMP(name, "builtin_xterm") == 0);
+ }
+ 
++/*
++ * Return TRUE if "name" appears to be that of a terminal
++ * known to support the xterm-style mouse protocol.
++ * Relies on term_is_xterm having been set to its correct value.
++ */
++    int
++vim_uses_xterm_mouse(name)
++    char_u *name;
++{
++    if (name == NULL)
++	return FALSE;
++    return (term_is_xterm
++		|| STRNICMP(name, "screen", 6) == 0);
++}
++
+ #if defined(FEAT_MOUSE_TTY) || defined(PROTO)
+ /*
+  * Return non-zero when using an xterm mouse, according to 'ttymouse'.
+Index: vim/src/term.c
+===================================================================
+--- vim/src/term.c.orig
++++ vim/src/term.c
+@@ -1601,6 +1601,9 @@
+     int		try;
+     int		termcap_cleared = FALSE;
+ #endif
++#if defined(UNIX) || defined(VMS)
++    int		term_uses_xterm_mouse;
++#endif
+     int		width = 0, height = 0;
+     char_u	*error_msg = NULL;
+     char_u	*bs_p, *del_p;
+@@ -1903,6 +1906,7 @@
+ 
+ #if defined(UNIX) || defined(VMS)
+     term_is_xterm = vim_is_xterm(term);
++    term_uses_xterm_mouse = vim_uses_xterm_mouse(term);
+ #endif
+ 
+ #ifdef FEAT_MOUSE
+@@ -1923,7 +1927,7 @@
+ #    endif
+ 	    clip_init(FALSE);
+ #   endif
+-	if (term_is_xterm)
++	if (term_uses_xterm_mouse)
+ 	{
+ 	    if (use_xterm_mouse())
+ 		p = NULL;	/* keep existing value, might be "xterm2" */
only in patch2:
unchanged:
--- vim-7.1.orig/patches/proc-filetype-detection-fix.diff
+++ vim-7.1/patches/proc-filetype-detection-fix.diff
@@ -0,0 +1,13 @@
+Index: vim/runtime/filetype.vim
+===================================================================
+--- vim/runtime/filetype.vim.orig
++++ vim/runtime/filetype.vim
+@@ -1286,7 +1286,7 @@
+ au BufNewFile,BufRead *.it,*.ih			setf ppwiz
+ 
+ " Oracle Pro*C/C++
+-au BufNewFile,BufRead .pc			setf proc
++au BufNewFile,BufRead *.pc			setf proc
+ 
+ " Privoxy actions file
+ au BufNewFile,BufRead *.action			setf privoxy