[Pkg-mol-commits] r132 - in mol/trunk/debian: . patches po
gaudenz at alioth.debian.org
gaudenz at alioth.debian.org
Wed Jul 25 22:19:35 UTC 2007
Author: gaudenz
Date: 2007-07-25 22:19:34 +0000 (Wed, 25 Jul 2007)
New Revision: 132
Added:
mol/trunk/debian/patches/blk_dmg_compile_fix.dpatch
mol/trunk/debian/po/nl.po
mol/trunk/debian/po/pt.po
Removed:
mol/trunk/debian/molvconfig.sgml
Modified:
mol/trunk/debian/changelog
mol/trunk/debian/control
mol/trunk/debian/mol.manpages
mol/trunk/debian/patches/00list
mol/trunk/debian/patches/Makefile.dpatch
mol/trunk/debian/rules
Log:
* New upstream version
- build fixes for kernel 2.6.19 and 2.6.21 (Closes: #400481, #400472,
#431408)
- Debian molvconfig manpage added upstream
- update debian/patches/Makefile.dpatch: don't build bootx
- add debian/patches/blk_dmg_compile_fix: fix building with zlib > 1.2.3
* move driver disk images to driver packages
* [INTL:pt] Portuguese translation for debconf messages (Closes:
#415188)
* [INTL:nl] Dutch po-debconf translation (Closes: #421410)
* add build dependency on autoheader as upstream does no longer ship
configure
Modified: mol/trunk/debian/changelog
===================================================================
--- mol/trunk/debian/changelog 2007-05-05 14:29:36 UTC (rev 131)
+++ mol/trunk/debian/changelog 2007-07-25 22:19:34 UTC (rev 132)
@@ -1,3 +1,21 @@
+mol (0.9.72.1~dfsg-1) UNRELEASED; urgency=low
+
+ [ Gaudenz Steinlin ]
+ * New upstream version
+ - build fixes for kernel 2.6.19 and 2.6.21 (Closes: #400481, #400472,
+ #431408)
+ - Debian molvconfig manpage added upstream
+ - update debian/patches/Makefile.dpatch: don't build bootx
+ - add debian/patches/blk_dmg_compile_fix: fix building with zlib > 1.2.3
+ * move driver disk images to driver packages
+ * [INTL:pt] Portuguese translation for debconf messages (Closes:
+ #415188)
+ * [INTL:nl] Dutch po-debconf translation (Closes: #421410)
+ * add build dependency on autoheader as upstream does no longer ship
+ configure
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Thu, 26 Jul 2007 00:09:01 +0200
+
mol (0.9.71.dfsg-5) unstable; urgency=low
* Update German debconf templates translation. (Closes: #397152)
Modified: mol/trunk/debian/control
===================================================================
--- mol/trunk/debian/control 2007-05-05 14:29:36 UTC (rev 131)
+++ mol/trunk/debian/control 2007-07-25 22:19:34 UTC (rev 132)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: MOL Packaging Team <pkg-mol-devel at lists.alioth.debian.org>
Uploaders: Sven Luther <luther at debian.org>, Otavio Salvador <otavio at debian.org>, Gaudenz Steinlin <gaudenz at debian.org>, Aurélien GÉRÔME <ag at 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
+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
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-mol/mol/trunk
Modified: mol/trunk/debian/mol.manpages
===================================================================
--- mol/trunk/debian/mol.manpages 2007-05-05 14:29:36 UTC (rev 131)
+++ mol/trunk/debian/mol.manpages 2007-07-25 22:19:34 UTC (rev 132)
@@ -2,4 +2,3 @@
debian/moldeb.1
debian/molrcget.1
debian/strip_nwrom.1
-debian/molvconfig.1
Deleted: mol/trunk/debian/molvconfig.sgml
===================================================================
--- mol/trunk/debian/molvconfig.sgml 2007-05-05 14:29:36 UTC (rev 131)
+++ mol/trunk/debian/molvconfig.sgml 2007-07-25 22:19:34 UTC (rev 132)
@@ -1,103 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY linux "<productname>Linux/PowerPC</productname>">
- <!ENTITY macos "<productname>MacOS</productname>">
- <!ENTITY mol "<productname>Mac-on-Linux</productname>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- <email>jensen at debian.org</email>
- </address>
- <author>
- <firstname>Jens</firstname>
- <surname>Schmalzing</surname>
- </author>
- <date>Apr 23 2001</date>
- </refentryinfo>
- <refmeta>
- <refentrytitle>molvconfig</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>molvconfig</refname>
- <refpurpose>Console video configuration for Mac-on-Linux</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>molvconfig</command>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>Description</title>
-
- <para>
- <command>molvconfig</command> find a free virtual terminal and
- uses it to interactively probe the video modes specified in the
- file <filename>/etc/fb.modes</filename>, and in the files found
- in the directory <filename>/usr/share/mol/vmodes/</filename>. The
- video modes that are found to work on a particular system are
- written to the video mode database
- <filename>/var/lib/mol/fb_modes</filename>, where they can be used
- by the console video driver of &mol;.
- </para>
-
- </refsect1>
-
- <refsect1>
- <title>Files</title>
-
- <para>
- <filename>/usr/share/mol/vmodes/</filename> contains a set of
- files with typical video modes for various Macs.
- </para>
-
- <para>
- <filename>/etc/fb.modes</filename> is usually created with
- <command>fbset</command> and contains the current framebuffer
- settings.
- </para>
-
- <para>
- <filename>/var/lib/mol/fb_modes</filename> contains the video mode
- database generated for a particular system.
- </para>
- </refsect1>
-
- <refsect1>
- <title>See also</title>
-
- <para>
- mol(7), molrc(5), moldeb(1), molrcget(1), startmol(1),
- strip_nwrom(1).
- </para>
- </refsect1>
-
- <refsect1>
- <title>Author</title>
-
- <para>
- This manual page was written by Jens Schmalzing
- <email><jensen at debian.org></email> for &debian;.
- </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
Modified: mol/trunk/debian/patches/00list
===================================================================
--- mol/trunk/debian/patches/00list 2007-05-05 14:29:36 UTC (rev 131)
+++ mol/trunk/debian/patches/00list 2007-07-25 22:19:34 UTC (rev 132)
@@ -3,3 +3,4 @@
modload
if-tap
Makefile_kmod
+blk_dmg_compile_fix
Modified: mol/trunk/debian/patches/Makefile.dpatch
===================================================================
--- mol/trunk/debian/patches/Makefile.dpatch 2007-05-05 14:29:36 UTC (rev 131)
+++ mol/trunk/debian/patches/Makefile.dpatch 2007-07-25 22:19:34 UTC (rev 132)
@@ -2,23 +2,26 @@
## Makefile.dpatch by <gaudenz at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove installation of non-free parts from Makefile
+## DP: Remove compilation and installation of non-free parts from Makefile
@DPATCH@
-diff -urNad mol-0.9.71~pre8~/Makefile.dist mol-0.9.71~pre8/Makefile.dist
---- mol-0.9.71~pre8~/Makefile.dist 2006-08-19 14:40:24.000000000 +0200
-+++ mol-0.9.71~pre8/Makefile.dist 2006-08-19 14:43:16.000000000 +0200
-@@ -73,7 +73,7 @@
- install-config:
- @$(MAKE) -C Doc install-config-force
+diff -urNad mol-0.9.72~dfsg~/Makefile mol-0.9.72~dfsg/Makefile
+--- mol-0.9.72~dfsg~/Makefile 2007-03-03 04:49:10.000000000 +0100
++++ mol-0.9.72~dfsg/Makefile 2007-05-08 23:25:57.000000000 +0200
+@@ -7,7 +7,7 @@
+ include config/Makefile.top
+ include config/Makefile.master
--install: bincheck install-modules
-+install: install-modules
- @$(INSTALL_DIR) -v $(_bindir) $(_datadir) $(_etcdir) $(_vardir)
- @$(INSTALL_DIR) -v $(_docdir) $(_libdir) $(_libdir)/bin/
- @$(INSTALL_DIR) -v $(addprefix $(_datadir)/, images nvram drivers oftrees)
-@@ -102,14 +102,7 @@
+-SUBDIRS = . scripts src util/img bootx
++SUBDIRS = . scripts src util/img
+ MAKE += -s
+ $(OINC)/cpu: $(OINC)/.dir
+diff -urNad mol-0.9.72~dfsg~/Makefile.dist mol-0.9.72~dfsg/Makefile.dist
+--- mol-0.9.72~dfsg~/Makefile.dist 2007-03-03 04:49:05.000000000 +0100
++++ mol-0.9.72~dfsg/Makefile.dist 2007-05-08 23:26:11.000000000 +0200
+@@ -94,15 +94,7 @@
+
@$(INSTALL_DATA) -v $(mollib)/mol.symbols $(_libdir)/
- @$(INSTALL_DATA) COPYING COPYRIGHT CREDITS $(_docdir)/
@@ -29,7 +32,8 @@
- @$(INSTALL_DATA) $(molshare)/drivers/bootx $(_datadir)/drivers/
- @$(INSTALL_DATA) $(molshare)/drivers/of $(_datadir)/drivers/
- @$(INSTALL_DATA) $(molshare)/drivers/openbios $(_datadir)/drivers/
+- @$(INSTALL_DATA) $(molshare)/images/*.dmg $(_datadir)/images/
+ @$(INSTALL_DATA) CREDITS $(_docdir)/
- @$(INSTALL_DATA) $(molshare)/images/*.dmg $(_datadir)/images/
@$(INSTALL_DATA) $(molshare)/startboing $(_datadir)/startboing
@$(INSTALL_DATA) $(molshare)/graphics/*.raw $(_datadir)/graphics/
+ @$(INSTALL_DATA) $(molshare)/graphics/*.png $(_datadir)/graphics/
Added: mol/trunk/debian/patches/blk_dmg_compile_fix.dpatch
===================================================================
--- mol/trunk/debian/patches/blk_dmg_compile_fix.dpatch (rev 0)
+++ mol/trunk/debian/patches/blk_dmg_compile_fix.dpatch 2007-07-25 22:19:34 UTC (rev 132)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## blk_dmg_compile_fix.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation of blk_dmg.c, zlib.h must be included after stdio.h
+## DP: to work with _LARGEFILE64_SOURCE for unknown reasons and zlib > 1.2.3
+
+ at DPATCH@
+diff -urNad mol-0.9.72.1~dfsg~/src/drivers/disk/blk_dmg.c mol-0.9.72.1~dfsg/src/drivers/disk/blk_dmg.c
+--- mol-0.9.72.1~dfsg~/src/drivers/disk/blk_dmg.c 2007-06-25 19:52:17.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/drivers/disk/blk_dmg.c 2007-07-25 23:08:12.000000000 +0200
+@@ -26,8 +26,8 @@
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+-#include <stdio.h>
+ #include "blk_dmg.h"
++#include <stdio.h>
+
+ /* Read 64 bit value */
+ static off_t read_off(int fd)
Property changes on: mol/trunk/debian/patches/blk_dmg_compile_fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mol/trunk/debian/po/nl.po
===================================================================
--- mol/trunk/debian/po/nl.po (rev 0)
+++ mol/trunk/debian/po/nl.po 2007-07-25 22:19:34 UTC (rev 132)
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mol\n"
+"Report-Msgid-Bugs-To: pkg-mol-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-10-06 19:30+0200\n"
+"PO-Revision-Date: 2007-04-17 17:42+0100\n"
+"Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: boolean
+#. Description
+#: ../mol.templates:1001
+msgid "Make Mac-on-Linux setuid root?"
+msgstr "Wilt u Mac-on-Linux met de SUID-bit voor root actief installeren?"
+
+#. Type: boolean
+#. Description
+#: ../mol.templates:1001
+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 "Als u Mac-on-Linux installeert met de SUID-bit voor root actief zullen gewone gebruikers in staat zijn om de Mac-on-Linux-emulator te starten via het script startmol of de Debian-menuingangen. Aangezien elk binair bestand waarvoor de SUID-bit voor root actief is een veiligheidsrisico is, is deze optie standaard uitgeschakeld. "
+
+#. Type: string
+#. Description
+#: ../mol.templates:2001
+msgid "Group for Mac-on-Linux users:"
+msgstr "Groep voor Mac-on-Linux gebruikers:"
+
+#. Type: string
+#. Description
+#: ../mol.templates:2001
+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 "U heeft ervoor gekozen om de Mac-on-Linux-emulator te installeren met de SUID-bit voor root actief zodat gewone gebuikers de emulator kunnen gebruiken zonder extra rechten nodig te hebben. On het hiermee samen hangende veiligheidsrisico te beperken is het aangeraden om dit enkel toe te laten voor leden van een bepaalde groep. Als deze groep nog niet bestaat wordt deze aangemaakt, u dient gebruikers handmatig via het commando adduser(8) toe te voegen."
+
+#. 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 "Als u iedereen toegang wilt geven voer hier dan 'EVERYBODY' in als groepsnaam. Merk op dat dit ten sterkste af te raden is."
+
Added: mol/trunk/debian/po/pt.po
===================================================================
--- mol/trunk/debian/po/pt.po (rev 0)
+++ mol/trunk/debian/po/pt.po 2007-07-25 22:19:34 UTC (rev 132)
@@ -0,0 +1,71 @@
+# Portuguese translation of mol's debconf messages.
+# Copyright (C) 2007
+# This file is distributed under the same license as the mol package.
+# Luísa Lourenço <kikentai at gmail.com>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mol 0.9.71.dfsg-5\n"
+"Report-Msgid-Bugs-To: pkg-mol-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-10-06 19:30+0200\n"
+"PO-Revision-Date: 2007-03-16 10:14+0000\n"
+"Last-Translator: Luísa Lourenço <kikentai at gmail.com>\n"
+"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../mol.templates:1001
+msgid "Make Mac-on-Linux setuid root?"
+msgstr "Tornar Mac-em-Linux setuid root?"
+
+#. Type: boolean
+#. Description
+#: ../mol.templates:1001
+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 ""
+"Se tornar Mac-em-Linux setuid root, utilizadores não root poderão executar "
+"o emulador Mac-em-Linux através do script startmol ou das entradas de menu "
+"do Debian. Visto que todo o binário setuid root é um potencial risco de "
+"segurança e pode ser usado para comprometer o seu sistema, esta opção está "
+"desactivada por omissão."
+
+#. Type: string
+#. Description
+#: ../mol.templates:2001
+msgid "Group for Mac-on-Linux users:"
+msgstr "Grupo para utilizadores do Mac-em-Linux:"
+
+#. Type: string
+#. Description
+#: ../mol.templates:2001
+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 ""
+"Escolheu tornar Mac-em-Linux setuid root para que utilizadores não root "
+"possam executar o emulador sem privilégios adicionais. Para reduzir o risco "
+"de segurança envolvido, é recomendado que só permita isto para os membros de "
+"um certo grupo. Se este grupo ainda não existe, irá ser criado e terá que "
+"adicionar utilizadores manualmente com o comando 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 ""
+"Se quer permitir acesso a todos, insira EVERYBOSY (em letras maiúsculas) "
+"como o nome do grupo. Note que isto é fortemente desencorajado."
+
Modified: mol/trunk/debian/rules
===================================================================
--- mol/trunk/debian/rules 2007-05-05 14:29:36 UTC (rev 131)
+++ mol/trunk/debian/rules 2007-07-25 22:19:34 UTC (rev 132)
@@ -34,7 +34,7 @@
# build the Debian specific manpages
(cd debian; \
- for man in mol.7 moldeb.1 molrcget.1 strip_nwrom.1 molvconfig.1; \
+ for man in mol.7 moldeb.1 molrcget.1 strip_nwrom.1; \
do docbook-to-man `echo $$man|sed 's/[17]/sgml/'` >$$man; \
done)
@@ -60,6 +60,8 @@
-$(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
@@ -87,9 +89,6 @@
# fix permissions
chmod 644 `pwd`/debian/mol/usr/lib/mol/mol.symbols
-# remove incomplete manpage
- rm `pwd`/debian/mol/usr/share/man/man1/molvconfig.1
-
# remove gratious GPL license text
rm `pwd`/debian/mol/usr/share/doc/mol/COPYING
More information about the Pkg-mol-commits
mailing list