summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2013-06-17 04:23:44 -0700
committerMike Swanson2013-06-17 04:23:44 -0700
commit08adcd84677d41e38aa76e62d9f3c19d33846e54 (patch)
tree86bf7fbaccae1dcaf4c07db7c924352268a42394
parent0ec4e5d539be379b3e52fc7c1b0ac63dff4a62a6 (diff)
downloadaur-08adcd84677d41e38aa76e62d9f3c19d33846e54.tar.gz
Update dosemu-git
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--debianize.patch56
3 files changed, 32 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f69942c9110..2540dd41e14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dosemu-git
pkgdesc = DOS emulator
- pkgver = 20121125
+ pkgver = 20130617
pkgrel = 1
url = http://www.dosemu.org/
arch = i686
@@ -26,7 +26,7 @@ pkgbase = dosemu-git
source = debianize.patch
source = xdosemu.desktop
sha256sums = 8f25916dc7f58e71398820b9bc83987cb39e3cd23a7d2d15a7294b2d42cfbed0
- sha256sums = 9d07462543a6ce35eca7e647c17e1de7193de0a9067b83159aa1f6a18391a6ea
+ sha256sums = 0a75924d81cde89affe8ea0213fe542cfe6204c45bff5fbaae4f5dd11e3ede2d
sha256sums = ae737e26165c016242d5a8603a5c887c313570e1525091b30f9e8d23d1a9faab
pkgname = dosemu-git
diff --git a/PKGBUILD b/PKGBUILD
index db61d8787ca..bf09a66be52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
# Contributor: Bob Finch <w9ya@arrl.net>
pkgname=dosemu-git
-pkgver=20121125
+pkgver=20130617
pkgrel=1
pkgdesc="DOS emulator"
arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ source=(https://dl.dropbox.com/u/13513277/dosemu/dosemu-freedos-1.1-bin.tgz
debianize.patch
xdosemu.desktop)
sha256sums=('8f25916dc7f58e71398820b9bc83987cb39e3cd23a7d2d15a7294b2d42cfbed0'
- '9d07462543a6ce35eca7e647c17e1de7193de0a9067b83159aa1f6a18391a6ea'
+ '0a75924d81cde89affe8ea0213fe542cfe6204c45bff5fbaae4f5dd11e3ede2d'
'ae737e26165c016242d5a8603a5c887c313570e1525091b30f9e8d23d1a9faab')
noextract=('dosemu-freedos-1.1-bin.tgz')
diff --git a/debianize.patch b/debianize.patch
index 51e73ff5cfb..a63db116595 100644
--- a/debianize.patch
+++ b/debianize.patch
@@ -5,25 +5,10 @@ Description: adjust where files are installed, which seems specific to Debian.
Author: Kees Cook <kees@debian.org>
Forwarded: not-needed
-Index: dosemu-1.4.0+svn.2080/src/emu.c
-===================================================================
---- dosemu-1.4.0+svn.2080.orig/src/emu.c 2012-06-16 11:51:59.000000000 -0700
-+++ dosemu-1.4.0+svn.2080/src/emu.c 2012-06-16 11:54:53.960920640 -0700
-@@ -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"
- "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files\n"
-- "COPYING.DOSEMU and COPYING for more details.\n"
-+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the file\n"
-+ "/usr/share/doc/dosemu/copyright for more details.\n"
- "Use this program at your own risk!\n\n";
-
- static char text2[] =
-Index: dosemu-1.4.0+svn.2080/src/arch/linux/Makefile.main
-===================================================================
---- dosemu-1.4.0+svn.2080.orig/src/arch/linux/Makefile.main 2012-06-16 11:51:59.000000000 -0700
-+++ dosemu-1.4.0+svn.2080/src/arch/linux/Makefile.main 2012-06-16 11:54:53.968920748 -0700
+diff --git a/src/arch/linux/Makefile.main b/src/arch/linux/Makefile.main
+index 793c9e2..c25ead3 100644
+--- a/src/arch/linux/Makefile.main
++++ b/src/arch/linux/Makefile.main
@@ -9,7 +9,7 @@
# install DOSEMU.
@@ -33,7 +18,7 @@ Index: dosemu-1.4.0+svn.2080/src/arch/linux/Makefile.main
NET=dosext/net/net
-@@ -196,7 +196,6 @@
+@@ -215,7 +215,6 @@ install:
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) -m 0755 ../bin/$(DOSBIN) $(DESTDIR)$(bindir)
$(INSTALL) -m 0755 ../bin/dosemu $(DESTDIR)$(bindir)
@@ -41,20 +26,35 @@ Index: dosemu-1.4.0+svn.2080/src/arch/linux/Makefile.main
$(INSTALL) -m 0755 ../bin/mkfatimage16 $(DESTDIR)$(bindir)
ifdef USE_SBEMU
$(INSTALL) -m 0755 ../bin/midid $(DESTDIR)$(bindir)
-@@ -211,7 +210,7 @@
+@@ -230,7 +229,7 @@ endif
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 \
+- for i in README.bindist NEWS THANKS COPYING COPYING.DOSEMU BUGS ChangeLog; do \
++ for i in README.bindist NEWS THANKS BUGS ChangeLog; do \
$(INSTALL) -m 0644 $(REALTOPDIR)/$$i $(DESTDIR)$(docdir); \
done
for i in README README-tech dosemu-HOWTO sound-usage DANG EMUfailure \
-Index: dosemu-1.4.0+svn.2080/src/tools/periph/Makefile
-===================================================================
---- dosemu-1.4.0+svn.2080.orig/src/tools/periph/Makefile 2012-06-16 11:51:55.000000000 -0700
-+++ dosemu-1.4.0+svn.2080/src/tools/periph/Makefile 2012-06-16 11:54:53.968920748 -0700
-@@ -11,12 +11,12 @@
+diff --git a/src/emu.c b/src/emu.c
+index 94ffa6a..87c8481 100644
+--- a/src/emu.c
++++ b/src/emu.c
+@@ -248,8 +248,8 @@ void do_liability_disclaimer_prompt(int dosboot, int prompt)
+ ".\nCopyright (C) 1992-2006 the 'DOSEMU-Development-Team'.\n"
+ "This program is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files\n"
+- "COPYING.DOSEMU and COPYING for more details.\n"
++ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the file\n"
++ "/usr/share/doc/dosemu/copyright for more details.\n"
+ "Use this program at your own risk!\n\n";
+
+ static char text2[] =
+diff --git a/src/tools/periph/Makefile b/src/tools/periph/Makefile
+index 4abff44..a7058b4 100644
+--- a/src/tools/periph/Makefile
++++ b/src/tools/periph/Makefile
+@@ -11,12 +11,12 @@ include $(top_builddir)/Makefile.conf
D=$(REALTOPDIR)/etc
IDEST=/var/lib