freeze exception for mol 0.9.72.1~dfsg-2 (fixes RC bug #445359)
Hi
I'd like to request a freeze exception for Mac-on-Linux. The relevant
source package is mol with three binary packages (mol, mol-source and
mol-modules-source).
This upload fixes one reported RC Bug in mol-source and another
unreported FTBS bug (missing build dependencies). This upload is needed
to reenable the build of the mol kernel modules with
linux-modules-extra-2.6.
I apologize for this late upload, but the real fix for the RC bug was
blocked by #460667 for quite some time. Now that this bug is fixed it's
again possible to have good support for Mac-on-Linux in lenny.
Below you can see the complete changelog. The changes also include some
changes not related to the actual RC bugs. I'm quite confident that they
don't cause any harm. They were already checked into the SVN repository
but never uploaded because they are merely cosmetical and don't add much
user visible functionality. If it's necessary I could create a lenny
branch which contains only the fixes for the RC bug, the corrected build
dependencies and the translation update. But if possible I'd rather
avoid that.
I also attached the complete diff to the version currently in lenny.
If you have any questions you can either talk the me by mail (please CC
me on list replies as I'm not subscribed to d-r) or talk to Rhonda (Gerfried
Fuchs) in person at DC8 who helped preparing this release.
Thanks for your effort releasing Debian!
Gaudenz
mol (0.9.72.1~dfsg-2) unstable; urgency=low
[Gaudenz Steinlin]
* recommend bzip2 in mol-source
* add Homepage control field
* update debian/copyright
- list individual copyright holders
- add instructions on how to build the repackaged debian source tarball
(previously in REDAME.Debian-source)
* fix FTBFS of mol-source with kernel >= 2.6.24 by applying patches from the
upstream SVN repository (Closes: #445359)
* add /svn/ to the XS-Vcs-Svn control field
* Added x11proto-xext-dev and libxext-dev to build-dependencies
[Jörg Sommer]
* debian/rules:
+ General overhaul. Now it supports DEB_BUILD_OPTIONS=noopt and
sets -g in CFLAGS by default. This is policy conform behaviour.
+ Added the get-orig-target as suggested by the policy.
* debian/control:
+ Removed m4 from the Build-Depends field. It's no longer needed after
the overhault of the rules file.
+ Added me to the uploaders field.
* debian/mol.menu:
+ Adapted to the new menu structure.
* debian/Makefile.mol-source: (the Makefile in the mol-source package)
+ Made make sensible for the return value of the make calls for
build and install the module. (closes: #412756)
* debian/debian.mol-source/rules
+ Removed the kdist_changes, source and diff targets. They are
obsoleted.
[Martin Bagge <brother@bsnet.se>]
* [INTL:sv] Swedish strings for mol debconf (Closes: #491949)
-- Gaudenz Steinlin <gaudenz@debian.org> Fri, 08 Aug 2008 18:38:59 +0200
--
Ever tried. Ever failed. No matter.
Try again. Fail again. Fail better.
~ Samuel Beckett ~
Index: debian/mol-source.dirs
===================================================================
--- debian/mol-source.dirs (Revision 141)
+++ debian/mol-source.dirs (Revision 169)
@@ -1 +0,0 @@
-usr/src
Index: debian/README.Debian-source
===================================================================
--- debian/README.Debian-source (Revision 141)
+++ debian/README.Debian-source (Revision 169)
@@ -1,6 +0,0 @@
-The MOL upstream tarball contains some files which can not be built
-from source within Debian. Therefore the source is splitted into mol,
-mol-modules-macos and mol-modules-macosx.
-
-The split is done with a script which you can find at:
-svn://svn.debian.org/svn/pkg-mol/scripts/trunk/
Index: debian/control
===================================================================
--- debian/control (Revision 141)
+++ debian/control (Revision 169)
@@ -2,10 +2,10 @@
Section: otherosfs
Priority: optional
Maintainer: MOL Packaging Team <pkg-mol-devel@lists.alioth.debian.org>
-Uploaders: Sven Luther <luther@debian.org>, Otavio Salvador <otavio@debian.org>, Gaudenz Steinlin <gaudenz@debian.org>, Aurélien GÉRÔME <ag@roxor.cx>
-Build-Depends: debhelper (>= 5), binutils-dev, bison, docbook-to-man, flex, imagemagick, libasound2-dev, libesd0-dev, libncurses5-dev, po-debconf, libxt-dev, libxxf86dga-dev, dpatch, bzip2, m4, zlib1g-dev, autoconf
+Uploaders: Sven Luther <luther@debian.org>, Otavio Salvador <otavio@debian.org>, Gaudenz Steinlin <gaudenz@debian.org>, Aurélien GÉRÔME <ag@roxor.cx>, Jörg Sommer <joerg@alea.gnuu.de>
+Build-Depends: debhelper (>= 5), binutils-dev, bison, docbook-to-man, flex, imagemagick, libasound2-dev, libesd0-dev, libncurses5-dev, po-debconf, libxt-dev, libxxf86dga-dev, dpatch, bzip2, zlib1g-dev, autoconf, x11proto-xext-dev, libxext-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-mol/mol/trunk
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-mol/mol/trunk
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-mol/mol/trunk
Package: mol
@@ -13,6 +13,7 @@
Depends: debianutils (>= 1.7), mol-drivers, ${misc:Depends}, ${shlibs:Depends}
Recommends: mol-modules
Conflicts: mol-modules-2.4.20 (<= 0.9.69+20030713-1), mol-modules-2.4.21 (<= 0.9.69+20030713-1), mol-drivers-macos (<< 0.9.72.1-1), mol-drivers-macosx (<< 0.9.72.1-1)
+Homepage: http://mac-on-linux.sourceforge.net/
Description: The Mac-on-Linux emulator
.
Mac-on-Linux is a virtual machine capable of running
@@ -31,10 +32,11 @@
Package: mol-source
Architecture: powerpc
Depends: gcc, libc6-dev, make, m4
-Recommends: debhelper, kernel-package
+Recommends: debhelper, kernel-package, bzip2
Suggests: linux-headers | linux-source
Replaces: mol-modules-source
Conflicts: mol-modules-source (<< 0.9.71.dfsg-2)
+Homepage: http://mac-on-linux.sourceforge.net/
Description: The Mac-on-Linux emulator - source for kernel modules
.
Mac-on-Linux is basically an emulator capable of running
Index: debian/mol.dirs
===================================================================
--- debian/mol.dirs (Revision 141)
+++ debian/mol.dirs (Revision 169)
@@ -1,11 +1,3 @@
-etc/mol
-usr/bin
-usr/lib/mol
-usr/share/doc/mol
usr/share/lintian/overrides
-usr/share/man/man1
-usr/share/man/man5
-usr/share/man/man7
usr/share/pixmaps
-var/lib/mol
var/state/mol
Index: debian/changelog
===================================================================
--- debian/changelog (Revision 141)
+++ debian/changelog (Revision 169)
@@ -1,3 +1,46 @@
+mol (0.9.72.1~dfsg-2) unstable; urgency=low
+
+ [Gaudenz Steinlin]
+ * recommend bzip2 in mol-source
+ * add Homepage control field
+ * update debian/copyright
+ - list individual copyright holders
+ - add instructions on how to build the repackaged debian source tarball
+ (previously in REDAME.Debian-source)
+ * fix FTBFS of mol-source with kernel >= 2.6.24 by applying patches from the
+ upstream SVN repository (Closes: #445359)
+ * add /svn/ to the XS-Vcs-Svn control field
+ * Added x11proto-xext-dev and libxext-dev to build-dependencies
+
+ [Jörg Sommer]
+ * debian/rules:
+ + General overhaul. Now it supports DEB_BUILD_OPTIONS=noopt and
+ sets -g in CFLAGS by default. This is policy conform behaviour.
+
+ + Added the get-orig-target as suggested by the policy.
+
+ * debian/control:
+ + Removed m4 from the Build-Depends field. It's no longer needed after
+ the overhault of the rules file.
+
+ + Added me to the uploaders field.
+
+ * debian/mol.menu:
+ + Adapted to the new menu structure.
+
+ * debian/Makefile.mol-source: (the Makefile in the mol-source package)
+ + Made make sensible for the return value of the make calls for
+ build and install the module. (closes: #412756)
+
+ * debian/debian.mol-source/rules
+ + Removed the kdist_changes, source and diff targets. They are
+ obsoleted.
+
+ [Martin Bagge <brother@bsnet.se>]
+ * [INTL:sv] Swedish strings for mol debconf (Closes: #491949)
+
+ -- Gaudenz Steinlin <gaudenz@debian.org> Fri, 08 Aug 2008 18:38:59 +0200
+
mol (0.9.72.1~dfsg-1) unstable; urgency=low
[ Gaudenz Steinlin ]
Index: debian/patches/Makefile_kmod.dpatch
===================================================================
--- debian/patches/Makefile_kmod.dpatch (Revision 141)
+++ debian/patches/Makefile_kmod.dpatch (Revision 169)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile-kmod.dpatch by <gaudenz@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Define variable T in kmod Makefile if not defined
-
-@DPATCH@
-diff -urNad mol-0.9.71~pre8~/src/kmod/Linux/Makefile.26 mol-0.9.71~pre8/src/kmod/Linux/Makefile.26
---- mol-0.9.71~pre8~/src/kmod/Linux/Makefile.26 2005-10-10 03:22:50.000000000 +0200
-+++ mol-0.9.71~pre8/src/kmod/Linux/Makefile.26 2006-08-19 17:56:49.000000000 +0200
-@@ -11,6 +11,7 @@
- PERFOBJS = $(addprefix $(obj)/, $(PERFOBJS_))
- MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(INCLUDES) -D__ASSEMBLY__
-
-+T ?= /tmp
-
- $(obj)/_traps.o: $(src)/asm_offsets.h $(src)/traps.S $(src)/*.S $(src)/*.h
-
Index: debian/patches/fix-manpages.dpatch
===================================================================
--- debian/patches/fix-manpages.dpatch (Revision 0)
+++ debian/patches/fix-manpages.dpatch (Revision 169)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-manpages.dpatch by Jörg Sommer <joerg@alea.gnuu.de>
+##
+## DP: '-' must be escaped ('\-') to be interpreted as minus.
+
+@DPATCH@
+diff -urNad trunk~/Doc/man/molrc.5 trunk/Doc/man/molrc.5
+--- trunk~/Doc/man/molrc.5 2007-06-25 19:52:25.000000000 +0200
++++ trunk/Doc/man/molrc.5 2007-09-27 15:25:06.919972047 +0200
+@@ -52,11 +52,11 @@
+ .It2 "${\fIsession\fR}"
+ The MOL session number
+ .It2 "${\fIconfig\fR}"
+-Defined by the --config=value switch
++Defined by the \-\-config=value switch
+ .It2 "${\fIboot_method\fR}"
+ Set to newworld, oldworld, osx, linux or elf.
+ .It2 "${\fIcdboot\fR}"
+-Set to '-boot1' if the --cdboot switch is used
++Set to '\-boot1' if the \-\-cdboot switch is used
+ .PP
+ The following conditional construction is supported
+ .Sp
+@@ -72,17 +72,17 @@
+ .Sp
+ .Vb 2
+ \& \fBifeq\fR ${\fIsession\fR} 0 {
+-\& \fBblkdev\fR: /dev/hda7 -rw -boot # MacOS 9.0.4
+-\& \fBblkdev\fR: /dev/hda5 -rw # other disk
++\& \fBblkdev\fR: /dev/hda7 \-rw \-boot # MacOS 9.0.4
++\& \fBblkdev\fR: /dev/hda5 \-rw # other disk
+ \& }
+ \& \fBifeq\fR ${\fIsession\fR} 4 {
+-\& \fBblkdev\fR: /dev/hda8 -rw -boot # MacOS 9.2
++\& \fBblkdev\fR: /dev/hda8 \-rw \-boot # MacOS 9.2
+ \& }
+ .Ve
+ which tells MOL to export different volumes for session \
+ 0 and session 4. The first two volumes will be used if MOL is \
+-invoked through the command '\fBstartmol\fR -0' and the last one \
+-if '\fBstartmol\fR -4' is used.
++invoked through the command '\fBstartmol\fR \-0' and the last one \
++if '\fBstartmol\fR \-4' is used.
+ Refer to \fBsession.map\fR(5) for more information about
+ session numbers.
+
Eigenschaftsänderungen: debian/patches/fix-manpages.dpatch
___________________________________________________________________
Hinzugefügt: svn:executable
+ *
Index: debian/patches/sheep_2.6.26.dpatch
===================================================================
--- debian/patches/sheep_2.6.26.dpatch (Revision 0)
+++ debian/patches/sheep_2.6.26.dpatch (Revision 169)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## sheep_2.6.26.dpatch by <gaudenz@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build fix for the sheep net driver for kernel 2.6.26, taken from SuSE (schwab@suse.de)
+
+@DPATCH@
+diff -urNad mol-0.9.72.1~dfsg~/src/netdriver/sheep.c mol-0.9.72.1~dfsg/src/netdriver/sheep.c
+--- mol-0.9.72.1~dfsg~/src/netdriver/sheep.c 2007-06-25 19:52:17.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/netdriver/sheep.c 2008-08-06 16:24:01.000000000 +0200
+@@ -82,7 +82,7 @@
+ #ifdef LINUX_26
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
+-#define compat_sk_alloc(a,b,c) sk_alloc( (a), (b), &mol_proto, 1 )
++#define compat_sk_alloc(a,b,c) sk_alloc(&init_net, (a), (b), &mol_proto)
+ #else
+ #define compat_sk_alloc(a,b,c) sk_alloc( (a), (b), (c), NULL )
+ #endif
+@@ -558,7 +558,7 @@
+ name[19] = 0;
+
+ // Find card
+- if( !(v->ether=dev_get_by_name(name)) )
++ if( !(v->ether=dev_get_by_name(&init_net, name)) )
+ return -ENODEV;
+
+ // Is it Ethernet?
Eigenschaftsänderungen: debian/patches/sheep_2.6.26.dpatch
___________________________________________________________________
Hinzugefügt: svn:executable
+ *
Index: debian/patches/kmod_2.6.26.dpatch
===================================================================
--- debian/patches/kmod_2.6.26.dpatch (Revision 0)
+++ debian/patches/kmod_2.6.26.dpatch (Revision 169)
@@ -0,0 +1,103 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kmod_2.6.26.dpatch by <gaudenz@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes to build the kernel module with linux 2.6.26
+
+@DPATCH@
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 2008-08-07 15:44:48.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26 2008-08-07 15:45:58.000000000 +0200
+@@ -9,11 +9,12 @@
+ obj-m := _kuname.o mol.o
+
+ PERFOBJS = $(addprefix $(obj)/, $(PERFOBJS_))
+-MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(INCLUDES) -D__ASSEMBLY__
++K_FLAGS = -Iinclude -include include/linux/autoconf.h -Iarch/ppc -Iarch/ppc/include \
++ -I$(src) -I$(src)/../../../include $(INCLUDES) -D__KERNEL__
++MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(K_FLAGS) -D__ASSEMBLY__
+
+ ### This is ugly, but it should fix the issues people have building as a user
+-T = "/tmp"
+-
++T = $(src)
+
+ $(obj)/_traps.o: $(src)/asm_offsets.h $(src)/traps.S $(src)/*.S $(src)/*.h
+
+@@ -29,7 +30,7 @@
+ $(obj)/_%.o: $(src)/%.S
+ @echo " AS [x] $@"
+ @rm -f $@ $@.s
+- @$(CPP) $(MOL_ASMFLAGS) $< | m4 -s > $@.m4
++ @$(CPP) $(M_INC) $(MOL_ASMFLAGS) $< | m4 -s > $@.m4
+ @ASFILTER="./asfilter" ; test -x $$ASFILTER || ASFILTER="tr ';' '\n'" ; \
+ cat $@.m4 | $$ASFILTER > $@.s
+ @$(AS) $@.s $(AS_FLAGS) -o $@
+@@ -39,7 +40,7 @@
+ $(src)/asm_offsets.h: $(src)/archinclude.h $(src)/kernel_vars.h $(src)/mac_registers.h
+ $(src)/asm_offsets.h: $(src)/asm_offsets.c $(src)/asm_offsets.inc
+ @rm -f ${T}/tmp-offsets.c $@ ; cat $^ > ${T}/tmp-offsets.c
+- @$(CC) $(CPPFLAGS) $(CFLAGS) -I$(src) -Wall -S ${T}/tmp-offsets.c -o ${T}/tmp-offsets.s
++ @$(CC) $(CPPFLAGS) $(CFLAGS) $(K_FLAGS) -Wall -S ${T}/tmp-offsets.c -o ${T}/tmp-offsets.s
+ @echo "/* WARNING! Automatically generated from 'shared/asm_offsets.c' - DO NOT EDIT! */" > $@
+ @grep '^#' ${T}/tmp-offsets.s >> $@
+ @rm -f ${T}/tmp-offsets.*
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/dev.c mol-0.9.72.1~dfsg/src/kmod/Linux/dev.c
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/dev.c 2008-08-07 15:44:48.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/dev.c 2008-08-07 15:45:58.000000000 +0200
+@@ -85,7 +85,11 @@
+ }
+ #endif /* < Linux 2.6.21 */
+ do {
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
++ if( !(p=(int*)of_get_property(dn, "reg", &len)) || len != sizeof(int[2]) ) {
++#else
+ if( !(p=(int*)get_property(dn, "reg", &len)) || len != sizeof(int[2]) ) {
++#endif
+ of_node_put(dn);
+ return 0;
+ }
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/misc.c mol-0.9.72.1~dfsg/src/kmod/Linux/misc.c
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/misc.c 2008-08-07 15:44:48.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/misc.c 2008-08-07 15:45:58.000000000 +0200
+@@ -26,6 +26,7 @@
+
+ #define MMU kv->mmu
+
++/* Is there a better way to share between User and Kernel? */
+ kernel_vars_t *
+ alloc_kvar_pages( void )
+ {
+@@ -48,6 +49,7 @@
+ return kv;
+ }
+
++/* Releases the memory we allocated before */
+ void
+ free_kvar_pages( kernel_vars_t *kv )
+ {
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/mmu.c mol-0.9.72.1~dfsg/src/kmod/Linux/mmu.c
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/mmu.c 2008-08-07 15:44:48.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/mmu.c 2008-08-07 15:45:58.000000000 +0200
+@@ -29,6 +29,8 @@
+ void (*xx_store_pte_lowmem)( ulong *slot, int pte0, int pte1 );
+ #endif
+
++
++/* Makes a copy of the mmu context for MOL */
+ int
+ arch_mmu_init( kernel_vars_t *kv )
+ {
+diff -urNad mol-0.9.72.1~dfsg~/src/shared/mol-ioctl.h mol-0.9.72.1~dfsg/src/shared/mol-ioctl.h
+--- mol-0.9.72.1~dfsg~/src/shared/mol-ioctl.h 2007-06-25 19:52:18.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/shared/mol-ioctl.h 2008-08-07 15:50:18.000000000 +0200
+@@ -18,6 +18,9 @@
+ #define _H_MOL_IOCTL
+
+ #ifndef __ASSEMBLY__
++#ifdef __linux__
++#include <linux/ioctl.h>
++#endif /* __linux__ */
+ #include "mmutypes.h"
+
+ typedef struct {
Eigenschaftsänderungen: debian/patches/kmod_2.6.26.dpatch
___________________________________________________________________
Hinzugefügt: svn:executable
+ *
Index: debian/patches/Makefile_2.6.26.dpatch
===================================================================
--- debian/patches/Makefile_2.6.26.dpatch (Revision 0)
+++ debian/patches/Makefile_2.6.26.dpatch (Revision 169)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_2.6.26.dpatch by <gaudenz@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makefile fix for for kernel 2.6.26 because of obscure
+## DP: LDFLAGS_MODULE setting
+
+@DPATCH@
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 2008-08-06 16:26:18.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26 2008-08-06 16:28:23.000000000 +0200
+@@ -12,6 +12,7 @@
+ K_FLAGS = -Iinclude -include include/linux/autoconf.h -Iarch/ppc -Iarch/ppc/include \
+ -I$(src) -I$(src)/../../../include $(INCLUDES) -D__KERNEL__
+ MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(K_FLAGS) -D__ASSEMBLY__
++LDFLAGS_MODULE = $(LDFLAGS_BUILD_ID)
+
+ ### This is ugly, but it should fix the issues people have building as a user
+ T = $(src)
+diff -urNad mol-0.9.72.1~dfsg~/src/netdriver/Makefile.26 mol-0.9.72.1~dfsg/src/netdriver/Makefile.26
+--- mol-0.9.72.1~dfsg~/src/netdriver/Makefile.26 2007-06-25 19:52:17.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/netdriver/Makefile.26 2008-08-06 16:28:36.000000000 +0200
+@@ -1,5 +1,7 @@
+ # -*- makefile -*-
+
++LDFLAGS_MODULE = $(LDFLAGS_BUILD_ID)
++
+ obj-$(BUILD_SHEEP) += sheep.o
+ obj-$(BUILD_TAP) += ethertap.o
+ obj-$(BUILD_TUN) += tun.o
Eigenschaftsänderungen: debian/patches/Makefile_2.6.26.dpatch
___________________________________________________________________
Hinzugefügt: svn:executable
+ *
Index: debian/patches/00list
===================================================================
--- debian/patches/00list (Revision 141)
+++ debian/patches/00list (Revision 169)
@@ -2,5 +2,8 @@
Makefile
modload
if-tap
-Makefile_kmod
blk_dmg_compile_fix
+fix-manpages
+kmod_2.6.26
+sheep_2.6.26
+Makefile_2.6.26
Index: debian/mol.menu
===================================================================
--- debian/mol.menu (Revision 141)
+++ debian/mol.menu (Revision 169)
@@ -1,12 +1,12 @@
?package(mol): \
needs="text" \
command="startmol" \
- section="Apps/Emulators" \
+ section="Applications/Emulators" \
title="Mac-on-Linux (Mac OS 9 and earlier)" \
icon="/usr/share/pixmaps/mol.xpm"
?package(mol): \
needs="text" \
command="startmol -X" \
- section="Apps/Emulators" \
+ section="Applications/Emulators" \
title="Mac-on-Linux (Mac OS X)" \
icon="/usr/share/pixmaps/mol.xpm"
Index: debian/rules
===================================================================
--- debian/rules (Revision 141)
+++ debian/rules (Revision 169)
@@ -8,148 +8,141 @@
# include dpatch rules
include /usr/share/dpatch/dpatch.make
-# Debian specific flags to make,, mostly installation directories
-DEBIANFLAGS=\
-prefix=/usr \
-datadir=/usr/share/mol \
-libdir=/usr/lib/mol \
-docdir=/usr/share/doc/mol
+# the values from configure aren't used by the Makefile so we have to pass
+# them to every make call
+DEBIANFLAGS=prefix=/usr datadir=/usr/share/mol libdir=/usr/lib/mol \
+ docdir=/usr/share/doc/mol
+CFLAGS += -g -D_FILE_OFFSET_BITS=64
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
# Debian package version
VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d " " -f 2)
+UPSTREAM_VERSION=$(shell echo $(VERSION) | sed s/~dfsg.*//)
-configure: configure-stamp
-configure-stamp: patch
+clean:
dh_testdir
+ dh_clean
+ rm -f build-stamp
-# configure the package.
- CFLAGS="$$CFLAGS -D_FILE_OFFSET_BITS=64" ./configure --disable-png
- yes '' | make config
+# remove the manpages
+ rm -f debian/*.[17] mol.tar.bz2
- touch configure-stamp
+ dpatch apply Makefile
+ $(MAKE) distclean
-build: configure build-stamp
-build-stamp:
+# upstream bug: distclean does not remove these files
+ rm -rf obj-ppc config/configure
+ rm -f .config* util/img/mol-img
+
+ $(MAKE) -f debian/rules unpatch
+
+.config-ppc:
+ ./configure --disable-png CFLAGS="$(CFLAGS)"
+ make defconfig
+
+build: build-stamp
+build-stamp: patch .config-ppc
dh_testdir
# build the Debian specific manpages
(cd debian; \
for man in mol.7 moldeb.1 molrcget.1 strip_nwrom.1; \
- do docbook-to-man `echo $$man|sed 's/[17]/sgml/'` >$$man; \
+ do docbook-to-man $${man%?}sgml >$$man; \
done)
# build the package
$(MAKE) BUILD_MODS=n NETDRIVER=n $(DEBIANFLAGS)
# setup the build structure for the kernel modules
- KERNEL_SOURCE=/lib/modules/`uname -r`/build $(MAKE) -C src/kmod/Linux/ setup-common
+# the KERNEL_SOURCE must point to a directory. It's not used by setup-common,
+# but upstream checks for a directory. I heared / is often a directory.
+ $(MAKE) -C src/kmod/Linux/ KERNEL_SOURCE=/ setup-common
$(MAKE) -C src/netdriver/ setup-tree-common
- touch build-stamp
+ touch $@
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f configure-stamp build-stamp
+# Build architecture-independent files here.
+binary-indep:
+# We have nothing to do by default.
-# remove the manpages
- rm -f debian/*.[17]
-
-# clean the package, including auto-generated stuff that distclean overlooks
- -$(MAKE) clean
- rm -rf obj-ppc
- rm -f .config*
- rm -rf config/configure
-
-# cd src/vconfig; rm -f modes-y.c modes-y.h modes-l.c
-# rm -f src/shared/config.h.in
-# rm -f src/kmod/mpc107/Makefile src/cpu/mpc107/Makefile src/cpu/ppc/asm_offsets.h
-# rm -f mollib/mol.symbols
-# cd config/kconfig; rm -rf zconf-y.c zconf-y.h zconf-l.c .autoinclude
-
-# remove the modules source directory and tarball
- rm -rf modules
- rm -f mol.tar.bz2
-
- dh_clean debian/tmp
-
-install: build
+# Build architecture-dependent files here.
+binary-arch: build
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
+ dh_installdirs -a
+
# install the overrides file for lintian
- install -o root -g root -m 644 debian/lintian.overrides `pwd`/debian/mol/usr/share/lintian/overrides/mol
+ install -o root -g root -m 644 debian/lintian.overrides \
+ debian/mol/usr/share/lintian/overrides/mol
# install the Mac-on-Linux emulator into mol.
$(MAKE) DESTDIR=`pwd`/debian/mol $(DEBIANFLAGS) install
-# fix permissions
- chmod 644 `pwd`/debian/mol/usr/lib/mol/mol.symbols
+ rm debian/mol/usr/share/doc/mol/COPYING
-# remove gratious GPL license text
- rm `pwd`/debian/mol/usr/share/doc/mol/COPYING
+ convert -depth 8 -size 100x122 -frame 14x3 -mattecolor '#ffffce' \
+ -scale 25% rgb:`pwd`/mollib/graphics/bootlogo.raw \
+ debian/mol/usr/share/pixmaps/mol.xpm
-# extract a 32x32 XPM menu logo from the raw boot logo
- convert -depth 8 -size 100x122 -frame 14x3 -mattecolor '#ffffce' -scale 25% rgb:`pwd`/mollib/graphics/bootlogo.raw `pwd`/debian/mol/usr/share/pixmaps/mol.xpm
-
# put together the mol-source package by copying the relevant code
- mkdir -p modules/mol/kmod modules/mol/netdriver
- -cp -L obj-ppc/build/src/kmod/* modules/mol/kmod
- -cp -L obj-ppc/build/src/netdriver/* modules/mol/netdriver
+ mkdir -p modules/mol
+# the directory is full of symlinks
+ cp -prL obj-ppc/build/src/kmod obj-ppc/build/src/netdriver \
+ modules/mol
# add the Debian directory and the top-level Makefile
cp -pr debian/debian.mol-source modules/mol/debian
- m4 -DMOL_VERSION=$(VERSION) < modules/mol/debian/changelog.m4.m4 > modules/mol/debian/changelog.m4
- rm modules/mol/debian/changelog.m4.m4
+ sed -i '1s/MOL_VERSION/$(VERSION)/' modules/mol/debian/changelog.m4
cp -p debian/Makefile.mol-source modules/mol/Makefile
# set correct permissions
chmod u+x modules/mol/debian/rules
- chown -R root.src modules
+ chown -R root:src modules
chmod -R u+w,go-w,a+rX modules
-# create a tarball
tar jcf mol.tar.bz2 modules
+ rm -r modules
+ dh_install -pmol-source mol.tar.bz2 usr/src
-# install the source tarball into mol-source
- install -o root -g root -m 644 mol.tar.bz2 `pwd`/debian/mol-source/usr/src
+ dh_installdebconf -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installman -a
+ dh_installmenu -a
+ dh_installmodules -a
+ dh_installchangelogs -a CHANGELOG
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a -Xlib/modules
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
-# create the mol-modules packages by moving the installed modules
-# dh_movefiles --sourcedir=debian/mol
-# remove the now empty directory
-# rm -rf `pwd`/debian/mol/lib
+binary: binary-indep binary-arch
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+TAR_NAME=mol-$(UPSTREAM_VERSION).tar.bz2
+MOL_DIR_NAME=mol-$(shell echo $(VERSION) | sed s/-.*//)
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_installmenu
- dh_installmodules
- dh_installchangelogs CHANGELOG
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps -Xlib/modules
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+get-orig-source:
+ wget http://dfn.dl.sourceforge.net/sourceforge/mac-on-linux/$(TAR_NAME)
+ tar -xf $(TAR_NAME)
+ rm $(TAR_NAME)
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
- make -f debian/rules binary-common DH_OPTIONS=-p$*
+ mv $(TAR_NAME:.tar.bz2=) $(MOL_DIR_NAME)
+ cd $(MOL_DIR_NAME) && rm -r bootx mollib/drivers \
+ mollib/images/moldisk.dmg mollib/images/moldiskX.dmg
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ tar -czf $(MOL_DIR_NAME).orig.tar.gz $(MOL_DIR_NAME)
+ rm -r $(MOL_DIR_NAME)
+
+.PHONY: build clean binary-indep binary-arch binary get-orig-source
Index: debian/Makefile.mol-source
===================================================================
--- debian/Makefile.mol-source (Revision 141)
+++ debian/Makefile.mol-source (Revision 169)
@@ -32,13 +32,13 @@
.PHONY: $(SUBDIRS)
build: $(SUBDIRS)
$(SUBDIRS):
- -$(MAKE) -C $(KSRC) M=`pwd`/$@
+ $(MAKE) -C $(KSRC) M=`pwd`/$@
# descend into subdirectories and install the modules
.PHONY: $(SUBDIRS:=-install)
install: build $(SUBDIRS:=-install)
$(SUBDIRS:=-install):
- -$(MAKE) INSTALL_MOD_PATH=$(DESTDIR) -C $(KSRC) M=`pwd`/$(subst -install,,$@) modules_install
+ $(MAKE) INSTALL_MOD_PATH=$(DESTDIR) -C $(KSRC) M=`pwd`/$(subst -install,,$@) modules_install
# descend into subdirectories and clean up
.PHONY: $(SUBDIRS:=-clean)
Index: debian/TODO
===================================================================
--- debian/TODO (Revision 141)
+++ debian/TODO (Revision 169)
@@ -1,9 +1,11 @@
-
- * I must not forget to update the TODO file after implementing changes.
-
- -- Jens Schmalzing <jensen@debian.org> Wed, 17 Apr 2002 00:11:27 +0200
-
-Local variables:
-mode: debian-changelog
-iso-accents-mode: t
-End:
+- check configure options we could activate (especially pci-proxy
+ support and debugger support)
+- better support for running linux inside mol (probably this is
+ currently broken, guest side drivers are not packaged for debian,
+ sources are in the old mol bk archive, snapshot at
+ http://pkg-mol.alioth.debian.org/bk_checkouts/bk_checkouts.tar.bz2)
+- fix building mol twice in a row (double compilation support release goal!)
+- check and possibly package new gui frontend (svn module mol-gui at
+ mac-on-linux.sf.net)
+- write missing manpage for mol-img
+- ...
Index: debian/debian.mol-source/changelog.m4.m4
===================================================================
--- debian/debian.mol-source/changelog.m4.m4 (Revision 141)
+++ debian/debian.mol-source/changelog.m4.m4 (Revision 169)
@@ -1,6 +0,0 @@
-mol-modules-KVERS (MOL_VERSION+KDREV) unstable; urgency=low
-
- * Built from the mol-modules-source package.
-
- -- KMAINT <KEMAIL> DEBDATE
-
Index: debian/debian.mol-source/changelog.m4
===================================================================
--- debian/debian.mol-source/changelog.m4 (Revision 0)
+++ debian/debian.mol-source/changelog.m4 (Revision 169)
@@ -0,0 +1,6 @@
+mol-modules-KVERS (MOL_VERSION+KDREV) unstable; urgency=low
+
+ * Built from the mol-modules-source package.
+
+ -- KMAINT <KEMAIL> DEBDATE
+
Index: debian/debian.mol-source/rules
===================================================================
--- debian/debian.mol-source/rules (Revision 141)
+++ debian/debian.mol-source/rules (Revision 169)
@@ -42,7 +42,7 @@
$(MAKE) clean
- -dh_clean
+ dh_clean
rm -f debian/control debian/changelog
rm -f configure-stamp build-stamp install-stamp
@@ -57,10 +57,8 @@
touch $@
-debian/control: debian/control.m4
+debian/%: debian/%.m4
$(M4) $(M4DEFINES) $< > $@
-debian/changelog: debian/changelog.m4
- $(M4) $(M4DEFINES) $< > $@
binary-mol-modules: install-stamp
dh_testdir
@@ -81,9 +79,6 @@
kdist_configure: configure-stamp
-kdist_changes:
- @echo >&2 'Note: kdist_changes is obsolete'
-
kdist_clean: clean
kdist_image:
@@ -102,7 +97,4 @@
binary binary-arch:
@echo >&2 'Use make-kpkg to compile this module' && false
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
.PHONY: binary binary-arch source diff
Index: debian/copyright
===================================================================
--- debian/copyright (Revision 141)
+++ debian/copyright (Revision 169)
@@ -1,25 +1,385 @@
This package was debianized by Jens Schmalzing jensen@debian.org on
Thu, 19 Apr 2001 16:09:51 +0200.
-Officially released versions were downloaded from
-ftp://ftp.nada.kth.se/home/f95-sry/Public/mac-on-linux/ .
+It's currently maintained by the
+MOL Packaging Team <pkg-mol-devel@lists.alioth.debian.org>
-Snapshots of development versions were obtained from the anonymous
-rsync tree at zorn.theophys.kth.se::mol, followed by `make libimport'.
+Upstream sources can be found at http://mac-on-linux.sourceforge.net/
-Meanwhile, both of the above-mentioned locations have moved, to
-http://www.maconlinux.org/downloads/ and rsync.penguinppc.org::mol,
-respectively.
+The MOL upstream tarball contains some files which can not be built
+from source within Debian. Therefore the source is split into the
+source packages mol, mol-modules-macos and mol-modules-macosx.
-No activity on http://www.maconlinux.org/ since 2004. This package is now
-built from "unofficial" sources downloaded from http://dev.gentoo.org/~josejx/
+The split is done with a script which you can find at:
+svn://svn.debian.org/svn/pkg-mol/scripts/trunk/
+Upstream Authors: Samuel Rydh, Joseph Jezak
Copyright:
(C) 1997-2004 Samuel Rydh <samuel@ibrium.se>
+(C) 2005- Joseph Jezak <josejx@gentoo.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public Licence version 2.
See the file /usr/share/common-licenses/GPL-2 for more information.
+Some files have a different copyright and/or different copyright holders:
+
+* src/drivers/hostirq.c:
+* src/kmod/Linux/hostirq.c:
+/*
+ * copyright (c) 2005 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+* src/drivers/net/mac_enet.c:
+/*
+ * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel@ibrium.se)
+ * Copyright (C) 1999, 2000, 2001 Benjamin Herrenschmidt (bh40@calva.net)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ */
+
+* src/drivers/pci.c:
+/*
+ * Copyright (C) 1999, 2000, 2001, 2002, 2003 Samuel Rydh (samuel@ibrium.se)
+ *
+ * pci_device_loc() was taken from pmac_pci.c:
+ * Copyright (C) 1997 Paul Mackerras (paulus@cs.anu.edu.au)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ */
+
+* src/drivers/via-cuda.c:
+* src/drivers/driver_mgr.c:
+/*
+ * copyright (c)2000, 2001, 2002, 2003, 2004, Samuel Rydh
+ *
+ * copyright (c)1999, 2003 Ben Martz
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+* src/drivers/pciproxy.c:
+/*
+ * copyright (c) 2005 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+* src/drivers/oldworld/mesh.c:
+/*
+ * Copyright (C) 1999, harry eaton <haceaton@jhuapl.edu>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ */
+
+* src/drivers/disk/aes.c:
+/*
+ * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
+ * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
+ * @author Paulo Barreto <paulo.barreto@terra.com.br>
+ *
+ * This code is hereby placed in the public domain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+* src/drivers/disk/blk_qcow.c:
+/*
+ * Copyright (C) 2005 Joseph Jezak
+ *
+ * Based on the QEMU Block driver for the QCOW format
+ *
+ * Copyright (c) 2004 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+* src/drivers/disk/blk_raw.c (this one has no licence in the source, but
+as everything else from Joe is GPL I assume it's safe to say this is GPL as
+well. This file is probably to small for copyright anyway. Will contact him
+nevertheless):
+/*
+ * Copyright (C) 2006 Joseph Jezak
+ *
+ */
+
+* src/drivers/disk/blk_dmg.c:
+/*
+ * Copyright (C) 2005 Joseph Jezak
+ *
+ * Based on the QEMU Block driver for DMG images
+ *
+ * Copyright (c) 2004 Johannes E. Schindelin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+* src/drivers/video/video.c:
+/*
+ * Copyright (C) 2002, 2003, 2004 Samuel Rydh <samuel@ibrium.se>
+ * Copyright (C) 1999, 2000, 2001 Benjamin Herrenschmidt <bh40@calva.net>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ */
+
+* src/drivers/video/vncvideo.c:
+/*
+ * Copyright (C) 1999, 2000 AT&T Laboratories Cambridge. All Rights Reserved.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+* src/drivers/video/fbdev.c:
+/*
+ * Copyight (C) 2003, 2004 Samuel Rydh <samuel@ibrium.se>
+ *
+ * Gamma implemented by Takashi Oe <toe@unlserve.unl.edu>
+ *
+ * Copyright (C) 1999, 2000 Benjamin Herrenschmidt <bh40@calva.net>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ */
+
+* src/drivers/video/xvideo.c:
+/*
+ * Derived from the Basillisk II X-driver,
+ * (C) 1997-1999 Christian Bauer
+ *
+ * Adapted for MOL by Samuel Rydh, 1999, 2002, 2003 (samuel@ibrium.se)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ */
+
+* src/netdriver/sheep.c:
+/*
+ * sheep_net.c - Linux driver for SheepShaver/Basilisk II networking (access to raw Ethernet packets)
+ *
+ * SheepShaver (C) 1997-1999 Mar"c" Hellwig and Christian Bauer
+ * Basilisk II (C) 1997-1999 Christian Bauer
+ *
+ * Ported to 2.4 and reworked, Samuel Rydh 1999-2003
+ */
+
+* src/netdriver/tun.c:
+/*
+ * TUN - Universal TUN/TAP device driver.
+ * Copyright (C) 1999-2002 Maxim Krasnyansky <maxk@qualcomm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * $Id: tun.c 2 2006-10-19 05:01:14Z josejx $
+ */
+
+* src/molelf/vsprintf.c:
+* src/kmod/mpc107/vsprintf.c:
+/*
+ * linux/lib/vsprintf.c
+ *
+ * Copyright (C) 1991, 1992, Linus Torvalds
+ */
+
+* src/kmod/mpc107/libc.c:
+/*
+ * Copyright (C) 2003 Samuel Rydh (samuel@ibrium.se)
+ *
+ * Some of the functions originate from linux/lib/string.c:
+ *
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2
+ *
+ */
+
+*
+/* Mac-on-Linux ELF loader
+
+ Copyright (C) 2001 Samuel Rydh
+
+ adapted from yaboot
+
+ Copyright (C) 1999 Benjamin Herrenschmidt
+
+ portions based on poof
+
+ Copyright (C) 1999 Marius Vollmer
+
+ portions based on quik
+
+ Copyright (C) 1996 Paul Mackerras.
+
+ Because this program is derived from the corresponding file in the
+ silo-0.64 distribution, it is also
+
+ Copyright (C) 1996 Pete A. Zaitcev
+ 1996 Maurizio Plaza
+ 1996 David S. Miller
+ 1996 Miguel de Icaza
+ 1996 Jakub Jelinek
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+*/
+* src/debugger/mon/m68k-opc.c:
+* src/debugger/mon/ppc-dis.c:
+* src/debugger/mon/ppc-opc.c
+* src/debugger/mon/m68k-dis.c:
+* src/debugger/mon/floatformat.c
+/*
+ Copyright 1989, 91, 92, 93, 94, 95, 96, 97, 98, 1999, 2001
+ Free Software Foundation.
+
+GDB, GAS, and the GNU binutils are free software; you can redistribute
+them and/or modify them under the terms of the GNU General Public
+License as published by the Free Software Foundation; either version
+1, or (at your option) any later version.
+
+GDB, GAS, and the GNU binutils are distributed in the hope that they
+will be useful, but WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this file; see the file COPYING. If not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02111-1307, USA. */
+
+* src/drivers/net/ipchksum-ppc.S:
+/*
+ * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * Severely hacked about by Paul Mackerras (paulus@cs.anu.edu.au).
+ */
+
+
Index: debian/po/sv.po
===================================================================
--- debian/po/sv.po (Revision 141)
+++ debian/po/sv.po (Revision 169)
@@ -16,9 +16,9 @@
"Project-Id-Version: mol 0.9.70-20\n"
"Report-Msgid-Bugs-To: pkg-mol-devel@lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-10-06 19:30+0200\n"
-"PO-Revision-Date: 2005-11-27 15:24+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"PO-Revision-Date: 2008-07-22 20:11+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -32,57 +32,30 @@
#. Type: boolean
#. Description
#: ../mol.templates:1001
-#, fuzzy
-msgid ""
-"If you make Mac-on-Linux setuid root, non-root users will be able to run the "
-"Mac-on-Linux emulator through the startmol script or the Debian menu "
-"entries. Since every setuid root binary is a potential security risk and "
-"could be used for compromising your system, this option is disabled by "
-"default."
-msgstr ""
-"Om du svarar Ja p�enna fr� kommer icke-root-anv�are att kunna k�Mac-"
-"on-Linux-emulatorn genom skriptet startmol eller genom Debians meny. "
-"Eftersom varje bin�som �setuid-root �en t�bar s�rhetsrisk och kan "
-"anv�as f�tt g�intr� p�itt system �denna funktion avst�d som "
-"standard."
+msgid "If you make Mac-on-Linux setuid root, non-root users will be able to run the Mac-on-Linux emulator through the startmol script or the Debian menu entries. Since every setuid root binary is a potential security risk and could be used for compromising your system, this option is disabled by default."
+msgstr "Om du svarar Ja p�enna fr� kommer icke-root-anv�are att kunna k�Mac-on-Linux-emulatorn genom skriptet startmol eller genom Debians meny. Eftersom varje bin�som �setuid-root �en t�bar s�rhetsrisk och kan anv�as f�tt g�intr� p�itt system �denna funktion avst�d som standard."
#. Type: string
#. Description
#: ../mol.templates:2001
-#, fuzzy
msgid "Group for Mac-on-Linux users:"
-msgstr "Grupp f�nv�are av Mac-on-Linux?"
+msgstr "Grupp f�nv�are av Mac-on-Linux:"
#. Type: string
#. Description
#: ../mol.templates:2001
-#, fuzzy
-msgid ""
-"You have chosen to make Mac-on-Linux setuid root so non-root users can run "
-"the emulator without additional privileges. In order to reduce the security "
-"risk involved, it is recommended that you only allow this for the members of "
-"a certain group. If this group does not yet exist, it will be created and "
-"you will have to add users manually with the adduser(8) command."
-msgstr ""
-"Du har valt att g�Mac-on-Linux setuid-root s�tt icke-root-anv�are kan "
-"k�emulatorn utan extra r�igheter. F�tt minska s�rhetsrisken detta "
-"inneb�f�l�jag att du endast till�r detta f�edlemmar av en viss "
-"grupp. Om denna grupp inte existerar kommer den att skapas och du kan l�a "
-"till anv�are manuellt med kommandot adduser(8)."
+msgid "You have chosen to make Mac-on-Linux setuid root so non-root users can run the emulator without additional privileges. In order to reduce the security risk involved, it is recommended that you only allow this for the members of a certain group. If this group does not yet exist, it will be created and you will have to add users manually with the adduser(8) command."
+msgstr "Du har valt att g�Mac-on-Linux setuid-root s�tt icke-root-anv�are kan k�emulatorn utan extra r�igheter. F�tt minska s�rhetsrisken detta inneb�b�u endast begr�a detta f�edlemmar av en viss grupp. Om denna grupp inte existerar kommer den att skapas och du kan l�a till anv�are manuellt med kommandot adduser(8)."
#. Type: string
#. Description
#: ../mol.templates:2001
-msgid ""
-"If you want to allow access to everybody, enter EVERYBODY (in capital "
-"letters) as the name of the group. Note that this is strongly discouraged."
-msgstr ""
-"Om du vill till� tillg� f�lla s�nge EVERYBODY (med stora bokst�r) "
-"som namnet p�ruppen. Notera att detta absolut inte �rekommenderat."
+msgid "If you want to allow access to everybody, enter EVERYBODY (in capital letters) as the name of the group. Note that this is strongly discouraged."
+msgstr "Om du vill till� tillg� f�lla s�nge EVERYBODY (med stora bokst�r) som namnet p�ruppen. Notera att detta absolut inte �rekommenderat."
#~ msgid "Do you want to set the suid bit on the Mac-on-Linux binary?"
#~ msgstr "Vill du s�a suid-biten p�ac-on-Linux-bin�n?"
-
#~ msgid "Restrict access to Mac-on-Linux to a group of non-root users?"
#~ msgstr ""
#~ "Begr�a tillg� till Mac-on-Linux till en grupp av icke-root-anv�are?"
+
Reply to: