November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit rinetd for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package rinetd for openSUSE:Factory checked in at Mon Nov 15 18:24:22 CET 2010. -------- --- rinetd/rinetd.changes 2009-09-08 13:04:00.000000000 +0200 +++ rinetd/rinetd.changes 2010-11-12 19:17:32.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 12 19:07:10 CET 2010 - max(a)suse.de + +- Fix a segfault during shutdown when there is no syslog directive + in the config file (bnc#651178). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rinetd.spec ++++++ --- /var/tmp/diff_new_pack.vTXfmM/_old 2010-11-15 18:17:53.000000000 +0100 +++ /var/tmp/diff_new_pack.vTXfmM/_new 2010-11-15 18:17:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rinetd (Version 0.62) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: rinetd -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/System AutoReqProv: on Version: 0.62 -Release: 1 +Release: 8 Summary: TCP Redirection Server Url: http://www.boutell.com/rinetd/ Source0: rinetd-0.62.tar.bz2 ++++++ rinetd-syslog.patch ++++++ --- /var/tmp/diff_new_pack.vTXfmM/_old 2010-11-15 18:17:53.000000000 +0100 +++ /var/tmp/diff_new_pack.vTXfmM/_new 2010-11-15 18:17:53.000000000 +0100 @@ -598,7 +598,7 @@ for (j = 0; (j < coTotal); j++) { if (coClosed[j]) { index = j; -@@ -1185,6 +1361,9 @@ void handleAccept(int i) +@@ -1190,6 +1366,9 @@ void handleAccept(int i) for (j = 0; (j < globalDenyRules); j++) { if (match(addressText, denyRules[j])) { refuse(index, logDenied); @@ -608,7 +608,7 @@ } } } -@@ -1212,6 +1391,9 @@ void handleAccept(int i) +@@ -1217,6 +1396,9 @@ void handleAccept(int i) if (match(addressText, denyRules[seDenyRules[i] + j])) { refuse(index, logDenied); @@ -618,7 +618,7 @@ } } } -@@ -1219,6 +1401,7 @@ void handleAccept(int i) +@@ -1224,6 +1406,7 @@ void handleAccept(int i) This, too, is nonblocking. Why wait for anything when you don't have to? */ openLocalFd(i, index); @@ -626,7 +626,7 @@ return; shortage: fprintf(stderr, "rinetd: not enough memory to " -@@ -1240,15 +1423,15 @@ void openLocalFd(int se, int i) +@@ -1245,15 +1428,15 @@ void openLocalFd(int se, int i) log(i, coSe[i], logLocalSocketFailed); return; } @@ -645,7 +645,7 @@ if (bind(loFds[i], (struct sockaddr *) &saddr, sizeof(saddr)) == SOCKET_ERROR) { closesocket(loFds[i]); closesocket(reFds[i]); -@@ -1262,7 +1445,7 @@ void openLocalFd(int se, int i) +@@ -1267,7 +1450,7 @@ void openLocalFd(int se, int i) saddr.sin_family = AF_INET; memcpy(&saddr.sin_addr, &seLocalAddrs[se], sizeof(struct in_addr)); saddr.sin_port = seLocalPorts[se]; @@ -654,7 +654,7 @@ #ifdef LINUX j = 0; setsockopt(loFds[i], SOL_SOCKET, SO_LINGER, &j, sizeof(j)); -@@ -1270,14 +1453,14 @@ void openLocalFd(int se, int i) +@@ -1275,14 +1458,14 @@ void openLocalFd(int se, int i) j = 1024; setsockopt(loFds[i], SOL_SOCKET, SO_SNDBUF, &j, sizeof(j)); #endif /* LINUX */ @@ -674,7 +674,7 @@ { PERROR("rinetd: connect"); closesocket(loFds[i]); -@@ -1318,11 +1501,14 @@ int getAddress(char *host, struct in_add +@@ -1323,11 +1506,14 @@ int getAddress(char *host, struct in_add return 1; } } @@ -690,7 +690,7 @@ signal(SIGPIPE, plumber); } -@@ -1333,7 +1519,7 @@ void hup(int s) +@@ -1338,7 +1524,7 @@ void hup(int s) /* And reinstall the signal handler */ signal(SIGHUP, hup); } @@ -699,7 +699,7 @@ int safeRealloc(void **data, int oldsize, int newsize) { -@@ -1375,6 +1561,17 @@ void RegisterPID(void) +@@ -1380,6 +1566,18 @@ void RegisterPID(void) unsigned char nullAddress[4] = { 0, 0, 0, 0 }; struct tm *get_gmtoff(int *tz); @@ -709,7 +709,8 @@ + +void simplelog(char *message) +{ -+ openlog("",LOG_PID,decode(syslogFacility, facilitynames)); ++ char *facility = syslogFacility?syslogFacility:syslogFacility_default; ++ openlog("",LOG_PID,decode(facility, facilitynames)); + syslog(syslogpriority,"%s\n",message); + closelog(); +} @@ -717,7 +718,7 @@ void log(int i, int coSe, int result) { -@@ -1407,7 +1604,7 @@ void log(int i, int coSe, int result) +@@ -1412,7 +1610,7 @@ void log(int i, int coSe, int result) bytesInput = 0; } if (logFile) { @@ -726,7 +727,7 @@ /* Fake a common log format log file in a way that most web analyzers can do something interesting with. We lie and say the protocol is HTTP because we don't -@@ -1420,9 +1617,14 @@ void log(int i, int coSe, int result) +@@ -1425,9 +1623,14 @@ void log(int i, int coSe, int result) after several placeholders meant to fill the positions frequently occupied by user agent, referrer, and server name information. */ @@ -743,7 +744,7 @@ "200 %d - - - %d\n", reAddress[0], reAddress[1], -@@ -1432,7 +1634,8 @@ void log(int i, int coSe, int result) +@@ -1437,7 +1640,8 @@ void log(int i, int coSe, int result) sign, timz / 60, timz % 60, @@ -753,7 +754,7 @@ seToHosts[coSe], seToPorts[coSe], logMessages[result], bytesOutput, -@@ -1440,19 +1643,39 @@ void log(int i, int coSe, int result) +@@ -1445,19 +1649,39 @@ void log(int i, int coSe, int result) } else { /* Write an rinetd-specific log entry with a less goofy format. */ @@ -797,7 +798,7 @@ } } -@@ -1503,7 +1726,7 @@ int readArgs (int argc, +@@ -1508,7 +1732,7 @@ int readArgs (int argc, default: exit (1); } @@ -806,7 +807,7 @@ return 0; } -@@ -1552,6 +1775,9 @@ void refuse(int index, int logCode) +@@ -1557,6 +1781,9 @@ void refuse(int index, int logCode) void term(int s) { /* Obey the request, but first flush the log */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint-mini for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package rpmlint-mini for openSUSE:Factory checked in at Mon Nov 15 18:17:31 CET 2010. -------- --- rpmlint-mini/rpmlint-mini.changes 2010-10-18 11:01:22.000000000 +0200 +++ rpmlint-mini/rpmlint-mini.changes 2010-11-11 08:53:21.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 11 08:53:06 CET 2010 - dmueller(a)suse.de + +- bump version to 1.0 (match rpmlint update) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-mini.spec ++++++ --- /var/tmp/diff_new_pack.xUvLi7/_old 2010-11-15 18:17:22.000000000 +0100 +++ /var/tmp/diff_new_pack.xUvLi7/_new 2010-11-15 18:17:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package rpmlint-mini (Version 0.99) +# spec file for package rpmlint-mini (Version 1.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ BuildRequires: polkit-default-privs BuildRequires: checkbashisms dash libtool Summary: Rpm correctness checker -Version: 0.99 -Release: 1 +Version: 1.0 +Release: 222 Url: http://rpmlint.zarb.org/ License: GPLv2+ Group: System/Packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smbtad for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package smbtad for openSUSE:Factory checked in at Mon Nov 15 18:17:11 CET 2010. -------- --- smbtad/smbtad.changes 2010-09-19 23:19:44.000000000 +0200 +++ smbtad/smbtad.changes 2010-11-11 14:04:00.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 8 14:25:21 UTC 2010 - hhetter(a)novell.com + +- update to version 1.1: +- bnc#649840, compile with older versions of talloc +- bnc#651112, introduce rcsmbtad start/stop script +- bnc#651800, fix configuration file support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- smbtad-1.0.tar.bz2 New: ---- smbtad-1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smbtad.spec ++++++ --- /var/tmp/diff_new_pack.O4My4D/_old 2010-11-15 18:16:35.000000000 +0100 +++ /var/tmp/diff_new_pack.O4My4D/_new 2010-11-15 18:16:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package smbtad (Version 1.0) +# spec file for package smbtad (Version 1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,13 +25,15 @@ BuildRecommends: libiniparser-devel License: GPLv3+ Group: Productivity/Networking/Samba -Version: 1.0 +Version: 1.1 Release: 1 Summary: A collector of smbd share usage data Url: http://github.com/hhetter/smbtad Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define INITDIR %{_sysconfdir}/init.d + %description smbtad is the data receiver of the SMB Traffic Analyzer project. With SMB Traffic Analyzer statistics about the data flow on a Samba network can be created. @@ -68,6 +70,8 @@ make DESTDIR=%{buildroot} install %endif popd build +mkdir -p %{buildroot}/usr/sbin +ln -s /etc/init.d/smbtad %{buildroot}/usr/sbin/rcsmbtad %clean %__rm -rf %{buildroot} @@ -75,5 +79,7 @@ %files %defattr(-,root,root) %{_bindir}/smbtad +%{_sbindir}/rcsmbtad +%attr(0754,root,root) %config %{INITDIR}/smbtad %changelog ++++++ smbtad-1.0.tar.bz2 -> smbtad-1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/CMakeLists.txt new/smbtad-1.1/CMakeLists.txt --- old/smbtad-1.0/CMakeLists.txt 2010-10-25 20:00:37.000000000 +0200 +++ new/smbtad-1.1/CMakeLists.txt 2010-11-06 21:28:20.000000000 +0100 @@ -76,8 +76,7 @@ set_target_properties(iniparser PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/iniparser3.0b/libiniparser.a) ENDIF() - - +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink /etc/init.d/smbtad /usr/sbin/rcsmbtad)") SET(CurrentExe "smbtad") ADD_EXECUTABLE(${CurrentExe} @@ -96,10 +95,8 @@ src/monitor-list.c src/sendlist.c src/throughput-list.c) -TARGET_LINK_LIBRARIES(${CurrentExe} ${Libraries}) - - - +TARGET_LINK_LIBRARIES(${CurrentExe} ${Libraries}) INSTALL(TARGETS smbtad DESTINATION bin) - +INSTALL(PROGRAMS dist/smbtad DESTINATION /etc/init.d/) +INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_symlink.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/dist/smbtad new/smbtad-1.1/dist/smbtad --- old/smbtad-1.0/dist/smbtad 1970-01-01 01:00:00.000000000 +0100 +++ new/smbtad-1.1/dist/smbtad 2010-11-06 21:28:20.000000000 +0100 @@ -0,0 +1,94 @@ +#! /bin/sh +# Copyright (c) 2010 Holger Hetterich +# +# Based on the smb script by Lars Müller <lmuelle(a)suse.de> +# +# /etc/init.d/smbtad +# and its symbolic link +# /usr/sbin/rcsmbtad +# +# 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 3 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, see <http://www.gnu.org/licenses/>. +# +### BEGIN INIT INFO +# Provides: smbtad +# Required-Start: $network $syslog +# Should-Start: +# Required-Stop: $network $syslog +# Should-Stop: +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: SMB Traffic Analyzer Daemon +# Description: SMB Traffic Analyzer Daemon +### END INIT INFO + +SMBTAD_BIN="/usr/bin/smbtad" +SMBTAD_CONF="/etc/smbtad.conf" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${SMBTAD_BIN} ]; then + echo -n >&2 "SMB Traffic Analyzer daemon, ${SMBTAD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +# be extra carefull cause connection fail if TMPDIR is not writeable +export TMPDIR="/var/tmp" + +case "$1" in + start) + echo -n "Starting SMB Traffic Analyzer daemon " + if [ ! -f ${SMBTAD_CONF} ]; then + echo -n >&2 "smbtad configuration file, ${SMBTAD_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc ${SMBTAD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + esac + test -f /etc/sysconfig/language && \ + . /etc/sysconfig/language + export LC_ALL="$RC_LC_ALL" + export LC_CTYPE="$RC_LC_CTYPE" + export LANG="$RC_LANG" + startproc ${SMBTAD_BIN} -c ${SMBTAD_CONF} + unset LC_ALL LC_CTYPE LANG + rc_status -v + ;; + stop) + echo -n "Shutting down SMB Traffic Analyzer daemon " + checkproc ${SMBTAD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -t 10 ${SMBTAD_BIN} + rc_status -v + ;; + restart) + $0 stop + $0 start + rc_status + ;; + status) + echo -n "Checking for Samba SMB daemon " + checkproc ${SMBTAD_BIN} + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/dist/smbtad.conf_example new/smbtad-1.1/dist/smbtad.conf_example --- old/smbtad-1.0/dist/smbtad.conf_example 1970-01-01 01:00:00.000000000 +0100 +++ new/smbtad-1.1/dist/smbtad.conf_example 2010-11-06 21:28:20.000000000 +0100 @@ -0,0 +1,15 @@ +[general] + debug_level = 0 + + +[network] + port_number = 3490 + query_port = 3491 + +[database] + sqlite_filename = /tmp/testfile.db + +[maintenance] + interval = 00:01:00 + config = 01,00:00:00 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/dist/smbtad.spec new/smbtad-1.1/dist/smbtad.spec --- old/smbtad-1.0/dist/smbtad.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/smbtad-1.1/dist/smbtad.spec 2010-11-06 21:28:20.000000000 +0100 @@ -0,0 +1,83 @@ +# +# spec file for package smbtad +# +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + + +Name: smbtad +BuildRequires: cmake libtalloc-devel +BuildRequires: sqlite3-devel +Requires: sqlite3 >= 3.7 +BuildRecommends: libiniparser-devel +License: GPLv3+ +Group: Productivity/Networking/Samba +Version: 1.0 +Release: 1 +Summary: A collector of smbd share usage data +Url: http://github.com/hhetter/smbtad +Source0: %{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%define INITDIR %{_sysconfdir}/init.d + +%description +smbtad is the data receiver of the SMB Traffic Analyzer project. +With SMB Traffic Analyzer statistics about the data flow on a Samba network can be created. +Please see http://holger123.wordpress.com/smb-traffic-analyzer/ for more information. + +%prep +%setup -q + +%build +if test ! -e "build"; then + %{__mkdir} build +fi + +pushd build +cmake \ + -DCMAKE_C_FLAGS:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \ +%if %{_lib} == lib64 + -DLIB_SUFFIX=64 \ +%endif + %{_builddir}/%{name}-%{version} +%__make %{?jobs:-j%jobs} VERBOSE=1 +popd build + +%install +pushd build +%if 0%{?suse_version} +%makeinstall +%else +make DESTDIR=%{buildroot} install +%endif +popd build + + +%clean +%__rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_bindir}/smbtad +%{_sbindir}/rcsmbtad +%attr(0754,root,root) %config %{INITDIR}/smbtad +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/include/includes.h new/smbtad-1.1/include/includes.h --- old/smbtad-1.0/include/includes.h 2010-10-25 20:00:37.000000000 +0200 +++ new/smbtad-1.1/include/includes.h 2010-11-06 21:28:20.000000000 +0100 @@ -49,6 +49,13 @@ #include "monitor-list.h" #include "sendlist.h" #include "throughput-list.h" + +/* define TALLOC_FREE when older talloc versions are used */ +#ifndef TALLOC_FREE + #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) +#endif + + /** * Debug Levels: * 0 -> only fatal errors which lead to terminate stad diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/include/version.h new/smbtad-1.1/include/version.h --- old/smbtad-1.0/include/version.h 2010-10-25 20:00:37.000000000 +0200 +++ new/smbtad-1.1/include/version.h 2010-11-06 21:28:20.000000000 +0100 @@ -1,2 +1,2 @@ #define SMBTA_LICENSE "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>" -#define STAD2_VERSION "1.0" +#define STAD2_VERSION "1.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/src/configuration.c new/smbtad-1.1/src/configuration.c --- old/smbtad-1.0/src/configuration.c 2010-10-25 20:00:37.000000000 +0200 +++ new/smbtad-1.1/src/configuration.c 2010-11-06 21:28:20.000000000 +0100 @@ -116,8 +116,17 @@ } cc = iniparser_getstring(Mydict,"general:keyfile",NULL); if (cc != NULL) { + c->keyfile = strdup(cc); configuration_load_key_from_file( c); } + cc = iniparser_getstring(Mydict,"maintenance:interval",NULL); + if (cc != NULL) { + strncpy(c->maintenance_timer_str,cc,199); + } + cc = iniparser_getstring(Mydict,"maintenance:config",NULL); + if (cc != NULL) { + strncpy(c->maint_run_time_str,cc,199); + } return 0; } @@ -247,7 +256,7 @@ char *Begin; if ( Helper==NULL ) { printf("\n\nERROR: The maintenance-timer-conf value is " - "in the wrong format! 1\n"); + "in the wrong format! \n"); exit (0); } *Helper='\0'; @@ -257,7 +266,7 @@ if ( Helper==NULL) { printf("\n\nERROR: The maintenance-timer-conf value is in" - " the wrong format! 2\n"); + " the wrong format! \n"); exit (0); } *Helper='\0'; @@ -268,7 +277,7 @@ if ( Helper==NULL) { printf("\n\nERROR: The maintenance-timer-conf value is " - "in the wrong format! 3\n"); + "in the wrong format! \n"); exit (0); } *Helper='\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smbtad-1.0/src/protocol.c new/smbtad-1.1/src/protocol.c --- old/smbtad-1.0/src/protocol.c 2010-10-25 20:00:37.000000000 +0200 +++ new/smbtad-1.1/src/protocol.c 2010-11-06 21:28:20.000000000 +0100 @@ -156,7 +156,7 @@ */ int protocol_get_subversion( char *header ) { - int retval; + int retval; char conv[4]; conv[0] = header[3]; conv[1] = '\0'; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit spamassassin for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at Mon Nov 15 18:15:07 CET 2010. -------- --- spamassassin/spamassassin.changes 2010-10-14 00:39:31.000000000 +0200 +++ spamassassin/spamassassin.changes 2010-11-12 07:08:28.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 12 06:09:15 UTC 2010 - varkoly(a)novell.com + +- bnc#650645 - Spamassassin Bug 6392 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sa#6392.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.3Pr3LR/_old 2010-11-15 18:13:51.000000000 +0100 +++ /var/tmp/diff_new_pack.3Pr3LR/_new 2010-11-15 18:13:51.000000000 +0100 @@ -27,7 +27,7 @@ Name: spamassassin Summary: Extensible email filter which is used to identify spam Version: %{sa_version} -Release: 6 +Release: 7 License: Apache Software License .. Group: Productivity/Networking/Email/Utilities AutoReqProv: on @@ -49,6 +49,7 @@ Patch4: Mail-SpamAssassin-3.3.1-deprecated.patch Patch5: Mail-SpamAssassin-3.3.1-MIMEEval.patch Patch6: bnc#582111.diff +Patch7: sa#6392.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq BuildRequires: dos2unix @@ -148,7 +149,7 @@ License: Apache License 2.0 Group: Development/Libraries/Perl Version: %{ix_version} -Release: 6 +Release: 7 Requires: perl = %{perl_version} Requires: perl-Mail-SpamAssassin = %{sa_version} @@ -174,6 +175,7 @@ %endif %patch5 -p1 %patch6 -p0 +%patch7 -p0 # fix wrong-file-end-of-line-encoding dos2unix %{IXHASH}/CHANGELOG ++++++ sa#6392.diff ++++++ Index: lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm =================================================================== --- lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm (revision 984789) +++ lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm (working copy) @@ -176,31 +176,37 @@ } # ignore ReplaceTags rules - # TODO: need cleaner way to do this - goto NO if ($conf->{rules_to_replace}->{$name}); + my $is_a_replacetags_rule = $conf->{rules_to_replace}->{$name}; + my ($minlen, $lossy, @bases); - my ($lossy, @bases); + if (!$is_a_replacetags_rule) { + eval { # catch die()s + my ($qr, $mods) = $self->simplify_and_qr_regexp($rule); + ($lossy, @bases) = $self->extract_hints($rule, $qr, $mods); + 1; + } or do { + my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat; + dbg("zoom: giving up on regexp: $eval_stat"); + }; - eval { # catch die()s - my ($qr, $mods) = $self->simplify_and_qr_regexp($rule); - ($lossy, @bases) = $self->extract_hints($rule, $qr, $mods); - 1; - } or do { - my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat; - dbg("zoom: giving up on regexp: $eval_stat"); - }; - - # if any of the extracted hints in a set are too short, the entire - # set is invalid; this is because each set of N hints represents just - # 1 regexp. - my $minlen; - foreach my $str (@bases) { - my $len = length fixup_re($str); # bug 6143: count decoded characters - if ($len < $min_chars) { $minlen = undef; @bases = (); last; } - elsif (!defined($minlen) || $len < $minlen) { $minlen = $len; } + # if any of the extracted hints in a set are too short, the entire + # set is invalid; this is because each set of N hints represents just + # 1 regexp. + foreach my $str (@bases) { + my $len = length fixup_re($str); # bug 6143: count decoded characters + if ($len < $min_chars) { $minlen = undef; @bases = (); last; } + elsif (!defined($minlen) || $len < $minlen) { $minlen = $len; } + } } - if ($minlen && @bases) { + if ($is_a_replacetags_rule || !$minlen || !@bases) { + dbg("zoom: ignoring %s %s", + $is_a_replacetags_rule ? 'replace rule' : 'NO', $rule); + push @failed, { orig => $rule }; + $cached->{rule_bases}->{$cachekey} = { }; + $no++; + } + else { # dbg("zoom: YES <base>$base</base> <origrule>$rule</origrule>"); # figure out if we have e.g. ["foo", "foob", "foobar"]; in this @@ -229,13 +235,6 @@ $cached->{rule_bases}->{$cachekey} = { g => \@forcache }; $yes++; } - else { -NO: - dbg("zoom: NO $rule"); - push @failed, { orig => $rule }; - $cached->{rule_bases}->{$cachekey} = { }; - $no++; - } } $self->{show_progress} and $progress and $progress->final(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit stardict-dic-enru-engcom for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package stardict-dic-enru-engcom for openSUSE:Factory checked in at Mon Nov 15 18:13:27 CET 2010. -------- --- stardict-dic-enru-engcom/stardict-dic-enru-engcom.changes 2010-09-01 23:32:44.000000000 +0200 +++ stardict-dic-enru-engcom/stardict-dic-enru-engcom.changes 2010-11-12 00:55:23.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 11 23:54:41 UTC 2010 - kirill.kirillov(a)gmail.com + +- Fixed path for license.txt + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict-dic-enru-engcom.spec ++++++ --- /var/tmp/diff_new_pack.UKpUL6/_old 2010-11-15 18:13:08.000000000 +0100 +++ /var/tmp/diff_new_pack.UKpUL6/_new 2010-11-15 18:13:08.000000000 +0100 @@ -21,7 +21,7 @@ Name: stardict-dic-enru-engcom Summary: English-Russian dictionary of computer terms Version: 1.36 -Release: 1 +Release: 2 License: FDL v1.1 or later Group: Productivity/Office/Dictionary Url: http://engcom.org.ru/ @@ -51,15 +51,15 @@ %install mkdir -p %buildroot/%stardict_dic_dir cp -a * %buildroot/%stardict_dic_dir/ -mkdir -p %buildroot/%_docdir -cp %{SOURCE1} %buildroot/%_docdir +mkdir -p %buildroot/%_docdir/%name +cp %{SOURCE1} %buildroot/%_docdir/%name %clean %__rm -rf %buildroot %files %defattr(-,root,root) -%doc %_docdir/license.txt +%doc %_docdir/%name/license.txt %dir %stardict_dir %dir %stardict_dic_dir %stardict_dic_dir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at Mon Nov 15 18:11:15 CET 2010. -------- --- systemd/systemd.changes 2010-10-29 21:32:25.000000000 +0200 +++ systemd/systemd.changes 2010-11-11 08:23:01.000000000 +0100 @@ -1,0 +2,31 @@ +Thu Nov 11 07:44:02 CET 2010 - kay.sievers(a)novell.com + +- new snapshot + - tmpfiles: include reference to man page in tmpfiles files + - vconsole: support additional keymap for toggling layouts + - main: warn if /etc/mtab is not a symlink + - add bash completion for systemctl --system + - man: minor tmpfiles(5) updates and reindenting + - main: rename process on startup to 'systemd' to avoid confusion + - unit: add ConditionNull= condition + - ac-power: make ac-power a proper binary that scripts can call + - manager: parse RD_TIMESTAMP passed from initrd + - modules-load: fix minor race + - label: use internal utility functions wher epossible + - cryptsetup: minimal cryptsetup unit generator + - selinux: relabel /dev after loading policy + - log: downgrade syslog connection failure message + - service: delay automatic restart if job is pending + - manager: when isolating undo all pending jobs, too + - manager: only minimize impact if we are in fail mode +- replace /etc/mtab with link to /proc/self/mounts + +------------------------------------------------------------------- +Fri Nov 5 00:28:10 CET 2010 - kay.sievers(a)novell.com + +- new snapshot + - man/tmpfiles.d.xml: add a manpage for tmpfiles + - do not overwrite other udev tags + - readahead: shortcut replay if /.readahead doesn't exist + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.PYWq6z/_old 2010-11-15 17:58:37.000000000 +0100 +++ /var/tmp/diff_new_pack.PYWq6z/_new 2010-11-15 17:58:37.000000000 +0100 @@ -21,7 +21,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 11 -Release: 3 +Release: 4 License: GPLv2+ Group: System/Base Summary: A System and Session Manager @@ -126,6 +126,8 @@ getty@.service \ remote-fs.target >/dev/null 2>&1 || : fi +# regular mtab is not written/cleaned-up/supported +ln -sf /proc/self/mounts /etc/mtab || : %preun if [ $1 -eq 0 ]; then @@ -150,6 +152,7 @@ /%{_lib}/security/pam_systemd.so %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/session +%dir %{_sysconfdir}/xdg/systemd %dir %{_sysconfdir}/xdg/systemd/session %dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/tmpfiles.d @@ -159,6 +162,8 @@ %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service +%{_datadir}/polkit-1 +%{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/systemd %{_datadir}/pkgconfig/systemd.pc @@ -182,6 +187,8 @@ %dir /lib/systemd /lib/systemd/system %dir %{_sysconfdir}/systemd +%dir %{_sysconfdir}/bash_completion.d +/etc/bash_completion.d/systemctl-bash-completion.sh %files gtk %defattr(-,root,root,-) ++++++ systemd-11.tar.bz2 ++++++ ++++ 4550 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tunctl for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package tunctl for openSUSE:Factory checked in at Mon Nov 15 17:58:20 CET 2010. -------- --- tunctl/tunctl.changes 2010-08-02 13:04:58.000000000 +0200 +++ tunctl/tunctl.changes 2010-11-11 15:10:03.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 11 14:08:59 UTC 2010 - mvyskocil(a)suse.cz + +- fixes bnc#650468 - network tunnel scripts reference tunctl by wrong path + * move tunctl binary to /sbin as is needed for boot + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tunctl.spec ++++++ --- /var/tmp/diff_new_pack.cXx2aY/_old 2010-11-15 17:57:53.000000000 +0100 +++ /var/tmp/diff_new_pack.cXx2aY/_new 2010-11-15 17:57:53.000000000 +0100 @@ -20,7 +20,7 @@ Name: tunctl Version: 1.5 -Release: 1 +Release: 2 Summary: Create and remove virtual network interfaces Group: System/Management License: GPLv2+ @@ -51,7 +51,7 @@ %{__make} CFLAGS="%{optflags}" %{?_smp_mflags} %install -%{makeinstall} +make DESTDIR=/usr/src/packages/BUILDROOT/%{name}-%{version}-%{release}.x86_64 BIN_DIR=/sbin install %{__install} -d -m 0755 %{buildroot}/%{_docdir}/%{name}/ %{__install} -m 0644 ChangeLog %{buildroot}/%{_docdir}/%{name}/ %{__ln_s} -f %{_datadir}/doc/licenses/md5/0636e73ff0215e8d672dc4c32c317bb3 \ @@ -64,6 +64,6 @@ %defattr(0644,root,root) %doc %{_docdir}/%{name} %doc %{_mandir}/man8/%{name}.8* -%attr(0755,root,root) %{_sbindir}/tunctl +%attr(0755,root,root) /sbin/tunctl %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wqy-bitmapfont for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package wqy-bitmapfont for openSUSE:Factory checked in at Mon Nov 15 17:57:36 CET 2010. -------- --- wqy-bitmapfont/wqy-bitmapfont.changes 2010-04-09 11:52:33.000000000 +0200 +++ wqy-bitmapfont/wqy-bitmapfont.changes 2010-11-10 10:58:36.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 10 09:58:26 UTC 2010 - lnussel(a)suse.de + +- compress *.pcf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wqy-bitmapfont.spec ++++++ --- /var/tmp/diff_new_pack.M8sZtk/_old 2010-11-15 17:56:53.000000000 +0100 +++ /var/tmp/diff_new_pack.M8sZtk/_new 2010-11-15 17:56:53.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %suseconfig_fonts_prereq Summary: Wen Quan Yi Bitmap Song CJK Fonts Version: 0.9.9_0 -Release: 2 +Release: 7 Url: http://wenq.org/ Source0: %{name}-pcf-0.9.9-0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +46,7 @@ %install mkdir -p %{buildroot}%{fontdir} install -m 644 *.pcf %{buildroot}%{fontdir} +gzip -9 %{buildroot}%{fontdir}/*.pcf install -c -m 644 fonts.alias %{buildroot}%{fontdir}/fonts.scale mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.avail/ install -c -m 644 85-wqy-bitmapsong.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xmlbeans for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package xmlbeans for openSUSE:Factory checked in at Mon Nov 15 17:56:39 CET 2010. -------- --- xmlbeans/xmlbeans-mini.changes 2010-09-21 11:52:21.000000000 +0200 +++ xmlbeans/xmlbeans-mini.changes 2010-11-08 13:10:02.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 8 12:09:54 UTC 2010 - mvyskocil(a)suse.cz + +- build ignore xml-commons-jaxp-1.3-apis + +------------------------------------------------------------------- --- xmlbeans/xmlbeans.changes 2010-09-21 11:52:21.000000000 +0200 +++ xmlbeans/xmlbeans.changes 2010-11-08 13:10:03.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 8 12:09:49 UTC 2010 - mvyskocil(a)suse.cz + +- build ignore xml-commons-jaxp-1.3-apis + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlbeans-mini.spec ++++++ --- /var/tmp/diff_new_pack.R8eD62/_old 2010-11-15 17:56:34.000000000 +0100 +++ /var/tmp/diff_new_pack.R8eD62/_new 2010-11-15 17:56:34.000000000 +0100 @@ -27,7 +27,7 @@ # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) Version: 2.1.0 -Release: 6 +Release: 7 Summary: XML-Java binding tool Url: http://xmlbeans.apache.org # Removal of .xsd files with problematic license @@ -70,6 +70,7 @@ %endif BuildRequires: unzip #!BuildIgnore: antlr antlr-java +#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 Requires: jpackage-utils >= 1.6 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build xmlbeans.spec: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit opensuse-manuals_en for openSUSE:Factory
by root＠hilbert.suse.de 15 Nov '10

15 Nov '10

Hello community, here is the log from the commit of package opensuse-manuals_en for openSUSE:Factory checked in at Mon Nov 15 17:56:12 CET 2010. -------- --- opensuse-manuals_en/opensuse-manuals_en.changes 2010-07-01 16:14:59.000000000 +0200 +++ opensuse-manuals_en/opensuse-manuals_en.changes 2010-11-15 16:04:50.000000000 +0100 @@ -1,0 +2,41 @@ +Mon Nov 15 02:52:46 UTC 2010 - ke(a)suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Mon Sep 20 10:50:33 CEST 2010 - ke(a)suse.de + +- Update text and images, especially the Security Guide; bnc#639823. +- Fix .document file; bnc#626368. + +------------------------------------------------------------------- +Mon Sep 20 08:41:18 UTC 2010 - ke(a)suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Sep 17 13:50:54 UTC 2010 - ke(a)suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Thu Sep 9 09:00:39 UTC 2010 - ke(a)suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Wed Sep 8 15:28:46 UTC 2010 - ke(a)suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Jul 2 09:48:28 UTC 2010 - ke(a)suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Jul 2 09:21:07 UTC 2010 - ke(a)suse.de + +- Update text and image files. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pre_checkin.sh update_spec.pl New: ---- doc_pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_en.spec ++++++ --- /var/tmp/diff_new_pack.CO6177/_old 2010-11-15 17:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.CO6177/_new 2010-11-15 17:54:28.000000000 +0100 @@ -22,10 +22,12 @@ %define my_lang en %define my_book opensuse-html Version: 11.3 -Release: 3 +Release: 8 Provides: locale(desktop-data-openSUSE:en) -Obsoletes: opensuse-manual_en opensuse-kdequick_en opensuse-gnomequick_en opensuse-gnomeuser_en opensuse-kdeuser_en opensuse-kde3user_en apparmor-admin_en opensuse-manuals_en-pdf opensuse-manual_en-pdf opensuse-kde3user_en-pdf -Provides: opensuse-manual_en opensuse-kdequick_en opensuse-gnomequick_en opensuse-gnomeuser_en opensuse-kdeuser_en opensuse-kde3user_en apparmor-admin_en opensuse-manuals_en-pdf opensuse-manual_en-pdf opensuse-kde3user_en-pdf +Obsoletes: opensuse-manual_en < 11.2 opensuse-kdequick_en < 11.1 opensuse-gnomequick_en < 11.1 opensuse-gnomeuser_en < 11.1 opensuse-kdeuser_en < 11. opensuse-kde3user_en < 11.1 apparmor-admin_en < 11.1 +Provides: opensuse-manual_en = %{version}-%{release} opensuse-kdequick_en = %{version}-%{release} opensuse-gnomequick_en = %{version}-%{release} opensuse-gnomeuser_en = %{version}-%{release} opensuse-kdeuser_en = %{version}-%{release} opensuse-kde3user_en = %{version}-%{release} apparmor-admin_en = %{version}-%{release} +Obsoletes: opensuse-manual_en-pdf < 11.2 opensuse-kde3user_en-pdf < 11.1 opensuse-manuals_en-pdf < 11.3 opensuse-apparmor-admin_en-pdf < 11.3 +Provides: opensuse-manual_en-pdf = %{version}-%{release} opensuse-kde3user_en-pdf = %{version}-%{release} opensuse-manuals_en-pdf = %{version}-%{release} opensuse-apparmor-admin_en-pdf = %{version}-%{release} #OBS Source00: opensuse-html_en-html.tar.bz2 Source01: opensuse-html_en-desktop.tar.bz2 @@ -72,14 +74,13 @@ #Source102: opensuse-security_en.tar.bz2 Source103: opensuse-security_en-pdf-yelp.tar.bz2 #SOURCES -Source901: pre_checkin.sh -Source902: update_spec.pl +Source901: doc_pre_checkin.sh Source903: attributes BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Group: Documentation/SUSE License: GFDLv1.2 -Summary: Comlete set of openSUSE Manuals (HTML, English) +Summary: Complete set of openSUSE Manuals (HTML, English) %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual @@ -87,15 +88,25 @@ Contains the complete official openSUSE documentation in HTML format. It can be accessed via the Desktop's help centers. The following manuals are included: + * Installation Quick Start + * Start-Up + * GNOME Quick Start + * GNOME User Guide + * KDE Quick Start + * KDE User Guide + * Application Guide + * Reference + * Security Guide + * AppArmor Quick Start %package -n opensuse-installquick_en-pdf @@ -325,11 +336,12 @@ s/^X-DOC-Identifier=/DocIdentifier=com.novell./ s/^X-DOC-Weight/DocWeight/ " $f > ../%{name}.document - my_title=$(echo "%{summary}" \ - | sed 's/$as $*[Pp][Dd][Ff]//;s/ *(.*)//') - #if grep -s -q '^Name *= *$' ../%{name}.document; then - sed -i " -s/^$Name.*$=$.*$/\1=$my_title \2/" ../%{name}.document +# %{summary} is unreliable +# my_title=$(echo "%{summary}" \ +# | sed 's/$as $*[Pp][Dd][Ff]//;s/ *(.*)//') +# #if grep -s -q '^Name *= *$' ../%{name}.document; then +# sed -i " +# s/^$Name.*$=$.*$/\1=$my_title \2/" ../%{name}.document # fi # if Name contains just "Documentation", add product info # FIXME: check this properly @@ -356,8 +368,8 @@ s|^Categories=.*|Categories=System;Core;Translation;Documentation| s|^$Name.*$|\1 (PDF)|" $f done + popd fi -popd if [ %{my_lang} = "en" ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/help for f in yelp/*.document; do ++++++ attributes ++++++ --- /var/tmp/diff_new_pack.CO6177/_old 2010-11-15 17:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.CO6177/_new 2010-11-15 17:54:28.000000000 +0100 @@ -1,35 +1,45 @@ group.opensuse-manuals_en Documentation/SUSE -license.opensuse-manuals_en GFDL v1.2 -summary.opensuse-manuals_en Comlete set of openSUSE Manuals (HTML, English) +license.opensuse-manuals_en GFDLv1.2 +summary.opensuse-manuals_en Complete set of openSUSE Manuals (HTML, English) +description.opensuse-manuals_en Contains the complete official openSUSE documentation in HTML format. It can be accessed via the Desktop's help centers. The following manuals are included: + * Installation Quick Start + * Start-Up + * GNOME Quick Start + * GNOME User Guide + * KDE Quick Start + * KDE User Guide + * Application Guide + * Reference + * Security Guide + * AppArmor Quick Start -description.opensuse-manuals_en group.opensuse-gnomequick_en-pdf Documentation/SUSE -license.opensuse-gnomequick_en-pdf GFDL v1.2 +license.opensuse-gnomequick_en-pdf GFDLv1.2 summary.opensuse-gnomequick_en-pdf openSUSE manual: GNOME Quick Start (PDF, English) +description.opensuse-gnomequick_en-pdf A quick start guide to the GNOME desktop. -description.opensuse-gnomequick_en-pdf group.opensuse-kdequick_en-pdf Documentation/SUSE -license.opensuse-kdequick_en-pdf GFDL v1.2 +license.opensuse-kdequick_en-pdf GFDLv1.2 summary.opensuse-kdequick_en-pdf openSUSE manual: KDE Quick Start (PDF, English) +description.opensuse-kdequick_en-pdf A quick start guide to the KDE desktop. -description.opensuse-kdequick_en-pdf group.opensuse-kdeuser_en-pdf Documentation/SUSE -license.opensuse-kdeuser_en-pdf GFDL v1.2 +license.opensuse-kdeuser_en-pdf GFDLv1.2 summary.opensuse-kdeuser_en-pdf openSUSE manual KDE User Guide (PDF, English) +description.opensuse-kdeuser_en-pdf This manual introduces the KDE desktop. It guides you through @@ -38,7 +48,7 @@ efficient use of KDE as their default desktop. -description.opensuse-kdeuser_en-pdf group.opensuse-gnomeuser_en-pdf Documentation/SUSE -license.opensuse-gnomeuser_en-pdf GFDL v1.2 +license.opensuse-gnomeuser_en-pdf GFDLv1.2 summary.opensuse-gnomeuser_en-pdf openSUSE manual: GNOME User Guide (PDF, English) +description.opensuse-gnomeuser_en-pdf This manual introduces the GNOME desktop. It guides you through @@ -47,7 +57,7 @@ of GNOME desktop as their default desktop. -description.opensuse-gnomeuser_en-pdf group.opensuse-apps_en-pdf Documentation/SUSE -license.opensuse-apps_en-pdf GFDL v1.2 +license.opensuse-apps_en-pdf GFDLv1.2 summary.opensuse-apps_en-pdf openSUSE manual: Application Guide (PDF, English) +description.opensuse-apps_en-pdf Learn how to use and configure key desktop applications. This @@ -56,7 +66,7 @@ and multimedia applications. -description.opensuse-apps_en-pdf group.opensuse-reference_en-pdf Documentation/SUSE -license.opensuse-reference_en-pdf GFDL v1.2 +license.opensuse-reference_en-pdf GFDLv1.2 summary.opensuse-reference_en-pdf openSUSE manual: Reference (PDF, English) +description.opensuse-reference_en-pdf This guide gives you a general understanding of your system and @@ -68,7 +78,7 @@ various network and file services. -description.opensuse-reference_en-pdf group.opensuse-startup_en-pdf Documentation/SUSE -license.opensuse-startup_en-pdf GFDL v1.2 +license.opensuse-startup_en-pdf GFDLv1.2 summary.opensuse-startup_en-pdf openSUSE manual: Start-Up (PDF, English) +description.opensuse-startup_en-pdf Guides you through the installation and basic configuration of your @@ -78,20 +88,20 @@ mobile computing. Provides help and advice in troubleshooting. -description.opensuse-startup_en-pdf group.opensuse-apparmor-quick_en-pdf Documentation/SUSE -license.opensuse-apparmor-quick_en-pdf GFDL v1.2 +license.opensuse-apparmor-quick_en-pdf GFDLv1.2 summary.opensuse-apparmor-quick_en-pdf openSUSE manual: AppArmor Quick Start (PDF, English) +description.opensuse-apparmor-quick_en-pdf A quick start guide to AppArmor, a security software. -description.opensuse-apparmor-quick_en-pdf group.opensuse-manuals_en-pdf Documentation/SUSE -license.opensuse-manuals_en-pdf GFDL v1.2 +license.opensuse-manuals_en-pdf GFDLv1.2 summary.opensuse-manuals_en-pdf ?????????????????? +description.opensuse-manuals_en-pdf ?????????????????????????????????????? -description.opensuse-manuals_en-pdf group.opensuse-security_en Documentation/SUSE -license.opensuse-security_en-pdf GFDL v1.2 +license.opensuse-security_en-pdf GFDLv1.2 summary.opensuse-security_en-pdf openSUSE manual: Security Guide (PDF, English) +description.opensuse-security_en-pdf This guide introduces basic concepts of system security, covering @@ -102,7 +112,7 @@ information about any security-relevant events. -description.opensuse-security_en-pdf group.opensuse-installquick_en-pdf Documentation/SUSE -license.opensuse-installquick_en-pdf GFDL v1.2 +license.opensuse-installquick_en-pdf GFDLv1.2 summary.opensuse-installquick_en-pdf openSUSE manual: Installation Quick Start (PDF, English) +description.opensuse-installquick_en-pdf A quick start guide providing a walk-through to the default installation. ++++++ doc_pre_checkin.sh ++++++ #!/bin/bash filename=$(echo *.spec) perl /usr/bin/update_spec $filename attributes > $filename.new mv $filename.new $filename exit 0 ++++++ opensuse-apparmor-quick_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-apparmor-quick_en.pdf ++++++ (binary differes) ++++++ opensuse-apps_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-apps_en.pdf ++++++ (binary differes) ++++++ opensuse-gnomequick_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-gnomequick_en.pdf ++++++ (binary differes) ++++++ opensuse-gnomeuser_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-gnomeuser_en.pdf ++++++ (binary differes) ++++++ opensuse-html_en-desktop.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_apps/part_communication/cha_kopete.desktop new/desktop/book_apps/part_communication/cha_kopete.desktop --- old/desktop/book_apps/part_communication/cha_kopete.desktop 2010-07-01 15:48:52.000000000 +0200 +++ new/desktop/book_apps/part_communication/cha_kopete.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Instant Messaging with Kopete -Name[en]=Instant Messaging with Kopete -Comment=Instant Messaging with Kopete -Comment[en]=Instant Messaging with Kopete +Name=Kopete: Instant Messaging +Name[en]=Kopete: Instant Messaging +Comment=Kopete: Instant Messaging +Comment[en]=Kopete: Instant Messaging DocPath=@PATH@/cha.kopete.html Icon=document2 X-DOC-Weight=5390 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_apps/part_internet/cha_gnome_gftp.desktop new/desktop/book_apps/part_internet/cha_gnome_gftp.desktop --- old/desktop/book_apps/part_internet/cha_gnome_gftp.desktop 2010-07-01 15:48:52.000000000 +0200 +++ new/desktop/book_apps/part_internet/cha_gnome_gftp.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Transferring Data From the Internet -Name[en]=Transferring Data From the Internet -Comment=Transferring Data From the Internet -Comment[en]=Transferring Data From the Internet +Name=gFTP: Transferring Data From the Internet +Name[en]=gFTP: Transferring Data From the Internet +Comment=gFTP: Transferring Data From the Internet +Comment[en]=gFTP: Transferring Data From the Internet DocPath=@PATH@/cha.gnome.gftp.html Icon=document2 X-DOC-Weight=5760 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_apps/part_internet/cha_konqueror.desktop new/desktop/book_apps/part_internet/cha_konqueror.desktop --- old/desktop/book_apps/part_internet/cha_konqueror.desktop 2010-07-01 15:48:52.000000000 +0200 +++ new/desktop/book_apps/part_internet/cha_konqueror.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Browsing with Konqueror -Name[en]=Browsing with Konqueror -Comment=Browsing with Konqueror -Comment[en]=Browsing with Konqueror +Name=Konqueror: Browsing the Web +Name[en]=Konqueror: Browsing the Web +Comment=Konqueror: Browsing the Web +Comment[en]=Konqueror: Browsing the Web DocPath=@PATH@/cha.konqueror.html Icon=document2 X-DOC-Weight=5570 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_apps/part_multimedia/cha_gnome_burn.desktop new/desktop/book_apps/part_multimedia/cha_gnome_burn.desktop --- old/desktop/book_apps/part_multimedia/cha_gnome_burn.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_apps/part_multimedia/cha_gnome_burn.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Burning CDs and DVDs With Brasero -Name[en]=Burning CDs and DVDs With Brasero -Comment=Burning CDs and DVDs With Brasero -Comment[en]=Burning CDs and DVDs With Brasero +Name=Brasero: Burning CDs and DVDs +Name[en]=Brasero: Burning CDs and DVDs +Comment=Brasero: Burning CDs and DVDs +Comment[en]=Brasero: Burning CDs and DVDs DocPath=@PATH@/cha.gnome.burn.html Icon=document2 X-DOC-Weight=6390 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_apps/part_multimedia/cha_k3b.desktop new/desktop/book_apps/part_multimedia/cha_k3b.desktop --- old/desktop/book_apps/part_multimedia/cha_k3b.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_apps/part_multimedia/cha_k3b.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Burning CDs and DVDs With K3b -Name[en]=Burning CDs and DVDs With K3b -Comment=Burning CDs and DVDs With K3b -Comment[en]=Burning CDs and DVDs With K3b +Name=K3b: Burning CDs and DVDs +Name[en]=K3b: Burning CDs and DVDs +Comment=K3b: Burning CDs and DVDs +Comment[en]=K3b: Burning CDs and DVDs DocPath=@PATH@/cha.k3b.html Icon=document2 X-DOC-Weight=6320 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_mobility/.directory new/desktop/book_opensuse_reference/part_reference_mobility/.directory --- old/desktop/book_opensuse_reference/part_reference_mobility/.directory 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_mobility/.directory 2010-11-15 03:40:36.000000000 +0100 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=2770 \ No newline at end of file +X-DOC-Weight=2780 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_mobility/cha_mobile.desktop new/desktop/book_opensuse_reference/part_reference_mobility/cha_mobile.desktop --- old/desktop/book_opensuse_reference/part_reference_mobility/cha_mobile.desktop 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_mobility/cha_mobile.desktop 2010-11-15 03:40:36.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Mobile Computing with Linux DocPath=@PATH@/cha.mobile.html Icon=document2 -X-DOC-Weight=2780 \ No newline at end of file +X-DOC-Weight=2790 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_mobility/cha_pmanage.desktop new/desktop/book_opensuse_reference/part_reference_mobility/cha_pmanage.desktop --- old/desktop/book_opensuse_reference/part_reference_mobility/cha_pmanage.desktop 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_mobility/cha_pmanage.desktop 2010-11-15 03:40:36.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Power Management DocPath=@PATH@/cha.pmanage.html Icon=document2 -X-DOC-Weight=2830 \ No newline at end of file +X-DOC-Weight=2840 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_mobility/cha_wireless_wlan.desktop new/desktop/book_opensuse_reference/part_reference_mobility/cha_wireless_wlan.desktop --- old/desktop/book_opensuse_reference/part_reference_mobility/cha_wireless_wlan.desktop 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_mobility/cha_wireless_wlan.desktop 2010-11-15 03:40:36.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Wireless LAN DocPath=@PATH@/cha.wireless.wlan.html Icon=document2 -X-DOC-Weight=2890 \ No newline at end of file +X-DOC-Weight=2900 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_services/cha_apache2.desktop new/desktop/book_opensuse_reference/part_reference_services/cha_apache2.desktop --- old/desktop/book_opensuse_reference/part_reference_services/cha_apache2.desktop 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_services/cha_apache2.desktop 2010-11-15 03:40:36.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=The Apache HTTP Server DocPath=@PATH@/cha.apache2.html Icon=document2 -X-DOC-Weight=2600 \ No newline at end of file +X-DOC-Weight=2610 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_services/cha_ftp.desktop new/desktop/book_opensuse_reference/part_reference_services/cha_ftp.desktop --- old/desktop/book_opensuse_reference/part_reference_services/cha_ftp.desktop 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_services/cha_ftp.desktop 2010-11-15 03:40:36.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Setting up an FTP server with YaST DocPath=@PATH@/cha.ftp.html Icon=document2 -X-DOC-Weight=2700 \ No newline at end of file +X-DOC-Weight=2710 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_services/cha_nfs.desktop new/desktop/book_opensuse_reference/part_reference_services/cha_nfs.desktop --- old/desktop/book_opensuse_reference/part_reference_services/cha_nfs.desktop 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_services/cha_nfs.desktop 2010-11-15 03:40:36.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Sharing File Systems with NFS DocPath=@PATH@/cha.nfs.html Icon=document2 -X-DOC-Weight=2440 \ No newline at end of file +X-DOC-Weight=2450 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_opensuse_reference/part_reference_services/cha_samba.desktop new/desktop/book_opensuse_reference/part_reference_services/cha_samba.desktop --- old/desktop/book_opensuse_reference/part_reference_services/cha_samba.desktop 2010-07-01 15:48:51.000000000 +0200 +++ new/desktop/book_opensuse_reference/part_reference_services/cha_samba.desktop 2010-11-15 03:40:36.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Samba DocPath=@PATH@/cha.samba.html Icon=document2 -X-DOC-Weight=2520 \ No newline at end of file +X-DOC-Weight=2530 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/.directory new/desktop/book_quickstarts/.directory --- old/desktop/book_quickstarts/.directory 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/.directory 2010-11-15 03:40:40.000000000 +0100 @@ -1,12 +1,12 @@ [Desktop Entry] -Name=Novell AppArmor (2.3.1) Quick Start -Name[en]=Novell AppArmor (2.3.1) Quick Start -Comment=Novell AppArmor (2.3.1) Quick Start -Comment[en]=Novell AppArmor (2.3.1) Quick Start -DocPath=@PATH@/art.aaquick.html +Name=Legal Information +Name[en]=Legal Information +Comment=Legal Information +Comment[en]=Legal Information +DocPath=@PATH@/bk07ar05.html Icon=document2 X-DOC-DocumentType=text/html X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=8980 \ No newline at end of file +X-DOC-Weight=8920 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/art_aaquick.desktop new/desktop/book_quickstarts/art_aaquick.desktop --- old/desktop/book_quickstarts/art_aaquick.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/art_aaquick.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=AppArmor Modes DocPath=@PATH@/sec.aaquick.modes.html Icon=document2 -X-DOC-Weight=8990 \ No newline at end of file +X-DOC-Weight=8790 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/art_gnomequick.desktop new/desktop/book_quickstarts/art_gnomequick.desktop --- old/desktop/book_quickstarts/art_gnomequick.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/art_gnomequick.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Getting Started DocPath=@PATH@/sec.gnomequick.start.html Icon=document2 -X-DOC-Weight=8750 \ No newline at end of file +X-DOC-Weight=8570 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/art_kdequick.desktop new/desktop/book_quickstarts/art_kdequick.desktop --- old/desktop/book_quickstarts/art_kdequick.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/art_kdequick.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Getting Started DocPath=@PATH@/sec.kdequick.start.html Icon=document2 -X-DOC-Weight=8530 \ No newline at end of file +X-DOC-Weight=8350 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/art_osuse_installquick.desktop new/desktop/book_quickstarts/art_osuse_installquick.desktop --- old/desktop/book_quickstarts/art_osuse_installquick.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/art_osuse_installquick.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Welcome to DocPath=@PATH@/sec.osuse.installquick.html Icon=document2 -X-DOC-Weight=8950 \ No newline at end of file +X-DOC-Weight=8310 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar01s02.desktop new/desktop/book_quickstarts/bk07ar01s02.desktop --- old/desktop/book_quickstarts/bk07ar01s02.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/bk07ar01s02.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Legal Notice +Name[en]=Legal Notice +Comment=Legal Notice +Comment[en]=Legal Notice +DocPath=@PATH@/bk07ar01s02.html +Icon=document2 +X-DOC-Weight=8320 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar01s03.desktop new/desktop/book_quickstarts/bk07ar01s03.desktop --- old/desktop/book_quickstarts/bk07ar01s03.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/bk07ar01s03.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=GNU Free Documentation License +Name[en]=GNU Free Documentation License +Comment=GNU Free Documentation License +Comment[en]=GNU Free Documentation License +DocPath=@PATH@/bk07ar01s03.html +Icon=document2 +X-DOC-Weight=8330 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar01s20.desktop new/desktop/book_quickstarts/bk07ar01s20.desktop --- old/desktop/book_quickstarts/bk07ar01s20.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar01s20.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Legal Notice -Name[en]=Legal Notice -Comment=Legal Notice -Comment[en]=Legal Notice -DocPath=@PATH@/bk07ar01s20.html -Icon=document2 -X-DOC-Weight=8720 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar01s21.desktop new/desktop/book_quickstarts/bk07ar01s21.desktop --- old/desktop/book_quickstarts/bk07ar01s21.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar01s21.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=GNU Free Documentation License -Name[en]=GNU Free Documentation License -Comment=GNU Free Documentation License -Comment[en]=GNU Free Documentation License -DocPath=@PATH@/bk07ar01s21.html -Icon=document2 -X-DOC-Weight=8730 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar02s18.desktop new/desktop/book_quickstarts/bk07ar02s18.desktop --- old/desktop/book_quickstarts/bk07ar02s18.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar02s18.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Legal Notice -Name[en]=Legal Notice -Comment=Legal Notice -Comment[en]=Legal Notice -DocPath=@PATH@/bk07ar02s18.html -Icon=document2 -X-DOC-Weight=8920 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar02s19.desktop new/desktop/book_quickstarts/bk07ar02s19.desktop --- old/desktop/book_quickstarts/bk07ar02s19.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar02s19.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=GNU Free Documentation License -Name[en]=GNU Free Documentation License -Comment=GNU Free Documentation License -Comment[en]=GNU Free Documentation License -DocPath=@PATH@/bk07ar02s19.html -Icon=document2 -X-DOC-Weight=8930 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar02s20.desktop new/desktop/book_quickstarts/bk07ar02s20.desktop --- old/desktop/book_quickstarts/bk07ar02s20.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/bk07ar02s20.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Legal Notice +Name[en]=Legal Notice +Comment=Legal Notice +Comment[en]=Legal Notice +DocPath=@PATH@/bk07ar02s20.html +Icon=document2 +X-DOC-Weight=8540 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar02s21.desktop new/desktop/book_quickstarts/bk07ar02s21.desktop --- old/desktop/book_quickstarts/bk07ar02s21.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/bk07ar02s21.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=GNU Free Documentation License +Name[en]=GNU Free Documentation License +Comment=GNU Free Documentation License +Comment[en]=GNU Free Documentation License +DocPath=@PATH@/bk07ar02s21.html +Icon=document2 +X-DOC-Weight=8550 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar03s02.desktop new/desktop/book_quickstarts/bk07ar03s02.desktop --- old/desktop/book_quickstarts/bk07ar03s02.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar03s02.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Legal Notice -Name[en]=Legal Notice -Comment=Legal Notice -Comment[en]=Legal Notice -DocPath=@PATH@/bk07ar03s02.html -Icon=document2 -X-DOC-Weight=8960 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar03s03.desktop new/desktop/book_quickstarts/bk07ar03s03.desktop --- old/desktop/book_quickstarts/bk07ar03s03.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar03s03.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=GNU Free Documentation License -Name[en]=GNU Free Documentation License -Comment=GNU Free Documentation License -Comment[en]=GNU Free Documentation License -DocPath=@PATH@/bk07ar03s03.html -Icon=document2 -X-DOC-Weight=8970 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar03s20.desktop new/desktop/book_quickstarts/bk07ar03s20.desktop --- old/desktop/book_quickstarts/bk07ar03s20.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/bk07ar03s20.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Legal Notice +Name[en]=Legal Notice +Comment=Legal Notice +Comment[en]=Legal Notice +DocPath=@PATH@/bk07ar03s20.html +Icon=document2 +X-DOC-Weight=8760 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar03s21.desktop new/desktop/book_quickstarts/bk07ar03s21.desktop --- old/desktop/book_quickstarts/bk07ar03s21.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/bk07ar03s21.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=GNU Free Documentation License +Name[en]=GNU Free Documentation License +Comment=GNU Free Documentation License +Comment[en]=GNU Free Documentation License +DocPath=@PATH@/bk07ar03s21.html +Icon=document2 +X-DOC-Weight=8770 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar04s11.desktop new/desktop/book_quickstarts/bk07ar04s11.desktop --- old/desktop/book_quickstarts/bk07ar04s11.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar04s11.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=For More Information DocPath=@PATH@/bk07ar04s11.html Icon=document2 -X-DOC-Weight=9090 \ No newline at end of file +X-DOC-Weight=8890 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar04s12.desktop new/desktop/book_quickstarts/bk07ar04s12.desktop --- old/desktop/book_quickstarts/bk07ar04s12.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar04s12.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Legal Notice DocPath=@PATH@/bk07ar04s12.html Icon=document2 -X-DOC-Weight=9100 \ No newline at end of file +X-DOC-Weight=8900 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar04s13.desktop new/desktop/book_quickstarts/bk07ar04s13.desktop --- old/desktop/book_quickstarts/bk07ar04s13.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/bk07ar04s13.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=GNU Free Documentation License DocPath=@PATH@/bk07ar04s13.html Icon=document2 -X-DOC-Weight=9110 \ No newline at end of file +X-DOC-Weight=8910 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/bk07ar05.desktop new/desktop/book_quickstarts/bk07ar05.desktop --- old/desktop/book_quickstarts/bk07ar05.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/bk07ar05.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=GNU Free Documentation License +Name[en]=GNU Free Documentation License +Comment=GNU Free Documentation License +Comment[en]=GNU Free Documentation License +DocPath=@PATH@/bk07ar05.html +Icon=document2 +X-DOC-Weight=8930 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_audit.desktop new/desktop/book_quickstarts/sec_aaquick_audit.desktop --- old/desktop/book_quickstarts/sec_aaquick_audit.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_audit.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Logging and Auditing DocPath=@PATH@/sec.aaquick.audit.html Icon=document2 -X-DOC-Weight=9070 \ No newline at end of file +X-DOC-Weight=8870 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_cmdline.desktop new/desktop/book_quickstarts/sec_aaquick_cmdline.desktop --- old/desktop/book_quickstarts/sec_aaquick_cmdline.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_cmdline.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=AppArmor Command Line Tools DocPath=@PATH@/sec.aaquick.cmdline.html Icon=document2 -X-DOC-Weight=9010 \ No newline at end of file +X-DOC-Weight=8810 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_directories_files.desktop new/desktop/book_quickstarts/sec_aaquick_directories_files.desktop --- old/desktop/book_quickstarts/sec_aaquick_directories_files.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_directories_files.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Directories and Files DocPath=@PATH@/sec.aaquick.directories_files.html Icon=document2 -X-DOC-Weight=9080 \ No newline at end of file +X-DOC-Weight=8880 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_example.desktop new/desktop/book_quickstarts/sec_aaquick_example.desktop --- old/desktop/book_quickstarts/sec_aaquick_example.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_example.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Example Profile DocPath=@PATH@/sec.aaquick.example.html Icon=document2 -X-DOC-Weight=9040 \ No newline at end of file +X-DOC-Weight=8840 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_learning_mode.desktop new/desktop/book_quickstarts/sec_aaquick_learning_mode.desktop --- old/desktop/book_quickstarts/sec_aaquick_learning_mode.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_learning_mode.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Learning Mode DocPath=@PATH@/sec.aaquick.learning_mode.html Icon=document2 -X-DOC-Weight=9030 \ No newline at end of file +X-DOC-Weight=8830 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_methods.desktop new/desktop/book_quickstarts/sec_aaquick_methods.desktop --- old/desktop/book_quickstarts/sec_aaquick_methods.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_methods.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Methods of Profiling DocPath=@PATH@/sec.aaquick.methods.html Icon=document2 -X-DOC-Weight=9020 \ No newline at end of file +X-DOC-Weight=8820 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_pam_apparmor.desktop new/desktop/book_quickstarts/sec_aaquick_pam_apparmor.desktop --- old/desktop/book_quickstarts/sec_aaquick_pam_apparmor.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_pam_apparmor.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Confining Users with pam_apparmor DocPath=@PATH@/sec.aaquick.pam_apparmor.html Icon=document2 -X-DOC-Weight=9060 \ No newline at end of file +X-DOC-Weight=8860 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_profile_structure.desktop new/desktop/book_quickstarts/sec_aaquick_profile_structure.desktop --- old/desktop/book_quickstarts/sec_aaquick_profile_structure.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_profile_structure.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Structure of a Profile DocPath=@PATH@/sec.aaquick.profile_structure.html Icon=document2 -X-DOC-Weight=9050 \ No newline at end of file +X-DOC-Weight=8850 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_aaquick_startstop.desktop new/desktop/book_quickstarts/sec_aaquick_startstop.desktop --- old/desktop/book_quickstarts/sec_aaquick_startstop.desktop 2010-07-01 15:48:56.000000000 +0200 +++ new/desktop/book_quickstarts/sec_aaquick_startstop.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Starting and Stopping AppArmor DocPath=@PATH@/sec.aaquick.startstop.html Icon=document2 -X-DOC-Weight=9000 \ No newline at end of file +X-DOC-Weight=8800 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_banshee.desktop new/desktop/book_quickstarts/sec_gnomequick_banshee.desktop --- old/desktop/book_quickstarts/sec_gnomequick_banshee.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_banshee.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Managing Your Media -Name[en]=Managing Your Media -Comment=Managing Your Media -Comment[en]=Managing Your Media +Name=Managing Your Music and Videos +Name[en]=Managing Your Music and Videos +Comment=Managing Your Music and Videos +Comment[en]=Managing Your Music and Videos DocPath=@PATH@/sec.gnomequick.banshee.html Icon=document2 -X-DOC-Weight=8870 \ No newline at end of file +X-DOC-Weight=8730 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_beagle.desktop new/desktop/book_quickstarts/sec_gnomequick_beagle.desktop --- old/desktop/book_quickstarts/sec_gnomequick_beagle.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_beagle.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Finding Files on Your Computer -Name[en]=Finding Files on Your Computer -Comment=Finding Files on Your Computer -Comment[en]=Finding Files on Your Computer -DocPath=@PATH@/sec.gnomequick.beagle.html -Icon=document2 -X-DOC-Weight=8840 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_burn.desktop new/desktop/book_quickstarts/sec_gnomequick_burn.desktop --- old/desktop/book_quickstarts/sec_gnomequick_burn.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_burn.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Creating a CD/DVD -Name[en]=Creating a CD/DVD -Comment=Creating a CD/DVD -Comment[en]=Creating a CD/DVD +Name=Creating a CD or DVD +Name[en]=Creating a CD or DVD +Comment=Creating a CD or DVD +Comment[en]=Creating a CD or DVD DocPath=@PATH@/sec.gnomequick.burn.html Icon=document2 -X-DOC-Weight=8850 \ No newline at end of file +X-DOC-Weight=8710 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_custom.desktop new/desktop/book_quickstarts/sec_gnomequick_custom.desktop --- old/desktop/book_quickstarts/sec_gnomequick_custom.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_custom.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Customizing Your Desktop DocPath=@PATH@/sec.gnomequick.custom.html Icon=document2 -X-DOC-Weight=8770 \ No newline at end of file +X-DOC-Weight=8600 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_desktopeffects.desktop new/desktop/book_quickstarts/sec_gnomequick_desktopeffects.desktop --- old/desktop/book_quickstarts/sec_gnomequick_desktopeffects.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/sec_gnomequick_desktopeffects.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Applying Desktop Effects +Name[en]=Applying Desktop Effects +Comment=Applying Desktop Effects +Comment[en]=Applying Desktop Effects +DocPath=@PATH@/sec.gnomequick.desktopeffects.html +Icon=document2 +X-DOC-Weight=8610 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_firefox.desktop new/desktop/book_quickstarts/sec_gnomequick_firefox.desktop --- old/desktop/book_quickstarts/sec_gnomequick_firefox.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_firefox.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Browsing the Internet with Firefox DocPath=@PATH@/sec.gnomequick.firefox.html Icon=document2 -X-DOC-Weight=8790 \ No newline at end of file +X-DOC-Weight=8640 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_fspot.desktop new/desktop/book_quickstarts/sec_gnomequick_fspot.desktop --- old/desktop/book_quickstarts/sec_gnomequick_fspot.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_fspot.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Managing Your Digital Image Collection DocPath=@PATH@/sec.gnomequick.fspot.html Icon=document2 -X-DOC-Weight=8860 \ No newline at end of file +X-DOC-Weight=8720 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_gnomekeyring.desktop new/desktop/book_quickstarts/sec_gnomequick_gnomekeyring.desktop --- old/desktop/book_quickstarts/sec_gnomequick_gnomekeyring.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/sec_gnomequick_gnomekeyring.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Managing Passwords +Name[en]=Managing Passwords +Comment=Managing Passwords +Comment[en]=Managing Passwords +DocPath=@PATH@/sec.gnomequick.gnomekeyring.html +Icon=document2 +X-DOC-Weight=8650 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_logout.desktop new/desktop/book_quickstarts/sec_gnomequick_logout.desktop --- old/desktop/book_quickstarts/sec_gnomequick_logout.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_logout.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Logging Out DocPath=@PATH@/sec.gnomequick.logout.html Icon=document2 -X-DOC-Weight=8900 \ No newline at end of file +X-DOC-Weight=8740 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_mail.desktop new/desktop/book_quickstarts/sec_gnomequick_mail.desktop --- old/desktop/book_quickstarts/sec_gnomequick_mail.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_mail.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=E-Mailing and Calendaring DocPath=@PATH@/sec.gnomequick.mail.html Icon=document2 -X-DOC-Weight=8800 \ No newline at end of file +X-DOC-Weight=8660 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_mediahandling.desktop new/desktop/book_quickstarts/sec_gnomequick_mediahandling.desktop --- old/desktop/book_quickstarts/sec_gnomequick_mediahandling.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/sec_gnomequick_mediahandling.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Handling Media +Name[en]=Handling Media +Comment=Handling Media +Comment[en]=Handling Media +DocPath=@PATH@/sec.gnomequick.mediahandling.html +Icon=document2 +X-DOC-Weight=8590 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_more.desktop new/desktop/book_quickstarts/sec_gnomequick_more.desktop --- old/desktop/book_quickstarts/sec_gnomequick_more.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_more.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=For More Information DocPath=@PATH@/sec.gnomequick.more.html Icon=document2 -X-DOC-Weight=8910 \ No newline at end of file +X-DOC-Weight=8750 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_nautilus.desktop new/desktop/book_quickstarts/sec_gnomequick_nautilus.desktop --- old/desktop/book_quickstarts/sec_gnomequick_nautilus.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_nautilus.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Managing Files and Folders DocPath=@PATH@/sec.gnomequick.nautilus.html Icon=document2 -X-DOC-Weight=8780 \ No newline at end of file +X-DOC-Weight=8630 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_ooo.desktop new/desktop/book_quickstarts/sec_gnomequick_ooo.desktop --- old/desktop/book_quickstarts/sec_gnomequick_ooo.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_ooo.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Starting OpenOffice.org DocPath=@PATH@/sec.gnomequick.ooo.html Icon=document2 -X-DOC-Weight=8820 \ No newline at end of file +X-DOC-Weight=8680 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_pdf.desktop new/desktop/book_quickstarts/sec_gnomequick_pdf.desktop --- old/desktop/book_quickstarts/sec_gnomequick_pdf.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_pdf.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Viewing PDF Files -Name[en]=Viewing PDF Files -Comment=Viewing PDF Files -Comment[en]=Viewing PDF Files +Name=Viewing PDF Files and Other Documents +Name[en]=Viewing PDF Files and Other Documents +Comment=Viewing PDF Files and Other Documents +Comment[en]=Viewing PDF Files and Other Documents DocPath=@PATH@/sec.gnomequick.pdf.html Icon=document2 -X-DOC-Weight=8830 \ No newline at end of file +X-DOC-Weight=8690 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_pidgin.desktop new/desktop/book_quickstarts/sec_gnomequick_pidgin.desktop --- old/desktop/book_quickstarts/sec_gnomequick_pidgin.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_pidgin.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Instant Messaging with Pidgin DocPath=@PATH@/sec.gnomequick.pidgin.html Icon=document2 -X-DOC-Weight=8810 \ No newline at end of file +X-DOC-Weight=8670 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_print.desktop new/desktop/book_quickstarts/sec_gnomequick_print.desktop --- old/desktop/book_quickstarts/sec_gnomequick_print.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_print.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Managing Printers -Name[en]=Managing Printers -Comment=Managing Printers -Comment[en]=Managing Printers -DocPath=@PATH@/sec.gnomequick.print.html -Icon=document2 -X-DOC-Weight=8890 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_search.desktop new/desktop/book_quickstarts/sec_gnomequick_search.desktop --- old/desktop/book_quickstarts/sec_gnomequick_search.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/sec_gnomequick_search.desktop 2010-11-15 03:40:40.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Searching for Data +Name[en]=Searching for Data +Comment=Searching for Data +Comment[en]=Searching for Data +DocPath=@PATH@/sec.gnomequick.search.html +Icon=document2 +X-DOC-Weight=8700 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_startprog.desktop new/desktop/book_quickstarts/sec_gnomequick_startprog.desktop --- old/desktop/book_quickstarts/sec_gnomequick_startprog.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_startprog.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Starting Programs DocPath=@PATH@/sec.gnomequick.startprog.html Icon=document2 -X-DOC-Weight=8760 \ No newline at end of file +X-DOC-Weight=8580 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_virtdesk.desktop new/desktop/book_quickstarts/sec_gnomequick_virtdesk.desktop --- old/desktop/book_quickstarts/sec_gnomequick_virtdesk.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/desktop/book_quickstarts/sec_gnomequick_virtdesk.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Using Virtual Desktops +Name[en]=Using Virtual Desktops +Comment=Using Virtual Desktops +Comment[en]=Using Virtual Desktops +DocPath=@PATH@/sec.gnomequick.virtdesk.html +Icon=document2 +X-DOC-Weight=8620 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_gnomequick_yast.desktop new/desktop/book_quickstarts/sec_gnomequick_yast.desktop --- old/desktop/book_quickstarts/sec_gnomequick_yast.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_gnomequick_yast.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Configuring Your System with YaST -Name[en]=Configuring Your System with YaST -Comment=Configuring Your System with YaST -Comment[en]=Configuring Your System with YaST -DocPath=@PATH@/sec.gnomequick.yast.html -Icon=document2 -X-DOC-Weight=8880 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_amarok.desktop new/desktop/book_quickstarts/sec_kdequick_amarok.desktop --- old/desktop/book_quickstarts/sec_kdequick_amarok.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_amarok.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Managing Your Music Collection DocPath=@PATH@/sec.kdequick.amarok.html Icon=document2 -X-DOC-Weight=8690 \ No newline at end of file +X-DOC-Weight=8510 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_browser.desktop new/desktop/book_quickstarts/sec_kdequick_browser.desktop --- old/desktop/book_quickstarts/sec_kdequick_browser.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_browser.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Browsing the Internet -Name[en]=Browsing the Internet -Comment=Browsing the Internet -Comment[en]=Browsing the Internet +Name=Browsing the Internet with Firefox +Name[en]=Browsing the Internet with Firefox +Comment=Browsing the Internet with Firefox +Comment[en]=Browsing the Internet with Firefox DocPath=@PATH@/sec.kdequick.browser.html Icon=document2 -X-DOC-Weight=8600 \ No newline at end of file +X-DOC-Weight=8420 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_burn.desktop new/desktop/book_quickstarts/sec_kdequick_burn.desktop --- old/desktop/book_quickstarts/sec_kdequick_burn.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_burn.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Creating a CD or DVD DocPath=@PATH@/sec.kdequick.burn.html Icon=document2 -X-DOC-Weight=8670 \ No newline at end of file +X-DOC-Weight=8490 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_custom.desktop new/desktop/book_quickstarts/sec_kdequick_custom.desktop --- old/desktop/book_quickstarts/sec_kdequick_custom.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_custom.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Customizing Your Desktop DocPath=@PATH@/sec.kdequick.custom.html Icon=document2 -X-DOC-Weight=8560 \ No newline at end of file +X-DOC-Weight=8380 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_desktopeffects.desktop new/desktop/book_quickstarts/sec_kdequick_desktopeffects.desktop --- old/desktop/book_quickstarts/sec_kdequick_desktopeffects.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_desktopeffects.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Applying Desktop Effects DocPath=@PATH@/sec.kdequick.desktopeffects.html Icon=document2 -X-DOC-Weight=8570 \ No newline at end of file +X-DOC-Weight=8390 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_digikam.desktop new/desktop/book_quickstarts/sec_kdequick_digikam.desktop --- old/desktop/book_quickstarts/sec_kdequick_digikam.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_digikam.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Managing Your Digital Image Collection DocPath=@PATH@/sec.kdequick.digikam.html Icon=document2 -X-DOC-Weight=8680 \ No newline at end of file +X-DOC-Weight=8500 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_docview.desktop new/desktop/book_quickstarts/sec_kdequick_docview.desktop --- old/desktop/book_quickstarts/sec_kdequick_docview.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_docview.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Viewing PDF Files and Other Documents DocPath=@PATH@/sec.kdequick.docview.html Icon=document2 -X-DOC-Weight=8650 \ No newline at end of file +X-DOC-Weight=8470 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_dolphin.desktop new/desktop/book_quickstarts/sec_kdequick_dolphin.desktop --- old/desktop/book_quickstarts/sec_kdequick_dolphin.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_dolphin.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Using the File Manager DocPath=@PATH@/sec.kdequick.dolphin.html Icon=document2 -X-DOC-Weight=8590 \ No newline at end of file +X-DOC-Weight=8410 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_find.desktop new/desktop/book_quickstarts/sec_kdequick_find.desktop --- old/desktop/book_quickstarts/sec_kdequick_find.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_find.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Searching for Data DocPath=@PATH@/sec.kdequick.find.html Icon=document2 -X-DOC-Weight=8660 \ No newline at end of file +X-DOC-Weight=8480 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_kopete.desktop new/desktop/book_quickstarts/sec_kdequick_kopete.desktop --- old/desktop/book_quickstarts/sec_kdequick_kopete.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_kopete.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Instant Messaging with Kopete DocPath=@PATH@/sec.kdequick.kopete.html Icon=document2 -X-DOC-Weight=8630 \ No newline at end of file +X-DOC-Weight=8450 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_kwallet.desktop new/desktop/book_quickstarts/sec_kdequick_kwallet.desktop --- old/desktop/book_quickstarts/sec_kdequick_kwallet.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_kwallet.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Managing Passwords DocPath=@PATH@/sec.kdequick.kwallet.html Icon=document2 -X-DOC-Weight=8610 \ No newline at end of file +X-DOC-Weight=8430 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_logout.desktop new/desktop/book_quickstarts/sec_kdequick_logout.desktop --- old/desktop/book_quickstarts/sec_kdequick_logout.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_logout.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Logging Out DocPath=@PATH@/sec.kdequick.logout.html Icon=document2 -X-DOC-Weight=8700 \ No newline at end of file +X-DOC-Weight=8520 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_mail.desktop new/desktop/book_quickstarts/sec_kdequick_mail.desktop --- old/desktop/book_quickstarts/sec_kdequick_mail.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_mail.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=E-Mailing and Calendaring DocPath=@PATH@/sec.kdequick.mail.html Icon=document2 -X-DOC-Weight=8620 \ No newline at end of file +X-DOC-Weight=8440 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_mediahandling.desktop new/desktop/book_quickstarts/sec_kdequick_mediahandling.desktop --- old/desktop/book_quickstarts/sec_kdequick_mediahandling.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_mediahandling.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Handling Media DocPath=@PATH@/sec.kdequick.mediahandling.html Icon=document2 -X-DOC-Weight=8550 \ No newline at end of file +X-DOC-Weight=8370 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_more.desktop new/desktop/book_quickstarts/sec_kdequick_more.desktop --- old/desktop/book_quickstarts/sec_kdequick_more.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_more.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=For More Information DocPath=@PATH@/sec.kdequick.more.html Icon=document2 -X-DOC-Weight=8710 \ No newline at end of file +X-DOC-Weight=8530 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_ooo.desktop new/desktop/book_quickstarts/sec_kdequick_ooo.desktop --- old/desktop/book_quickstarts/sec_kdequick_ooo.desktop 2010-07-01 15:48:55.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_ooo.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Starting OpenOffice.org DocPath=@PATH@/sec.kdequick.ooo.html Icon=document2 -X-DOC-Weight=8640 \ No newline at end of file +X-DOC-Weight=8460 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_startprogr.desktop new/desktop/book_quickstarts/sec_kdequick_startprogr.desktop --- old/desktop/book_quickstarts/sec_kdequick_startprogr.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_startprogr.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Starting Programs DocPath=@PATH@/sec.kdequick.startprogr.html Icon=document2 -X-DOC-Weight=8540 \ No newline at end of file +X-DOC-Weight=8360 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_quickstarts/sec_kdequick_virtdesk.desktop new/desktop/book_quickstarts/sec_kdequick_virtdesk.desktop --- old/desktop/book_quickstarts/sec_kdequick_virtdesk.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_quickstarts/sec_kdequick_virtdesk.desktop 2010-11-15 03:40:39.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Using Virtual Desktops DocPath=@PATH@/sec.kdequick.virtdesk.html Icon=document2 -X-DOC-Weight=8580 \ No newline at end of file +X-DOC-Weight=8400 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/bk06apa.desktop new/desktop/book_security/bk06apa.desktop --- old/desktop/book_security/bk06apa.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/bk06apa.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=GNU Licenses DocPath=@PATH@/bk06apa.html Icon=document2 -X-DOC-Weight=8480 \ No newline at end of file +X-DOC-Weight=8260 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/.directory new/desktop/book_security/part_apparmor/.directory --- old/desktop/book_security/part_apparmor/.directory 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_apparmor/.directory 2010-11-15 03:40:38.000000000 +0100 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=7590 \ No newline at end of file +X-DOC-Weight=7630 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_commandline.desktop new/desktop/book_security/part_apparmor/cha_apparmor_commandline.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_commandline.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_commandline.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Building Profiles from the Command Line DocPath=@PATH@/cha.apparmor.commandline.html Icon=document2 -X-DOC-Weight=7960 \ No newline at end of file +X-DOC-Weight=8000 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_concept.desktop new/desktop/book_security/part_apparmor/cha_apparmor_concept.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_concept.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_concept.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Immunizing Programs DocPath=@PATH@/cha.apparmor.concept.html Icon=document2 -X-DOC-Weight=7690 \ No newline at end of file +X-DOC-Weight=7730 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_glossary.desktop new/desktop/book_security/part_apparmor/cha_apparmor_glossary.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_glossary.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_glossary.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=AppArmor Glossary DocPath=@PATH@/cha.apparmor.glossary.html Icon=document2 -X-DOC-Weight=8210 \ No newline at end of file +X-DOC-Weight=8250 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_hat.desktop new/desktop/book_security/part_apparmor/cha_apparmor_hat.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_hat.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_hat.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Profiling Your Web Applications Using ChangeHat DocPath=@PATH@/cha.apparmor.hat.html Icon=document2 -X-DOC-Weight=8040 \ No newline at end of file +X-DOC-Weight=8080 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_intro.desktop new/desktop/book_security/part_apparmor/cha_apparmor_intro.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_intro.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_intro.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Introducing AppArmor DocPath=@PATH@/cha.apparmor.intro.html Icon=document2 -X-DOC-Weight=7600 \ No newline at end of file +X-DOC-Weight=7640 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_managing.desktop new/desktop/book_security/part_apparmor/cha_apparmor_managing.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_managing.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_managing.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Managing Profiled Applications DocPath=@PATH@/cha.apparmor.managing.html Icon=document2 -X-DOC-Weight=8080 \ No newline at end of file +X-DOC-Weight=8120 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_pam.desktop new/desktop/book_security/part_apparmor/cha_apparmor_pam.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_pam.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_pam.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Confining Users with pam_apparmor DocPath=@PATH@/cha.apparmor.pam.html Icon=document2 -X-DOC-Weight=8070 \ No newline at end of file +X-DOC-Weight=8110 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_profiles.desktop new/desktop/book_security/part_apparmor/cha_apparmor_profiles.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_profiles.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_profiles.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Profile Components and Syntax DocPath=@PATH@/cha.apparmor.profiles.html Icon=document2 -X-DOC-Weight=7740 \ No newline at end of file +X-DOC-Weight=7780 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_repos.desktop new/desktop/book_security/part_apparmor/cha_apparmor_repos.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_repos.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_repos.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=AppArmor Profile Repositories DocPath=@PATH@/cha.apparmor.repos.html Icon=document2 -X-DOC-Weight=7860 \ No newline at end of file +X-DOC-Weight=7900 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_start.desktop new/desktop/book_security/part_apparmor/cha_apparmor_start.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_start.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_start.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Getting Started DocPath=@PATH@/cha.apparmor.start.html Icon=document2 -X-DOC-Weight=7620 \ No newline at end of file +X-DOC-Weight=7660 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_support.desktop new/desktop/book_security/part_apparmor/cha_apparmor_support.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_support.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_support.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Support DocPath=@PATH@/cha.apparmor.support.html Icon=document2 -X-DOC-Weight=8150 \ No newline at end of file +X-DOC-Weight=8190 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_apparmor/cha_apparmor_yast.desktop new/desktop/book_security/part_apparmor/cha_apparmor_yast.desktop --- old/desktop/book_security/part_apparmor/cha_apparmor_yast.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_apparmor/cha_apparmor_yast.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Building and Managing Profiles with YaST DocPath=@PATH@/cha.apparmor.yast.html Icon=document2 -X-DOC-Weight=7890 \ No newline at end of file +X-DOC-Weight=7930 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_audit/.directory new/desktop/book_security/part_audit/.directory --- old/desktop/book_security/part_audit/.directory 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_audit/.directory 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=The Linux Audit Framework -Name[en]=The Linux Audit Framework -Comment=The Linux Audit Framework -Comment[en]=The Linux Audit Framework -DocPath=@PATH@/part.audit.html -Icon=document2 -X-DOC-DocumentType=text/html -X-DOC-Identifier=@id@ -X-DOC-SearchMethod=Htdig -X-DOC-SearchEnabledDefault=true -X-DOC-Weight=8220 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_audit/cha_audit_comp.desktop new/desktop/book_security/part_audit/cha_audit_comp.desktop --- old/desktop/book_security/part_audit/cha_audit_comp.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_audit/cha_audit_comp.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Understanding Linux Audit -Name[en]=Understanding Linux Audit -Comment=Understanding Linux Audit -Comment[en]=Understanding Linux Audit -DocPath=@PATH@/cha.audit.comp.html -Icon=document2 -X-DOC-Weight=8230 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_audit/cha_audit_moreinfo.desktop new/desktop/book_security/part_audit/cha_audit_moreinfo.desktop --- old/desktop/book_security/part_audit/cha_audit_moreinfo.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_audit/cha_audit_moreinfo.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Useful Resources -Name[en]=Useful Resources -Comment=Useful Resources -Comment[en]=Useful Resources -DocPath=@PATH@/cha.audit.moreinfo.html -Icon=document2 -X-DOC-Weight=8470 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_audit/cha_audit_scenarios.desktop new/desktop/book_security/part_audit/cha_audit_scenarios.desktop --- old/desktop/book_security/part_audit/cha_audit_scenarios.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_audit/cha_audit_scenarios.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Introducing an Audit Rule Set -Name[en]=Introducing an Audit Rule Set -Comment=Introducing an Audit Rule Set -Comment[en]=Introducing an Audit Rule Set -DocPath=@PATH@/cha.audit.scenarios.html -Icon=document2 -X-DOC-Weight=8390 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_audit/cha_audit_setup.desktop new/desktop/book_security/part_audit/cha_audit_setup.desktop --- old/desktop/book_security/part_audit/cha_audit_setup.desktop 2010-07-01 15:48:54.000000000 +0200 +++ new/desktop/book_security/part_audit/cha_audit_setup.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Setting Up the Linux Audit Framework -Name[en]=Setting Up the Linux Audit Framework -Comment=Setting Up the Linux Audit Framework -Comment[en]=Setting Up the Linux Audit Framework -DocPath=@PATH@/cha.audit.setup.html -Icon=document2 -X-DOC-Weight=8320 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_auth/cha_security_fp.desktop new/desktop/book_security/part_auth/cha_security_fp.desktop --- old/desktop/book_security/part_auth/cha_security_fp.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_auth/cha_security_fp.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Using the Fingerprint Reader DocPath=@PATH@/cha.security.fp.html Icon=document2 -X-DOC-Weight=7010 \ No newline at end of file +X-DOC-Weight=7020 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_local_security/.directory new/desktop/book_security/part_local_security/.directory --- old/desktop/book_security/part_local_security/.directory 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_local_security/.directory 2010-11-15 03:40:37.000000000 +0100 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=7040 \ No newline at end of file +X-DOC-Weight=7050 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_local_security/cha_aide.desktop new/desktop/book_security/part_local_security/cha_aide.desktop --- old/desktop/book_security/part_local_security/cha_aide.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_local_security/cha_aide.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Intrusion Detection with AIDE DocPath=@PATH@/cha.aide.html Icon=document2 -X-DOC-Weight=7280 \ No newline at end of file +X-DOC-Weight=7300 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_local_security/cha_security_acls.desktop new/desktop/book_security/part_local_security/cha_security_acls.desktop --- old/desktop/book_security/part_local_security/cha_security_acls.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_local_security/cha_security_acls.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Access Control Lists in Linux DocPath=@PATH@/cha.security.acls.html Icon=document2 -X-DOC-Weight=7170 \ No newline at end of file +X-DOC-Weight=7190 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_local_security/cha_security_cryptofs.desktop new/desktop/book_security/part_local_security/cha_security_cryptofs.desktop --- old/desktop/book_security/part_local_security/cha_security_cryptofs.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_local_security/cha_security_cryptofs.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Encrypting Partitions and Files DocPath=@PATH@/cha.security.cryptofs.html Icon=document2 -X-DOC-Weight=7240 \ No newline at end of file +X-DOC-Weight=7260 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_local_security/cha_security_policykit.desktop new/desktop/book_security/part_local_security/cha_security_policykit.desktop --- old/desktop/book_security/part_local_security/cha_security_policykit.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_local_security/cha_security_policykit.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=PolicyKit DocPath=@PATH@/cha.security.policykit.html Icon=document2 -X-DOC-Weight=7130 \ No newline at end of file +X-DOC-Weight=7140 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_local_security/cha_security_yast_security.desktop new/desktop/book_security/part_local_security/cha_security_yast_security.desktop --- old/desktop/book_security/part_local_security/cha_security_yast_security.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_local_security/cha_security_yast_security.desktop 2010-11-15 03:40:37.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Configuring Security Settings with YaST DocPath=@PATH@/cha.security.yast_security.html Icon=document2 -X-DOC-Weight=7050 \ No newline at end of file +X-DOC-Weight=7060 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_network_security/.directory new/desktop/book_security/part_network_security/.directory --- old/desktop/book_security/part_network_security/.directory 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_network_security/.directory 2010-11-15 03:40:38.000000000 +0100 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=7340 \ No newline at end of file +X-DOC-Weight=7360 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_network_security/cha_security_firewall.desktop new/desktop/book_security/part_network_security/cha_security_firewall.desktop --- old/desktop/book_security/part_network_security/cha_security_firewall.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_network_security/cha_security_firewall.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Masquerading and Firewalls DocPath=@PATH@/cha.security.firewall.html Icon=document2 -X-DOC-Weight=7440 \ No newline at end of file +X-DOC-Weight=7470 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_network_security/cha_security_vpnserver.desktop new/desktop/book_security/part_network_security/cha_security_vpnserver.desktop --- old/desktop/book_security/part_network_security/cha_security_vpnserver.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_network_security/cha_security_vpnserver.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Configuring VPN Server DocPath=@PATH@/cha.security.vpnserver.html Icon=document2 -X-DOC-Weight=7500 \ No newline at end of file +X-DOC-Weight=7530 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_network_security/cha_security_yast_ca.desktop new/desktop/book_security/part_network_security/cha_security_yast_ca.desktop --- old/desktop/book_security/part_network_security/cha_security_yast_ca.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_network_security/cha_security_yast_ca.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=Managing X.509 Certification DocPath=@PATH@/cha.security.yast_ca.html Icon=document2 -X-DOC-Weight=7560 \ No newline at end of file +X-DOC-Weight=7600 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/book_security/part_network_security/cha_ssh.desktop new/desktop/book_security/part_network_security/cha_ssh.desktop --- old/desktop/book_security/part_network_security/cha_ssh.desktop 2010-07-01 15:48:53.000000000 +0200 +++ new/desktop/book_security/part_network_security/cha_ssh.desktop 2010-11-15 03:40:38.000000000 +0100 @@ -5,4 +5,4 @@ Comment[en]=SSH: Secure Network Operations DocPath=@PATH@/cha.ssh.html Icon=document2 -X-DOC-Weight=7350 \ No newline at end of file +X-DOC-Weight=7370 \ No newline at end of file ++++++ opensuse-html_en-graphics.tar.bz2 ++++++ opensuse-manuals_en/opensuse-html_en-graphics.tar.bz2 opensuse-manuals_en/opensuse-html_en-graphics.tar.bz2 differ: char 11, line 1 ++++++ opensuse-html_en-html.tar.bz2 ++++++ opensuse-manuals_en/opensuse-html_en-html.tar.bz2 opensuse-manuals_en/opensuse-html_en-html.tar.bz2 differ: char 11, line 1 ++++++ opensuse-html_en.tar.bz2 ++++++ ++++ 26646 lines of diff (skipped) ++++++ opensuse-installquick_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-installquick_en.pdf ++++++ (binary differes) ++++++ opensuse-kdequick_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-kdequick_en.pdf ++++++ (binary differes) ++++++ opensuse-kdeuser_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-kdeuser_en.pdf ++++++ (binary differes) ++++++ opensuse-reference_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-reference_en.pdf ++++++ (binary differes) ++++++ opensuse-security_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-security_en.pdf ++++++ (binary differes) ++++++ opensuse-startup_en-pdf-yelp.tar.bz2 ++++++ ++++++ opensuse-startup_en.pdf ++++++ (binary differes) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0