diff -Nurp dosemu-1.4.0+svn.1828/debian/changelog dosemu-1.4.0+svn.1828.new/debian/changelog --- dosemu-1.4.0+svn.1828/debian/changelog 2008-11-11 00:56:32.000000000 +0100 +++ dosemu-1.4.0+svn.1828.new/debian/changelog 2008-11-11 00:44:39.000000000 +0100 @@ -1,3 +1,10 @@ +dosemu (1.4.0+svn.1828-2ubuntu2) jaunty; urgency=low + + * Added /etc/sysctl.d/90-dosemu.sysctl.conf (LP: #216398) + * debian/patches/01_debianize.diff: Updated. + + -- Pablo Castellano Sat, 08 Nov 2008 18:33:29 +0100 + dosemu (1.4.0+svn.1828-2ubuntu1) intrepid; urgency=low * Rebuild for libgpmg1 -> libgpm2 transistion. diff -Nurp dosemu-1.4.0+svn.1828/debian/patches/01_debianize.diff dosemu-1.4.0+svn.1828.new/debian/patches/01_debianize.diff --- dosemu-1.4.0+svn.1828/debian/patches/01_debianize.diff 2008-11-11 00:56:32.000000000 +0100 +++ dosemu-1.4.0+svn.1828.new/debian/patches/01_debianize.diff 2008-11-11 00:44:27.000000000 +0100 @@ -1,19 +1,31 @@ Install dosemu binaries in /usr/lib, not in /usr/share. Don't install COPYING and COPYING.DOSEMU. ---- ../orig/dosemu-1.4.0/src/arch/linux/Makefile.main 2007-05-04 16:18:48.000000000 +0200 -+++ src/arch/linux/Makefile.main 2007-05-30 08:55:54.000000000 +0200 -@@ -10,7 +10,7 @@ +diff -Nur -x '*.orig' -x '*~' dosemu-1.4.0+svn.1828/src/arch/linux/Makefile.main dosemu-1.4.0+svn.1828.new/src/arch/linux/Makefile.main +--- dosemu-1.4.0+svn.1828/src/arch/linux/Makefile.main 2008-11-08 15:42:01.000000000 +0100 ++++ dosemu-1.4.0+svn.1828.new/src/arch/linux/Makefile.main 2008-11-08 15:48:26.000000000 +0100 +@@ -9,7 +9,7 @@ + # install DOSEMU. - TMP = $(abs_top_builddir)/tmp SYS = ../commands -dosemudir = $(datadir)/dosemu +dosemudir = $(libdir)/dosemu NET=dosext/net/net ---- ../orig/dosemu-1.4.0.orig/src/emu.c 2007-05-04 07:59:48.000000000 +0200 -+++ src/emu.c 2007-05-30 10:46:00.000000000 +0200 +@@ -215,7 +215,7 @@ + fi; \ + done + $(INSTALL) -d $(DESTDIR)$(docdir) +- for i in README.bindist NEWS THANKS COPYING COPYING.DOSEMU; do \ ++ for i in README.bindist NEWS THANKS; do \ + $(INSTALL) -m 0644 $(REALTOPDIR)/$$i $(DESTDIR)$(docdir); \ + done + for i in README README-tech dosemu-HOWTO sound-usage DANG EMUfailure \ +Binary files dosemu-1.4.0+svn.1828/src/arch/linux/.Makefile.main.swp and dosemu-1.4.0+svn.1828.new/src/arch/linux/.Makefile.main.swp differ +diff -Nur -x '*.orig' -x '*~' dosemu-1.4.0+svn.1828/src/emu.c dosemu-1.4.0+svn.1828.new/src/emu.c +--- dosemu-1.4.0+svn.1828/src/emu.c 2008-11-08 15:42:02.000000000 +0100 ++++ dosemu-1.4.0+svn.1828.new/src/emu.c 2008-11-08 15:46:52.000000000 +0100 @@ -245,8 +245,8 @@ ".\nCopyright (C) 1992-2006 the 'DOSEMU-Development-Team'.\n" "This program is distributed in the hope that it will be useful,\n" @@ -25,14 +37,3 @@ Don't install COPYING and COPYING.DOSEMU "Use this program at your own risk!\n\n"; static char text2[] = ---- ../orig/dosemu-1.4.0+svn.1828.orig/src/arch/linux/Makefile.main 2007-06-03 06:06:39.000000000 +0200 -+++ src/arch/linux/Makefile.main 2007-06-19 12:40:20.000000000 +0200 -@@ -213,7 +213,7 @@ - fi; \ - done - $(INSTALL) -d $(DESTDIR)$(docdir) -- for i in README.bindist NEWS THANKS COPYING COPYING.DOSEMU; do \ -+ for i in README.bindist NEWS THANKS; do \ - $(INSTALL) -m 0644 $(REALTOPDIR)/$$i $(DESTDIR)$(docdir); \ - done - for i in README README-tech dosemu-HOWTO sound-usage DANG EMUfailure \ diff -Nurp dosemu-1.4.0+svn.1828/etc/90-dosemu.sysctl.conf dosemu-1.4.0+svn.1828.new/etc/90-dosemu.sysctl.conf --- dosemu-1.4.0+svn.1828/etc/90-dosemu.sysctl.conf 1970-01-01 01:00:00.000000000 +0100 +++ dosemu-1.4.0+svn.1828.new/etc/90-dosemu.sysctl.conf 2008-11-11 00:44:27.000000000 +0100 @@ -0,0 +1,3 @@ +# Dosemu needs to access the bottom 64k of memory in order to launch +# 16 bit programs. +vm.mmap_min_addr = 0 diff -Nurp dosemu-1.4.0+svn.1828/src/arch/linux/Makefile.main dosemu-1.4.0+svn.1828.new/src/arch/linux/Makefile.main --- dosemu-1.4.0+svn.1828/src/arch/linux/Makefile.main 2007-06-03 06:06:39.000000000 +0200 +++ dosemu-1.4.0+svn.1828.new/src/arch/linux/Makefile.main 2008-11-11 00:44:27.000000000 +0100 @@ -189,6 +189,8 @@ install: $(INSTALL) -m 0644 $(REALTOPDIR)/etc/dosemu.users.example $(DESTDIR)$(sysconfdir)/dosemu.users; \ $(INSTALL) -m 0644 $(REALTOPDIR)/etc/global.conf $(DESTDIR)$(sysconfdir); \ fi + $(INSTALL) -d $(DESTDIR)etc/sysctl.d + $(INSTALL) -m 0644 $(REALTOPDIR)/etc/90-dosemu.sysctl.conf $(DESTDIR)etc/sysctl.d/ $(INSTALL) -d $(DESTDIR)$(dosemudir)/keymap for i in $(REALTOPDIR)/etc/keymap/*; do \ if [ -f $$i ]; then \