diff -Nru basilisk2-0.9.20120331/debian/changelog basilisk2-0.9.20120331/debian/changelog --- basilisk2-0.9.20120331/debian/changelog 2012-06-14 17:35:15.000000000 +0000 +++ basilisk2-0.9.20120331/debian/changelog 2012-06-25 21:20:39.000000000 +0000 @@ -1,9 +1,17 @@ -basilisk2 (0.9.20120331-1ubuntu1) quantal; urgency=low +basilisk2 (0.9.20120331-2) unstable; urgency=low - * Make installing the -jit binary and manpage contingent on it being - built (which it isn't on non-x86). Fixes FTBFS. + [ Giulio Paci ] + * Check installed binaries before installing alternatives in postinst. + * Remove manpages file. + * Do not install jit flavour binary by default. + * Update rules with conditional installation of jit flavour files. + * Fix compilation on kfreebsd architectures. + + [ Jonas Smedegaard ] + * Really add Jérémy Lal as uploader and permit Debian Maintainers to + upload. - -- Ben Collins Thu, 14 Jun 2012 13:34:37 -0400 + -- Jonas Smedegaard Mon, 25 Jun 2012 23:17:58 +0200 basilisk2 (0.9.20120331-1) unstable; urgency=low diff -Nru basilisk2-0.9.20120331/debian/control basilisk2-0.9.20120331/debian/control --- basilisk2-0.9.20120331/debian/control 2012-06-14 17:35:35.000000000 +0000 +++ basilisk2-0.9.20120331/debian/control 2012-06-25 21:22:33.000000000 +0000 @@ -1,8 +1,7 @@ Source: basilisk2 Section: contrib/otherosfs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jonas Smedegaard +Maintainer: Jonas Smedegaard Uploaders: Giulio Paci , Jérémy Lal DM-Upload-Allowed: yes diff -Nru basilisk2-0.9.20120331/debian/copyright_hints basilisk2-0.9.20120331/debian/copyright_hints --- basilisk2-0.9.20120331/debian/copyright_hints 2012-05-19 00:03:10.000000000 +0000 +++ basilisk2-0.9.20120331/debian/copyright_hints 2012-06-25 21:18:30.000000000 +0000 @@ -184,8 +184,8 @@ debian/gbp.conf debian/install debian/lintian-overrides - debian/manpages debian/menu + debian/patches/0001_fix_compilation_on_kfreebsd.patch debian/patches/1001_warning_fix.patch debian/patches/1002_documentation_fix.patch debian/patches/1003_avoid_undefined_HAVE_SIGSEGV_RECOVERY_1.patch @@ -628,21 +628,6 @@ License: GPL-2+ FIXME -Files: COPYING -Copyright: 1989, 1991 Free Software Foundation, Inc - 19yy - 19yy name of author - HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR - HOLDERS AND/OR OTHER PARTIES - disclaimer" for the program, if - holder saying it may be distributed - holder who places the Program under this License - interest in the program - law: - the software, and -License: GPL-2+ - FIXME - Files: debian/rules Copyright: 2003-2008, 2010, 2012, Jonas Smedegaard 2012, Giulio Paci @@ -669,6 +654,21 @@ License: GPL-2+ FIXME +Files: COPYING +Copyright: 1989, 1991 Free Software Foundation, Inc + 19yy + 19yy name of author + HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + HOLDERS AND/OR OTHER PARTIES + disclaimer" for the program, if + holder saying it may be distributed + holder who places the Program under this License + interest in the program + law: + the software, and +License: GPL-ever + FIXME + Files: src/slirp/bootp.c Copyright: 2004, Fabrice Bellard HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER diff -Nru basilisk2-0.9.20120331/debian/install basilisk2-0.9.20120331/debian/install --- basilisk2-0.9.20120331/debian/install 2012-06-14 17:33:53.000000000 +0000 +++ basilisk2-0.9.20120331/debian/install 2012-06-25 20:36:37.000000000 +0000 @@ -1,2 +1,2 @@ -debian/BasiliskIIGUI-0.xpm usr/share/BasiliskII/ -debian/tmp-nojit/usr/bin/BasiliskII-nojit usr/bin +debian/BasiliskIIGUI-0.xpm usr/share/BasiliskII/ +debian/tmp-nojit/usr/bin/BasiliskII-nojit usr/bin \ No newline at end of file diff -Nru basilisk2-0.9.20120331/debian/patches/0001_fix_compilation_on_kfreebsd.patch basilisk2-0.9.20120331/debian/patches/0001_fix_compilation_on_kfreebsd.patch --- basilisk2-0.9.20120331/debian/patches/0001_fix_compilation_on_kfreebsd.patch 1970-01-01 00:00:00.000000000 +0000 +++ basilisk2-0.9.20120331/debian/patches/0001_fix_compilation_on_kfreebsd.patch 2012-06-25 20:38:03.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Fix compilation on kfreebsd architectures +Author: Giulio Paci +Origin: upstream, http://www.cebix.net/viewcvs/cebix/BasiliskII/src/Unix/configure.ac?revision=1.84&view=markup http://www.cebix.net/viewcvs/cebix/BasiliskII/src/Unix/sshpty.c?revision=1.7&view=markup +Forwarded: not-needed +Last-Update: 2012-06-19 + +--- a/src/Unix/configure.ac ++++ b/src/Unix/configure.ac +@@ -429,6 +429,7 @@ + ]) + AC_CHECK_HEADERS(AvailabilityMacros.h) + AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h) ++AC_CHECK_HEADERS(sys/stropts.h stropts.h) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_BIGENDIAN +--- a/src/Unix/sshpty.c ++++ b/src/Unix/sshpty.c +@@ -73,6 +73,10 @@ + #define fatal(x) do { printf("Fatal error: %s", x); return 0; } while(0) + #endif /* not in BasiliskII */ + ++#define mysig_t sig_t ++#define mysignal signal ++#include ++ + /* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */ + #if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY) + #undef HAVE_DEV_PTMX +@@ -84,6 +88,9 @@ + #if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H) + # include + #endif ++#if defined(HAVE_DEV_PTMX) && defined(HAVE_STROPTS_H) ++# include ++#endif + + #ifndef O_NOCTTY + #define O_NOCTTY 0 diff -Nru basilisk2-0.9.20120331/debian/patches/series basilisk2-0.9.20120331/debian/patches/series --- basilisk2-0.9.20120331/debian/patches/series 2012-05-17 23:17:58.000000000 +0000 +++ basilisk2-0.9.20120331/debian/patches/series 2012-06-25 20:36:37.000000000 +0000 @@ -3,3 +3,4 @@ 2001_avoid_stripping_binaries.patch 2002_change_makefile_in_to_enable_multiple_builds.patch 2003_allow_configure_script_building.patch +0001_fix_compilation_on_kfreebsd.patch diff -Nru basilisk2-0.9.20120331/debian/postinst basilisk2-0.9.20120331/debian/postinst --- basilisk2-0.9.20120331/debian/postinst 2012-03-23 00:09:45.000000000 +0000 +++ basilisk2-0.9.20120331/debian/postinst 2012-06-25 20:36:37.000000000 +0000 @@ -2,16 +2,22 @@ set -e case "$1" in configure) - update-alternatives \ - --install /usr/bin/BasiliskII \ - BasiliskII /usr/bin/BasiliskII-jit 50 \ - --slave /usr/share/man/man1/BasiliskII.1.gz \ - BasiliskII.1.gz /usr/share/man/man1/BasiliskII-jit.1.gz - update-alternatives \ - --install /usr/bin/BasiliskII \ - BasiliskII /usr/bin/BasiliskII-nojit 100 \ - --slave /usr/share/man/man1/BasiliskII.1.gz \ - BasiliskII.1.gz /usr/share/man/man1/BasiliskII-nojit.1.gz + if [ -x /usr/bin/BasiliskII-jit ] + then + update-alternatives \ + --install /usr/bin/BasiliskII \ + BasiliskII /usr/bin/BasiliskII-jit 50 \ + --slave /usr/share/man/man1/BasiliskII.1.gz \ + BasiliskII.1.gz /usr/share/man/man1/BasiliskII-jit.1.gz + fi + if [ -x /usr/bin/BasiliskII-nojit ] + then + update-alternatives \ + --install /usr/bin/BasiliskII \ + BasiliskII /usr/bin/BasiliskII-nojit 100 \ + --slave /usr/share/man/man1/BasiliskII.1.gz \ + BasiliskII.1.gz /usr/share/man/man1/BasiliskII-nojit.1.gz + fi ;; esac diff -Nru basilisk2-0.9.20120331/debian/rules basilisk2-0.9.20120331/debian/rules --- basilisk2-0.9.20120331/debian/rules 2012-06-14 17:33:59.000000000 +0000 +++ basilisk2-0.9.20120331/debian/rules 2012-06-25 20:36:37.000000000 +0000 @@ -20,14 +20,9 @@ DEB_SRCDIR = src/Unix DEB_BUILDDIR = build DEB_MAKE_FLAVORS = nojit -DEB_INSTALL_MANPAGES = debian/tmp-nojit/usr/share/man/man1/BasiliskII-nojit.1 # add JIT compiler when supported -ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH)),) -DEB_MAKE_FLAVORS += jit -DEB_INSTALL_MANPAGES += debian/tmp-jit/usr/share/man/man1/BasiliskII-jit.1 -DEB_DH_INSTALL_ARGS += debian/tmp-jit/usr/bin/BasiliskII-jit usr/bin -endif +DEB_MAKE_FLAVORS += $(if $(filter amd64 i386,$(DEB_HOST_ARCH)),jit) DEB_AUTO_UPDATE_ACLOCAL = 1.11 DEB_ACLOCAL_ARGS = -I m4 @@ -61,6 +56,10 @@ DEB_INSTALL_DOCS_ALL += TECH DEB_INSTALL_CHANGELOGS_ALL = debian/ChangeLog.cvs +DEB_INSTALL_MANPAGES_ALL = debian/tmp-nojit/usr/share/man/man1/BasiliskII-nojit.1 +# Add jit flavour files when compiled +DEB_INSTALL_MANPAGES_ALL += $(if $(filter jit,$(DEB_MAKE_FLAVORS)),debian/tmp-jit/usr/share/man/man1/BasiliskII-jit.1) +DEB_DH_INSTALL_ARGS = $(if $(filter jit,$(DEB_MAKE_FLAVORS)),debian/tmp-jit/usr/bin/BasiliskII-jit usr/bin) DEB_INSTALL_EXAMPLES_basilisk2 = $(DEB_SRCDIR)/Linux/* $(DEB_SRCDIR)/tunconfig