Hello community, here is the log from the commit of package opensuse-manual_de checked in at Fri Aug 17 02:27:44 CEST 2007. -------- --- opensuse-manual_de/opensuse-manual_de.changes 2007-08-15 08:46:00.000000000 +0200 +++ /mounts/work_src_done/NOARCH/opensuse-manual_de/opensuse-manual_de.changes 2007-08-16 16:05:31.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 16 16:03:20 CEST 2007 - ke@suse.de + +- Build preliminary package using the old translation files. +- Obsolete opensuse-quickstart_de, reported by Stephan Kulow; # 300538. + +------------------------------------------------------------------- New: ---- APPARMOR-admin_de-graphics.tar.bz2 APPARMOR-admin_de.pdf APPARMOR-admin_de.tar.bz2 opensuse-gnomequick_de-graphics.tar.bz2 opensuse-gnomequick_de.pdf opensuse-gnomequick_de.tar.bz2 opensuse-kdequick_de-graphics.tar.bz2 opensuse-kdequick_de.pdf opensuse-kdequick_de.tar.bz2 opensuse-kdeuser_de-graphics.tar.bz2 opensuse-kdeuser_de.pdf opensuse-kdeuser_de.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manual_de.spec ++++++ --- /var/tmp/diff_new_pack.TI4214/_old 2007-08-17 02:27:06.000000000 +0200 +++ /var/tmp/diff_new_pack.TI4214/_new 2007-08-17 02:27:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package opensuse-manual_de (Version 10.2) +# spec file for package opensuse-manual_de (Version 10.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,23 +12,41 @@ Name: opensuse-manual_de %define my_lang de +%define my_prov_obs suselinux-adminguide_%{my_lang} suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang} %define my_book opensuse-html -Version: 10.2 -Release: 40 +Version: 10.3 +Release: 1 +Obsoletes: %{my_prov_obs} +Provides: %{my_prov_obs} +Provides: locale(desktop-data-SuSE:de) +Obsoletes: suselinux-manual_de opensuse-quickstart_de +Provides: suselinux-manual_de opensuse-quickstart_de #OBS Source00: opensuse-html_de-html.tar.bz2 Source01: opensuse-html_de-desktop.tar.bz2 -Source10: opensuse-reference_de.pdf -Source11: opensuse-reference_de-graphics.tar.bz2 -Source12: opensuse-reference_de.tar.bz2 +Source10: opensuse-gnomequick_de.pdf +Source11: opensuse-gnomequick_de-graphics.tar.bz2 +Source12: opensuse-gnomequick_de.tar.bz2 Source13: LICENSE.txt -Source20: opensuse-startup_de.pdf -Source21: opensuse-startup_de-graphics.tar.bz2 -Source22: opensuse-startup_de.tar.bz2 +Source20: opensuse-kdequick_de.pdf +Source21: opensuse-kdequick_de-graphics.tar.bz2 +Source22: opensuse-kdequick_de.tar.bz2 +Source30: opensuse-kdeuser_de.pdf +Source31: opensuse-kdeuser_de-graphics.tar.bz2 +Source32: opensuse-kdeuser_de.tar.bz2 +Source40: opensuse-reference_de.pdf +Source41: opensuse-reference_de-graphics.tar.bz2 +Source42: opensuse-reference_de.tar.bz2 +Source50: opensuse-startup_de.pdf +Source51: opensuse-startup_de-graphics.tar.bz2 +Source52: opensuse-startup_de.tar.bz2 +Source60: APPARMOR-admin_de.pdf +Source61: APPARMOR-admin_de-graphics.tar.bz2 +Source62: APPARMOR-admin_de.tar.bz2 #SOURCES BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArchitectures: noarch -Provides: locale(desktop-data-SuSE:%my_lang) +BuildRequires: update-desktop-files Group: Documentation/SuSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE Manual (German) @@ -45,7 +63,9 @@ Group: Documentation/SuSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE Manual (German) as PDF -Provides: locale(opensuse-manual_en-pdf:%my_lang) +Provides: locale(desktop-data-SuSE:de) +Obsoletes: suselinux-manual_de-pdf opensuse-quickstart_de-pdf +Provides: suselinux-manual_de-pdf opensuse-quickstart_de-pdf #PDFOBS %description pdf @@ -57,24 +77,41 @@ #%setup -c -q %setup -c -q -a 01 #PREP +find -name '*.png' -o -name '*.svg' | xargs chmod 644 cp %{S:10} . cp %{S:20} . +cp %{S:30} . +cp %{S:40} . +cp %{S:50} . +cp %{S:60} . #PDFPREP %build find . -name CVS -o -name '.xvpics' -o -name '.cvsignore' \ | xargs rm -fr -find -type f -name '*.png' -print0 | xargs -0 chmod a-x +# make sure index.html exists +for f in $(find html -type f -name 'book.*'); do + pushd ${f%/*} + [ -f index.html -o -L index.html ] || ln -sf ${f##*/} index.html + popd +done %install [ -d $RPM_BUILD_ROOT ] && rm -fvr $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} +# is set for sles or sled as /sles or /sled %define my_desktopdir /usr/share/susehelp/meta +echo %{my_desktopdir} | sed 's:\(\|xyzy\)::' >filelist # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} ### install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} -%define gnome_dir /usr/share/gnome/help/%{name} -install -d $RPM_BUILD_ROOT/%{gnome_dir} +# product is name without language code +%if %suse_version < 1030 +%define gnome_dir /opt/gnome/share/gnome/help/opensuse-manual +%else +%define gnome_dir %{_datadir}/gnome/help/opensuse-manual +%endif +install -d $RPM_BUILD_ROOT%{gnome_dir} # if [ -d html/%my_book ]; then mv html/%my_book html/manual @@ -98,9 +135,9 @@ s/\[\]// s|@id@|$id|" $f case $d in - *.startup) + *_startup) [ $f = "./.directory" ] \ - && sed -i "s|^\(X-DOC-Weight\).*|\1=-2000|" $f ;; + && sed -i "s|^\(X-DOC-Weight\).*|\1=-10000|" $f ;; esac done popd @@ -118,21 +155,21 @@ s/^\(Name\|Comment\)\(.*\)/\1\2 (%{my_lang})/' $f fi done -# remove the dots from the file names -for f in $(find . -type f -name '*desktop'); do - d=${f%/*} - n=${f##*/}; n=${n/\.desktop}; n=${n//\./_}; n=${n}.desktop - [ $f = $d/$n ] || mv -v $f $d/$n -done -ren_dir () { - for d in $(find . -maxdepth $1 -mindepth $1 -type d); do - n=${d#*/}; n=${n//\./_} - [ $d = $n ] || mv -v $d $n - done -} -ren_dir 1 -ren_dir 2 -# +# # remove the dots from the file names +# for f in $(find . -type f -name '*desktop'); do +# d=${f%/*} +# n=${f##*/}; n=${n/\.desktop}; n=${n//\./_}; n=${n}.desktop +# [ $f = $d/$n ] || mv -v $f $d/$n +# done +# ren_dir () { +# for d in $(find . -maxdepth $1 -mindepth $1 -type d); do +# n=${d#*/}; n=${n//\./_} +# [ $d = $n ] || mv -v $d $n +# done +# } +# ren_dir 1 +# ren_dir 2 +# # cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name} popd # Link it into the Gnome help system (must be found by calling @@ -153,6 +190,7 @@ install -d html/manual echo PDF only > html/manual/%{name} fi +%suse_update_desktop_file $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory %files pdf %defattr(-, root, root) @@ -169,6 +207,9 @@ %dir /usr/share/gnome/help %changelog +* Thu Aug 16 2007 - ke@suse.de +- Build preliminary package using the old translation files. +- Obsolete opensuse-quickstart_de, reported by Stephan Kulow; # 300538. * Wed Aug 15 2007 - coolo@suse.de - trigger installation on german desktop installations (#296873) * Mon Jun 04 2007 - dmueller@suse.de ++++++ opensuse-html_de-desktop.tar.bz2 ++++++ ++++ 3407 lines of diff (skipped) ++++++ opensuse-html_de-html.tar.bz2 ++++++ opensuse-manual_de/opensuse-html_de-html.tar.bz2 /mounts/work_src_done/NOARCH/opensuse-manual_de/opensuse-html_de-html.tar.bz2 differ: byte 24725969, line 95347 ++++++ opensuse-reference_de.pdf ++++++ (binary differes) ++++++ opensuse-reference_de.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ENV-opensuse-reference new/ENV-opensuse-reference --- old/ENV-opensuse-reference 2006-11-19 13:59:31.000000000 +0100 +++ new/ENV-opensuse-reference 2007-06-04 14:08:19.000000000 +0200 @@ -1,16 +1,11 @@ # -*- shell-script -*- -# $Id: ENV-opensuse-reference 14259 2006-10-20 14:13:17Z jjaeger $ +# $Id: ENV-opensuse-reference 20938 2007-05-24 08:55:36Z taroth $ -if [ -d ../../novdoc ]; then - export DTDROOT=$(cd ../../novdoc; pwd) -else - export DTDROOT=$(cd /usr/share/susedoc; pwd) -fi -. $DTDROOT/etc/system-profile +. .env-profile export MAIN=MAIN.opensuse.xml #export BOOK=SLPROF-online export ROOTID="book.opensuse.reference" export PROFARCH="x86;amd64;em64t" export PROFOS="slprof;slpers" -export DISTVER="10.2" +export DISTVER="10.3" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/.env-profile new/.env-profile --- old/.env-profile 1970-01-01 01:00:00.000000000 +0100 +++ new/.env-profile 2007-07-31 09:44:39.000000000 +0200 @@ -0,0 +1,7 @@ +# -*- shell-script -*- +unset DTDROOT +export DTDROOT=$(make dtdroot) +echo "Using the DTDROOT ${DTDROOT}" +. $DTDROOT/etc/system-profile + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Makefile new/Makefile --- old/Makefile 2006-11-19 13:59:31.000000000 +0100 +++ new/Makefile 2007-07-31 09:44:39.000000000 +0200 @@ -1,7 +1,19 @@ # .PHONY: default # default: help -include ../../novdoc/make/common.mk +ifndef DTDROOT +DTDPATH1 = /usr/share/susedoc +DTDPATH2 = $(shell test -d ../../novdoc && (cd ../../novdoc; pwd)) +DTDPATH3 = $(shell test -d ../../../../trunk/novdoc && (cd ../../../../trunk/novdoc; pwd)) + +DTDROOT := $(firstword $(DTDPATH2) $(DTDPATH3) $(DTDPATH1)) +else +include $(DTDROOT)/make/common.mk +endif + +.PHONY: dtdroot +dtdroot: + @echo $(DTDROOT) # Emacs: # Local Variables: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/entity-decl.ent new/xml/entity-decl.ent --- old/xml/entity-decl.ent 2006-11-19 13:59:04.000000000 +0100 +++ new/xml/entity-decl.ent 2007-08-16 14:57:31.000000000 +0200 @@ -6,33 +6,34 @@ <!ENTITY exampleuser "tux"> <!ENTITY exampleuserII "wilber"> <!ENTITY examplegroup "users"> -<!ENTITY exampledomain "example.com"> -<!ENTITY exampledomainip "192.168.0"> -<!ENTITY exampledomain1 "example.net"> -<!ENTITY exampledomain1ip "192.168.1"> -<!ENTITY exampledomain2 "example.org"> -<!ENTITY exampledomain2ip "192.168.2"> -<!-- ipv6 equivalent to 192.168.2.10 --> -<!ENTITY exampledomain2ipv6 "2002:c0a8:20a::"> - -<!ENTITY exampleserver "sun"> -<!ENTITY exampleserverip "&exampledomainip;.20"> -<!ENTITY exampleserverfq "&exampleserver;.&exampledomain;"> - -<!ENTITY exampleclient "earth"> -<!ENTITY exampleclientip "&exampledomainip;.1"> -<!ENTITY exampleclientfq "&exampleclient;.&exampledomain;"> - -<!ENTITY exampleclientppp "ppp&exampleclient;"> -<!ENTITY exampleclientslip "sl&exampleclient;"> -<!ENTITY exampleclientuucp "uu&exampleclient;"> +<!-- #######################################################################--> +<!-- Obsolete entities. Do not use. --> +<!-- See network-decl.ent for Network related entities --> + +<!ENTITY exampledomainip "192.168.0"> +<!ENTITY exampledomain1ip "192.168.1"> +<!ENTITY exampledomain2ip "192.168.2"> +<!-- ipv6 equivalent to 192.168.2.10 --> +<!ENTITY exampledomain2ipv6 "2002:c0a8:20a::"> +<!ENTITY exampleserver "sun"> +<!ENTITY exampleserverip "&exampledomainip;.20"> +<!ENTITY exampleserverfq "&exampleserver;.&exampledomain;"> +<!ENTITY exampleclient "earth"> +<!ENTITY exampleclientip "&exampledomainip;.1"> +<!ENTITY exampleclientfq "&exampleclient;.&exampledomain;"> +<!ENTITY exampleclientppp "ppp&exampleclient;"> +<!ENTITY exampleclientslip "sl&exampleclient;"> +<!ENTITY exampleclientuucp "uu&exampleclient;"> <!ENTITY exampleclientII "venus"> <!ENTITY exampleclientIIppp "ppp&exampleclientII;"> <!ENTITY exampleclientIIslip "sl&exampleclientII;"> <!ENTITY exampleclientIIuucp "uu&exampleclientII;"> +<!-- #######################################################################--> + + <!ENTITY rootuser '<systemitem class="username">root</systemitem>'> <!ENTITY grub "GRUB"> @@ -47,8 +48,10 @@ <!ENTITY yast "YaST"> <!ENTITY ay "AutoYaST"> <!ENTITY nm "NetworkManager"> - - +<!ENTITY fspot "f-spot"> +<!ENTITY digikam "digiKam"> +<!ENTITY yelp "Yelp"> +<!ENTITY khc "KDE- Hilfezentrum"> <!-- ============================================================= --> <!-- Books --> <!-- ============================================================= --> @@ -57,18 +60,20 @@ <!ENTITY prep "<emphasis>Architecture-Specific Information</emphasis>"> <!ENTITY sleddepl "<emphasis>Deployment Guide</emphasis>"> <!ENTITY kdeuser "<emphasis>KDE User Guide</emphasis>"> -<!ENTITY gnuser "<emphasis>GNOME User Guide</emphasis>"> -<!ENTITY instqs "<emphasis>Installation Quick Start</emphasis>"> +<!ENTITY gnuser "<emphasis>GNOME User Guide</emphasis>"> +<!ENTITY instqs "<emphasis>Installation Quick Start</emphasis>"> <!ENTITY con "<emphasis>Network Connectivity Guide</emphasis>"> <!ENTITY gnqs "<emphasis>GNOME Quick Start</emphasis>"> <!ENTITY kdeqs "<emphasis>KDE Quick Start</emphasis>"> <!ENTITY slsadguide "<emphasis>Installation and Administration</emphasis>"> <!ENTITY adguide "<emphasis>Referenz</emphasis>"> -<!ENTITY userguide "<emphasis>Start</emphasis>"> <!ENTITY appl "<emphasis>Applications</emphasis>"> +<!ENTITY userguide "<emphasis>Start</emphasis>"> <!ENTITY apparm "<emphasis>AppArmor</emphasis>"> <!ENTITY apparm_admin "<emphasis>Novell AppArmor Administration Guide</emphasis>"> <!ENTITY apparm_inst "<emphasis>Novell AppArmor Installation and QuickStart Guide</emphasis>"> +<!ENTITY apparmqs "<emphasis>Novell AppArmor Quick Start</emphasis>"> +<!ENTITY lfl "<emphasis>Lessons For Lizards</emphasis>"> <!-- ============================================================= --> <!-- Platforms --> @@ -82,7 +87,7 @@ <!ENTITY ipseries "POWER"> <!ENTITY ppc "POWER"> <!ENTITY em64t "Intel EM64T"> -<!ENTITY intel64 "Intel 64"> +<!ENTITY intel64 "Intel 64"> <!-- ============================================================= --> @@ -91,24 +96,26 @@ <!-- please change product to anything that makes sense in your current release --> <!ENTITY product "openSUSE"> -<!ENTITY productreg "openSUSE™"> +<!ENTITY productreg "openSUSE®"> +<!ENTITY opensuse "openSUSE"> <!ENTITY sle "SUSE Linux Enterprise"> <!ENTITY slereg "SUSE® Linux Enterprise"> <!ENTITY sls "SUSE Linux Enterprise Server"> -<!ENTITY slsa "SLES"> +<!ENTITY slsa "SLES"> <!ENTITY slsreg "SUSE® Linux Enterprise Server"> <!ENTITY nld "SUSE Linux Enterprise Desktop"> -<!ENTITY nlda "SLED"> +<!ENTITY nlda "SLED"> <!ENTITY nldreg "SUSE® Linux Enterprise Desktop"> <!ENTITY sdk "SUSE Software Development Kit"> <!ENTITY musicplayer "Helix Banshee"> <!ENTITY zenup "Software-Aktualisierungsfunktion"> <!ENTITY updater "openSUSE Updater"> -<!ENTITY aa "AppArmor"> -<!ENTITY naa "Novell AppArmor"> -<!ENTITY naareg "Novell® AppArmor"> -<!ENTITY slreg "SUSE® Linux"> -<!ENTITY version "10.2"> +<!ENTITY aa "AppArmor"> +<!ENTITY naa "Novell AppArmor"> +<!ENTITY naareg "Novell® AppArmor"> +<!ENTITY slreg "SUSE® Linux"> +<!ENTITY version "10.3"> +<!ENTITY slepos "SUSE Linux Enterprise Point of Service"> <!-- oddities --> <!ENTITY thrdmrk "*"> @@ -122,9 +129,10 @@ <!-- Additional Entities --> <!ENTITY euro "€"> -<!-- -<!ENTITY % desktop-entities SYSTEM "desktop-entities.ent"> -%desktop-entities; --> + +<!ENTITY % network-entities SYSTEM "network-decl.ent"> +%network-entities; + <!-- End of file --> <!-- ............................................................. --> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/network-decl.ent new/xml/network-decl.ent --- old/xml/network-decl.ent 1970-01-01 01:00:00.000000000 +0100 +++ new/xml/network-decl.ent 2007-08-16 14:57:31.000000000 +0200 @@ -0,0 +1,165 @@ +<!-- ...................................................................... --> +<!-- General Entities --> +<!-- ...................................................................... --> + +<!-- domains --> +<!ENTITY exampledomain "example.com"> +<!ENTITY exampledomain1 "example.net"> +<!ENTITY exampledomain2 "example.org"> + +<!-- subnets --> +<!ENTITY subnetI "192.168.1"> +<!ENTITY subnetImask "&subnetI;.0/24"> +<!ENTITY subnetII "192.168.2"> +<!ENTITY subnetIImask "&subnetII;.0/24"> +<!ENTITY subnetIII "192.168.3"> +<!ENTITY subnetIIImask "&subnetIII;.0/24"> +<!ENTITY subnetIV "192.168.4"> +<!ENTITY subnetIVmask "&subnetIV;.0/24"> +<!ENTITY subnetV "192.168.5"> +<!ENTITY subnetVmask "&subnetV;.0/30"> + +<!ENTITY subnetv6 "2002:c0a8"> + +<!-- Broadcast addresses --> +<!ENTITY subnetIbc "&subnetI;.255"> +<!ENTITY subnetIIbc "&subnetII;.255"> +<!ENTITY subnetIIIbc "&subnetIII;.255"> +<!ENTITY subnetIVbc "&subnetIV;.255"> +<!ENTITY subnetVbc "&subnetV;.252"> + +<!-- Netmask for C class network --> +<!ENTITY subnetmask "255.255.255.0"> + +<!-- DNS names (server) --> +<!ENTITY smbname "smb.&exampledomain;"> +<!ENTITY nfsname "nfs.&exampledomain;"> +<!ENTITY iscsiname "iscsi.&exampledomain;"> +<!ENTITY proxyname "www-proxy.&exampledomain;"> +<!ENTITY ldapname "ldap.&exampledomain;"> +<!ENTITY nisname "nis.&exampledomain;"> +<!ENTITY slpname "slp.&exampledomain;"> +<!ENTITY ntpname "ntp.&exampledomain;"> +<!ENTITY tftpname "tftp.&exampledomain;"> +<!ENTITY pxename "pxe.&exampledomain;"> +<!ENTITY kdcname "kdc.&exampledomain;"> +<!ENTITY dnsname "dns.&exampledomain;"> +<!ENTITY dhcpname "dhcp.&exampledomain;"> +<!ENTITY cupsname "cups.&exampledomain;"> + +<!-- DNS names (infrastructure) --> +<!ENTITY wwwname "www.&exampledomain;"> +<!ENTITY wwwname1 "www.&exampledomain1;"> +<!ENTITY wwwname2 "www.&exampledomain2;"> +<!ENTITY ftpname "ftp.&exampledomain;"> +<!ENTITY mailname "mail.&exampledomain;"> +<!ENTITY routerextname "routerext.&exampledomain;"> +<!ENTITY routerintname "routerint.&exampledomain;"> +<!ENTITY fwextname "fwext.&exampledomain;"> +<!ENTITY fwintname "fwint.&exampledomain;"> +<!ENTITY gatename "gate.&exampledomain;"> + +<!-- DNS names (clients) --> +<!ENTITY wsIname "jupiter.&exampledomain;"> +<!ENTITY wsIIname "venus.&exampledomain;"> +<!ENTITY wsIIIname "saturn.&exampledomain;"> +<!ENTITY wsIVname "mercury.&exampledomain;"> + +<!-- names (clients) --> +<!ENTITY wsI "jupiter"> +<!ENTITY wsII "venus"> +<!ENTITY wsIII "saturn"> +<!ENTITY wsIV "mercury"> + +<!-- MAC addresses --> +<!ENTITY wsImac "00:30:6E:08:EC:80"> +<!ENTITY wsIImac "00:00:1C:B5:A4:32"> +<!ENTITY wsIIImac "00:17:31:CA:A3:4A"> +<!ENTITY wsIVmac "00:16:35:AF:94:4B"> + +<!-- IP addresses (server) --> +<!ENTITY smbip "&subnetI;.110"> +<!ENTITY smbipv6 "&subnetv6;:16e::"> +<!ENTITY nfsip "&subnetI;.110"> +<!ENTITY nfsipv6 "&subnetv6;:16e::"> +<!ENTITY iscsiip "&subnetI;.111"> +<!ENTITY iscsiipv6 "&subnetv6;:16f::"> +<!ENTITY proxyip "&subnetI;.112"> +<!ENTITY proxyipv6 "&subnetv6;170::"> +<!ENTITY ldapip "&subnetI;.113"> +<!ENTITY ldapipv6 "&subnetv6;:171::"> +<!ENTITY nisip "&subnetI;.113"> +<!ENTITY nisipv6 "&subnetv6;:171::"> +<!ENTITY ntpip "&subnetI;.116"> +<!ENTITY ntpipv6 "&subnetv6:174::;"> +<!ENTITY tftpip "&subnetI;.115"> +<!ENTITY tftpipv6 "&subnetv6;:173::"> +<!ENTITY pxeip "&subnetI;.115"> +<!ENTITY pxeipv6 "&subnetv6;:173::"> +<!ENTITY kdcip "&subnetI;.114"> +<!ENTITY kdcipv6 "&subnetv6;:172::"> +<!ENTITY dnsip "&subnetI;.116"> +<!ENTITY dnsipv6 "&subnetv6;:174::"> + +<!ENTITY slpip "&subnetII;.254"> +<!ENTITY slpipv6 "&subnetv6;:2fe::"> +<!ENTITY dhcpip "&subnetII;.254"> +<!ENTITY dhcpipv6 "&subnetv6;:2fe::"> +<!ENTITY cupsip "&subnetII;.253"> +<!ENTITY cupsipv6 "&subnetv6;:2fd::"> + +<!-- IP addresses (infrastructure) --> +<!ENTITY routerintipI "&subnetI;.1"> +<!ENTITY routerintipIv6 "&subnetv6;:101::"> +<!ENTITY fwintipI "&subnetI;.1"> +<!ENTITY fwintipIv6 "&subnetv6;:101::"> + +<!ENTITY routerintipII "&subnetII;.1"> +<!ENTITY routerintipIIv6 "&subnetv6;:201::"> +<!ENTITY fwintipII "&subnetII;.1"> +<!ENTITY fwintipIIv6 "&subnetv6;:201::"> + +<!ENTITY wwwip "&subnetIII;.100"> +<!ENTITY wwwipv6 "&subnetv6;:364::"> +<!ENTITY wwwip1 "&subnetIII;.101"> +<!ENTITY wwwip1v6 "&subnetv6;:365::"> +<!ENTITY wwwip2 "&subnetIII;.102"> +<!ENTITY wwwip2v6 "&subnetv6;:366::"> +<!ENTITY ftpip "&subnetIII;.105"> +<!ENTITY ftpipv6 "&subnetv6;:369::"> +<!ENTITY mailip "&subnetIII;.108"> +<!ENTITY mailipv6 "&subnetv6;:36c::"> +<!ENTITY routerextipIII "&subnetIII;.2"> +<!ENTITY routerextipIIIv6 "&subnetv6;:302::"> +<!ENTITY fwextipIII "&subnetIII;.2"> +<!ENTITY fwextipIIIv6 "&subnetv6;:302::"> + +<!ENTITY routerintipIV "&subnetIV;.1"> +<!ENTITY routerintipIVv6 "&subnetv6;:401::"> +<!ENTITY routerextipIV "&subnetIV;.2"> +<!ENTITY routerextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwextipIV "&subnetIV;.2"> +<!ENTITY fwextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwintipIV "&subnetIV;.1"> +<!ENTITY fwintipIVv6 "&subnetv6;:401::"> + +<!ENTITY routerextipV "&subnetV;.2"> +<!ENTITY routerextipVv6 "&subnetv6;:502::"> +<!ENTITY fwextipV "&subnetV;.2"> +<!ENTITY fwextipVv6 "&subnetv6;:502::"> +<!ENTITY gateip "&subnetV;.1"> +<!ENTITY gateipv6 "&subnetv6;:501::"> + +<!-- IP addresses (clients) --> +<!ENTITY wsIip "&subnetII;.100"> +<!ENTITY wsIipv6 "&subnetv6;:264::"> +<!ENTITY wsIIip "&subnetII;.101"> +<!ENTITY wsIIipv6 "&subnetv6;:265::"> +<!ENTITY wsIIIip "&subnetII;.102"> +<!ENTITY wsIIIipv6 "&subnetv6;:266::"> +<!ENTITY wsIVip "&subnetII;.103"> +<!ENTITY wsIVipv6 "&subnetv6;:267::"> + +<!-- End of file --> +<!-- ............................................................. --> + ++++++ opensuse-startup_de.pdf ++++++ (binary differes) ++++++ opensuse-startup_de.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ENV-opensuse-startup new/ENV-opensuse-startup --- old/ENV-opensuse-startup 2006-11-19 13:59:31.000000000 +0100 +++ new/ENV-opensuse-startup 2007-06-04 14:08:19.000000000 +0200 @@ -1,16 +1,11 @@ # -*- shell-script -*- -# $Id: ENV-opensuse-startup 13416 2006-10-13 06:45:10Z taroth $ +# $Id: ENV-opensuse-startup 20938 2007-05-24 08:55:36Z taroth $ -if [ -d ../../novdoc ]; then - export DTDROOT=$(cd ../../novdoc; pwd) -else - export DTDROOT=$(cd /usr/share/susedoc; pwd) -fi -. $DTDROOT/etc/system-profile +. .env-profile export MAIN=MAIN.opensuse.xml #export BOOK=SLPROF-print export ROOTID="book.opensuse.startup" export PROFARCH="x86;amd64;em64t" export PROFOS="slprof;slpers" -export DISTVER="10.2" +export DISTVER="10.3" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/.env-profile new/.env-profile --- old/.env-profile 1970-01-01 01:00:00.000000000 +0100 +++ new/.env-profile 2007-07-31 09:44:39.000000000 +0200 @@ -0,0 +1,7 @@ +# -*- shell-script -*- +unset DTDROOT +export DTDROOT=$(make dtdroot) +echo "Using the DTDROOT ${DTDROOT}" +. $DTDROOT/etc/system-profile + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Makefile new/Makefile --- old/Makefile 2006-11-19 13:59:31.000000000 +0100 +++ new/Makefile 2007-07-31 09:44:39.000000000 +0200 @@ -1,7 +1,19 @@ # .PHONY: default # default: help -include ../../novdoc/make/common.mk +ifndef DTDROOT +DTDPATH1 = /usr/share/susedoc +DTDPATH2 = $(shell test -d ../../novdoc && (cd ../../novdoc; pwd)) +DTDPATH3 = $(shell test -d ../../../../trunk/novdoc && (cd ../../../../trunk/novdoc; pwd)) + +DTDROOT := $(firstword $(DTDPATH2) $(DTDPATH3) $(DTDPATH1)) +else +include $(DTDROOT)/make/common.mk +endif + +.PHONY: dtdroot +dtdroot: + @echo $(DTDROOT) # Emacs: # Local Variables: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/entity-decl.ent new/xml/entity-decl.ent --- old/xml/entity-decl.ent 2006-11-19 13:59:04.000000000 +0100 +++ new/xml/entity-decl.ent 2007-08-16 14:57:31.000000000 +0200 @@ -6,33 +6,34 @@ <!ENTITY exampleuser "tux"> <!ENTITY exampleuserII "wilber"> <!ENTITY examplegroup "users"> -<!ENTITY exampledomain "example.com"> -<!ENTITY exampledomainip "192.168.0"> -<!ENTITY exampledomain1 "example.net"> -<!ENTITY exampledomain1ip "192.168.1"> -<!ENTITY exampledomain2 "example.org"> -<!ENTITY exampledomain2ip "192.168.2"> -<!-- ipv6 equivalent to 192.168.2.10 --> -<!ENTITY exampledomain2ipv6 "2002:c0a8:20a::"> - -<!ENTITY exampleserver "sun"> -<!ENTITY exampleserverip "&exampledomainip;.20"> -<!ENTITY exampleserverfq "&exampleserver;.&exampledomain;"> - -<!ENTITY exampleclient "earth"> -<!ENTITY exampleclientip "&exampledomainip;.1"> -<!ENTITY exampleclientfq "&exampleclient;.&exampledomain;"> - -<!ENTITY exampleclientppp "ppp&exampleclient;"> -<!ENTITY exampleclientslip "sl&exampleclient;"> -<!ENTITY exampleclientuucp "uu&exampleclient;"> +<!-- #######################################################################--> +<!-- Obsolete entities. Do not use. --> +<!-- See network-decl.ent for Network related entities --> + +<!ENTITY exampledomainip "192.168.0"> +<!ENTITY exampledomain1ip "192.168.1"> +<!ENTITY exampledomain2ip "192.168.2"> +<!-- ipv6 equivalent to 192.168.2.10 --> +<!ENTITY exampledomain2ipv6 "2002:c0a8:20a::"> +<!ENTITY exampleserver "sun"> +<!ENTITY exampleserverip "&exampledomainip;.20"> +<!ENTITY exampleserverfq "&exampleserver;.&exampledomain;"> +<!ENTITY exampleclient "earth"> +<!ENTITY exampleclientip "&exampledomainip;.1"> +<!ENTITY exampleclientfq "&exampleclient;.&exampledomain;"> +<!ENTITY exampleclientppp "ppp&exampleclient;"> +<!ENTITY exampleclientslip "sl&exampleclient;"> +<!ENTITY exampleclientuucp "uu&exampleclient;"> <!ENTITY exampleclientII "venus"> <!ENTITY exampleclientIIppp "ppp&exampleclientII;"> <!ENTITY exampleclientIIslip "sl&exampleclientII;"> <!ENTITY exampleclientIIuucp "uu&exampleclientII;"> +<!-- #######################################################################--> + + <!ENTITY rootuser '<systemitem class="username">root</systemitem>'> <!ENTITY grub "GRUB"> @@ -47,8 +48,10 @@ <!ENTITY yast "YaST"> <!ENTITY ay "AutoYaST"> <!ENTITY nm "NetworkManager"> - - +<!ENTITY fspot "f-spot"> +<!ENTITY digikam "digiKam"> +<!ENTITY yelp "Yelp"> +<!ENTITY khc "KDE- Hilfezentrum"> <!-- ============================================================= --> <!-- Books --> <!-- ============================================================= --> @@ -57,18 +60,20 @@ <!ENTITY prep "<emphasis>Architecture-Specific Information</emphasis>"> <!ENTITY sleddepl "<emphasis>Deployment Guide</emphasis>"> <!ENTITY kdeuser "<emphasis>KDE User Guide</emphasis>"> -<!ENTITY gnuser "<emphasis>GNOME User Guide</emphasis>"> -<!ENTITY instqs "<emphasis>Installation Quick Start</emphasis>"> +<!ENTITY gnuser "<emphasis>GNOME User Guide</emphasis>"> +<!ENTITY instqs "<emphasis>Installation Quick Start</emphasis>"> <!ENTITY con "<emphasis>Network Connectivity Guide</emphasis>"> <!ENTITY gnqs "<emphasis>GNOME Quick Start</emphasis>"> <!ENTITY kdeqs "<emphasis>KDE Quick Start</emphasis>"> <!ENTITY slsadguide "<emphasis>Installation and Administration</emphasis>"> <!ENTITY adguide "<emphasis>Referenz</emphasis>"> -<!ENTITY userguide "<emphasis>Start</emphasis>"> <!ENTITY appl "<emphasis>Applications</emphasis>"> +<!ENTITY userguide "<emphasis>Start</emphasis>"> <!ENTITY apparm "<emphasis>AppArmor</emphasis>"> <!ENTITY apparm_admin "<emphasis>Novell AppArmor Administration Guide</emphasis>"> <!ENTITY apparm_inst "<emphasis>Novell AppArmor Installation and QuickStart Guide</emphasis>"> +<!ENTITY apparmqs "<emphasis>Novell AppArmor Quick Start</emphasis>"> +<!ENTITY lfl "<emphasis>Lessons For Lizards</emphasis>"> <!-- ============================================================= --> <!-- Platforms --> @@ -82,7 +87,7 @@ <!ENTITY ipseries "POWER"> <!ENTITY ppc "POWER"> <!ENTITY em64t "Intel EM64T"> -<!ENTITY intel64 "Intel 64"> +<!ENTITY intel64 "Intel 64"> <!-- ============================================================= --> @@ -91,24 +96,26 @@ <!-- please change product to anything that makes sense in your current release --> <!ENTITY product "openSUSE"> -<!ENTITY productreg "openSUSE™"> +<!ENTITY productreg "openSUSE®"> +<!ENTITY opensuse "openSUSE"> <!ENTITY sle "SUSE Linux Enterprise"> <!ENTITY slereg "SUSE® Linux Enterprise"> <!ENTITY sls "SUSE Linux Enterprise Server"> -<!ENTITY slsa "SLES"> +<!ENTITY slsa "SLES"> <!ENTITY slsreg "SUSE® Linux Enterprise Server"> <!ENTITY nld "SUSE Linux Enterprise Desktop"> -<!ENTITY nlda "SLED"> +<!ENTITY nlda "SLED"> <!ENTITY nldreg "SUSE® Linux Enterprise Desktop"> <!ENTITY sdk "SUSE Software Development Kit"> <!ENTITY musicplayer "Helix Banshee"> <!ENTITY zenup "Software-Aktualisierungsfunktion"> <!ENTITY updater "openSUSE Updater"> -<!ENTITY aa "AppArmor"> -<!ENTITY naa "Novell AppArmor"> -<!ENTITY naareg "Novell® AppArmor"> -<!ENTITY slreg "SUSE® Linux"> -<!ENTITY version "10.2"> +<!ENTITY aa "AppArmor"> +<!ENTITY naa "Novell AppArmor"> +<!ENTITY naareg "Novell® AppArmor"> +<!ENTITY slreg "SUSE® Linux"> +<!ENTITY version "10.3"> +<!ENTITY slepos "SUSE Linux Enterprise Point of Service"> <!-- oddities --> <!ENTITY thrdmrk "*"> @@ -122,9 +129,10 @@ <!-- Additional Entities --> <!ENTITY euro "€"> -<!-- -<!ENTITY % desktop-entities SYSTEM "desktop-entities.ent"> -%desktop-entities; --> + +<!ENTITY % network-entities SYSTEM "network-decl.ent"> +%network-entities; + <!-- End of file --> <!-- ............................................................. --> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/network-decl.ent new/xml/network-decl.ent --- old/xml/network-decl.ent 1970-01-01 01:00:00.000000000 +0100 +++ new/xml/network-decl.ent 2007-08-16 14:57:31.000000000 +0200 @@ -0,0 +1,165 @@ +<!-- ...................................................................... --> +<!-- General Entities --> +<!-- ...................................................................... --> + +<!-- domains --> +<!ENTITY exampledomain "example.com"> +<!ENTITY exampledomain1 "example.net"> +<!ENTITY exampledomain2 "example.org"> + +<!-- subnets --> +<!ENTITY subnetI "192.168.1"> +<!ENTITY subnetImask "&subnetI;.0/24"> +<!ENTITY subnetII "192.168.2"> +<!ENTITY subnetIImask "&subnetII;.0/24"> +<!ENTITY subnetIII "192.168.3"> +<!ENTITY subnetIIImask "&subnetIII;.0/24"> +<!ENTITY subnetIV "192.168.4"> +<!ENTITY subnetIVmask "&subnetIV;.0/24"> +<!ENTITY subnetV "192.168.5"> +<!ENTITY subnetVmask "&subnetV;.0/30"> + +<!ENTITY subnetv6 "2002:c0a8"> + +<!-- Broadcast addresses --> +<!ENTITY subnetIbc "&subnetI;.255"> +<!ENTITY subnetIIbc "&subnetII;.255"> +<!ENTITY subnetIIIbc "&subnetIII;.255"> +<!ENTITY subnetIVbc "&subnetIV;.255"> +<!ENTITY subnetVbc "&subnetV;.252"> + +<!-- Netmask for C class network --> +<!ENTITY subnetmask "255.255.255.0"> + +<!-- DNS names (server) --> +<!ENTITY smbname "smb.&exampledomain;"> +<!ENTITY nfsname "nfs.&exampledomain;"> +<!ENTITY iscsiname "iscsi.&exampledomain;"> +<!ENTITY proxyname "www-proxy.&exampledomain;"> +<!ENTITY ldapname "ldap.&exampledomain;"> +<!ENTITY nisname "nis.&exampledomain;"> +<!ENTITY slpname "slp.&exampledomain;"> +<!ENTITY ntpname "ntp.&exampledomain;"> +<!ENTITY tftpname "tftp.&exampledomain;"> +<!ENTITY pxename "pxe.&exampledomain;"> +<!ENTITY kdcname "kdc.&exampledomain;"> +<!ENTITY dnsname "dns.&exampledomain;"> +<!ENTITY dhcpname "dhcp.&exampledomain;"> +<!ENTITY cupsname "cups.&exampledomain;"> + +<!-- DNS names (infrastructure) --> +<!ENTITY wwwname "www.&exampledomain;"> +<!ENTITY wwwname1 "www.&exampledomain1;"> +<!ENTITY wwwname2 "www.&exampledomain2;"> +<!ENTITY ftpname "ftp.&exampledomain;"> +<!ENTITY mailname "mail.&exampledomain;"> +<!ENTITY routerextname "routerext.&exampledomain;"> +<!ENTITY routerintname "routerint.&exampledomain;"> +<!ENTITY fwextname "fwext.&exampledomain;"> +<!ENTITY fwintname "fwint.&exampledomain;"> +<!ENTITY gatename "gate.&exampledomain;"> + +<!-- DNS names (clients) --> +<!ENTITY wsIname "jupiter.&exampledomain;"> +<!ENTITY wsIIname "venus.&exampledomain;"> +<!ENTITY wsIIIname "saturn.&exampledomain;"> +<!ENTITY wsIVname "mercury.&exampledomain;"> + +<!-- names (clients) --> +<!ENTITY wsI "jupiter"> +<!ENTITY wsII "venus"> +<!ENTITY wsIII "saturn"> +<!ENTITY wsIV "mercury"> + +<!-- MAC addresses --> +<!ENTITY wsImac "00:30:6E:08:EC:80"> +<!ENTITY wsIImac "00:00:1C:B5:A4:32"> +<!ENTITY wsIIImac "00:17:31:CA:A3:4A"> +<!ENTITY wsIVmac "00:16:35:AF:94:4B"> + +<!-- IP addresses (server) --> +<!ENTITY smbip "&subnetI;.110"> +<!ENTITY smbipv6 "&subnetv6;:16e::"> +<!ENTITY nfsip "&subnetI;.110"> +<!ENTITY nfsipv6 "&subnetv6;:16e::"> +<!ENTITY iscsiip "&subnetI;.111"> +<!ENTITY iscsiipv6 "&subnetv6;:16f::"> +<!ENTITY proxyip "&subnetI;.112"> +<!ENTITY proxyipv6 "&subnetv6;170::"> +<!ENTITY ldapip "&subnetI;.113"> +<!ENTITY ldapipv6 "&subnetv6;:171::"> +<!ENTITY nisip "&subnetI;.113"> +<!ENTITY nisipv6 "&subnetv6;:171::"> +<!ENTITY ntpip "&subnetI;.116"> +<!ENTITY ntpipv6 "&subnetv6:174::;"> +<!ENTITY tftpip "&subnetI;.115"> +<!ENTITY tftpipv6 "&subnetv6;:173::"> +<!ENTITY pxeip "&subnetI;.115"> +<!ENTITY pxeipv6 "&subnetv6;:173::"> +<!ENTITY kdcip "&subnetI;.114"> +<!ENTITY kdcipv6 "&subnetv6;:172::"> +<!ENTITY dnsip "&subnetI;.116"> +<!ENTITY dnsipv6 "&subnetv6;:174::"> + +<!ENTITY slpip "&subnetII;.254"> +<!ENTITY slpipv6 "&subnetv6;:2fe::"> +<!ENTITY dhcpip "&subnetII;.254"> +<!ENTITY dhcpipv6 "&subnetv6;:2fe::"> +<!ENTITY cupsip "&subnetII;.253"> +<!ENTITY cupsipv6 "&subnetv6;:2fd::"> + +<!-- IP addresses (infrastructure) --> +<!ENTITY routerintipI "&subnetI;.1"> +<!ENTITY routerintipIv6 "&subnetv6;:101::"> +<!ENTITY fwintipI "&subnetI;.1"> +<!ENTITY fwintipIv6 "&subnetv6;:101::"> + +<!ENTITY routerintipII "&subnetII;.1"> +<!ENTITY routerintipIIv6 "&subnetv6;:201::"> +<!ENTITY fwintipII "&subnetII;.1"> +<!ENTITY fwintipIIv6 "&subnetv6;:201::"> + +<!ENTITY wwwip "&subnetIII;.100"> +<!ENTITY wwwipv6 "&subnetv6;:364::"> +<!ENTITY wwwip1 "&subnetIII;.101"> +<!ENTITY wwwip1v6 "&subnetv6;:365::"> +<!ENTITY wwwip2 "&subnetIII;.102"> +<!ENTITY wwwip2v6 "&subnetv6;:366::"> +<!ENTITY ftpip "&subnetIII;.105"> +<!ENTITY ftpipv6 "&subnetv6;:369::"> +<!ENTITY mailip "&subnetIII;.108"> +<!ENTITY mailipv6 "&subnetv6;:36c::"> +<!ENTITY routerextipIII "&subnetIII;.2"> +<!ENTITY routerextipIIIv6 "&subnetv6;:302::"> +<!ENTITY fwextipIII "&subnetIII;.2"> +<!ENTITY fwextipIIIv6 "&subnetv6;:302::"> + +<!ENTITY routerintipIV "&subnetIV;.1"> +<!ENTITY routerintipIVv6 "&subnetv6;:401::"> +<!ENTITY routerextipIV "&subnetIV;.2"> +<!ENTITY routerextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwextipIV "&subnetIV;.2"> +<!ENTITY fwextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwintipIV "&subnetIV;.1"> +<!ENTITY fwintipIVv6 "&subnetv6;:401::"> + +<!ENTITY routerextipV "&subnetV;.2"> +<!ENTITY routerextipVv6 "&subnetv6;:502::"> +<!ENTITY fwextipV "&subnetV;.2"> +<!ENTITY fwextipVv6 "&subnetv6;:502::"> +<!ENTITY gateip "&subnetV;.1"> +<!ENTITY gateipv6 "&subnetv6;:501::"> + +<!-- IP addresses (clients) --> +<!ENTITY wsIip "&subnetII;.100"> +<!ENTITY wsIipv6 "&subnetv6;:264::"> +<!ENTITY wsIIip "&subnetII;.101"> +<!ENTITY wsIIipv6 "&subnetv6;:265::"> +<!ENTITY wsIIIip "&subnetII;.102"> +<!ENTITY wsIIIipv6 "&subnetv6;:266::"> +<!ENTITY wsIVip "&subnetII;.103"> +<!ENTITY wsIVipv6 "&subnetv6;:267::"> + +<!-- End of file --> +<!-- ............................................................. --> + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org