← Back to branch summary

~dannf/ubuntu/saucy/screen/lp1213278-from-debian

« back to all changes in this revision

Viewing changes to debian/patches/05fix_osdef_include.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-10-23 17:36:30 UTC
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20071023173630-6q4agogsxuzujhwd
Tags: 4.0.3-7ubuntu1
* Merge with Debian; remaining Ubuntu changes:
  - 07_norootpassword.dpatch: When locking a root-owned screen, check that
    root has a password set. If not, ask for an unlocking key. (LP#6760)
  - debian/preinst: Remove obsolete init script 'screen' on
    upgrades. The script is called 'screen-cleanup' in Debian and thus
    should be called the same in Ubuntu to avoid a permanent and pointless
    delta. This needs to be kept until after the next LTS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05fix_osdef_include.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 05fix_osdef_include.dpatch by  <hesso@pool.math.tu-berlin.de>
 
3
##
 
4
## DP: Add a missing include to get a few prototypes that caused build
 
5
## DP: issues on kfreebsd-amd64. (See #357232)
 
6
 
 
7
@DPATCH@
 
8
--- screen-4.0.3.orig/osdef.h.in
 
9
+++ screen-4.0.3/osdef.h.in
 
10
@@ -107,6 +107,7 @@
 
11
 extern char *tgoto __P((char *, int, int));
 
12
 
 
13
 #ifdef POSIX
 
14
+#include <string.h>
 
15
 extern int   setsid __P((void));
 
16
 extern int   setpgid __P((int, int));
 
17
 extern int   tcsetpgrp __P((int, int));