rev 3676 - in people/jriddell: . systemsettings
systemsettings/debian systemsettings/debian/patches
Jonathan Riddell
jriddell-guest at costa.debian.org
Tue May 2 01:38:50 UTC 2006
Author: jriddell-guest
Date: 2006-05-02 01:38:48 +0000 (Tue, 02 May 2006)
New Revision: 3676
Added:
people/jriddell/systemsettings/
people/jriddell/systemsettings/debian/
people/jriddell/systemsettings/debian/changelog
people/jriddell/systemsettings/debian/compat
people/jriddell/systemsettings/debian/control
people/jriddell/systemsettings/debian/copyright
people/jriddell/systemsettings/debian/docs
people/jriddell/systemsettings/debian/kde-settings-bluetooth.directory
people/jriddell/systemsettings/debian/kde-settings-laptops.directory
people/jriddell/systemsettings/debian/patches/
people/jriddell/systemsettings/debian/patches/kubuntu_01_kdepot.diff
people/jriddell/systemsettings/debian/patches/kubuntu_02_update_menus.diff
people/jriddell/systemsettings/debian/patches/kubuntu_03_no_kbuildsycoca.diff
people/jriddell/systemsettings/debian/rules
people/jriddell/systemsettings/debian/systemsettings.1.docbook
Log:
Add systemsettings packaging
Added: people/jriddell/systemsettings/debian/changelog
===================================================================
--- people/jriddell/systemsettings/debian/changelog 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/changelog 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,84 @@
+kde-systemsettings (0.0svn20060413-0ubuntu1) dapper; urgency=low
+
+ * New SVN snapshot, no code changes only new translations
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 13 Apr 2006 17:31:56 +0100
+
+kde-systemsettings (0.0svn20060314-0ubuntu4) dapper; urgency=low
+
+ * Fix format in kubuntu_02_update_menus.diff.
+
+ -- Raphaël Pinson <raphink at ubuntu.com> Fri, 17 Mar 2006 16:48:12 +0100
+
+kde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low
+
+ * Modify kubuntu_02_update_menus.diff to prevent k3bsetup from showing up.
+
+ -- Raphaël Pinson <raphink at ubuntu.com> Fri, 17 Mar 2006 15:02:49 +0100
+
+kde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low
+
+ * Add kubuntu_03_no_kbuildsycoca.diff, stop it running kbuildsycocoa
+ during 'make install'
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 15 Mar 2006 01:12:43 +0000
+
+kde-systemsettings (0.0svn20060314-0ubuntu1) dapper; urgency=low
+
+ * New upstream snapshot, adds various bugfixes by Simon Edwards
+ - Remove text for the "reset" button and put the icon text
+ of the right hand side.
+ - Fix when going from a module back to the module overview, the
+ last selected module icon would stay selected
+ - If the dialog contents don't fit then scrollbars are shown
+ - Fix the evil "This module is already loaded in systemsettings"
+ error.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 14 Mar 2006 00:44:10 +0000
+
+kde-systemsettings (0.0svn20051207-0ubuntu4) dapper; urgency=low
+
+ * Don't use DEB_AUTO_UPDATE_DEBIAN_CONTROL
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 8 Dec 2005 18:52:52 +0000
+
+kde-systemsettings (0.0svn20051207-0ubuntu3) dapper; urgency=low
+
+ * Add build-dep on automake1.9
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 8 Dec 2005 03:55:12 +0000
+
+kde-systemsettings (0.0svn20051207-0ubuntu2) dapper; urgency=low
+
+ * Add build-dep on autoconf
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 7 Dec 2005 18:26:47 +0000
+
+kde-systemsettings (0.0svn20051207-0ubuntu1) dapper; urgency=low
+
+ * New snapshot
+ * Rebuild for libstdc++ transition
+ * Add kubuntu_01_kdepot.diff to be able to generate .pot file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 7 Dec 2005 16:20:32 +0000
+
+kde-systemsettings (0.0svn20050613-0ubuntu3) breezy; urgency=low
+
+ * Add kubuntu_02_update_menus.diff, kde-settings-bluetooth.directory
+ and kde-settings-laptops.directory to tidy up menus
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 24 Sep 2005 18:11:08 +0100
+
+kde-systemsettings (0.0svn20050613-0ubuntu2) breezy; urgency=low
+
+ * Add kubuntu_01_only_show_in_kde.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 20 Jun 2005 17:10:56 +0000
+
+kde-systemsettings (0.0svn20050613-0ubuntu1) breezy; urgency=low
+
+ * Initial Release.
+ * Added manpage (from docbook source).
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 9 Jun 2005 13:04:26 +0000
+
Added: people/jriddell/systemsettings/debian/compat
===================================================================
--- people/jriddell/systemsettings/debian/compat 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/compat 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1 @@
+4
Added: people/jriddell/systemsettings/debian/control
===================================================================
--- people/jriddell/systemsettings/debian/control 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/control 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,13 @@
+Source: kde-systemsettings
+Section: kde
+Priority: optional
+Maintainer: Jonathan Riddell <jriddell at ubuntu.com>
+Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), kdelibs4-dev (>= 3.3), docbook2x, unsermake, automake1.9, autoconf
+Standards-Version: 3.6.1
+
+Package: kde-systemsettings
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol
+Description: easy to use control centre for KDE
+ System preferences is a replacement for the KDE
+ Control Centre with an improved user interface.
Added: people/jriddell/systemsettings/debian/copyright
===================================================================
--- people/jriddell/systemsettings/debian/copyright 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/copyright 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,36 @@
+This package was debianised by Jonathan Riddell <jriddell at ubuntu.com> on
+Thu, 9 Jun 2005 13:04:26 +0000.
+
+Debian packagers:
+ Copyright (C) 2005 Jonathan Riddell <jriddell at ubuntu.com>
+
+Upstream Author:
+ Benjamin Charles Meyer <ben+kubuntusystempreferences at meyerhome.net>
+
+Copyright and license:
+
+All the software and systemsettings.1.docbook is GPL:
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+
+Copyright
+
+all the software:
+
+ Copyright (C) 2005 by Benjamin Charles Meyer <ben+kubuntusystempreferences at meyerhome.net>
+
+debian/systemsettings.1.docbook :
+
+ Copyright (C) 2005 by Jonathan Riddell <jriddell at ubuntu.com>
+
Added: people/jriddell/systemsettings/debian/docs
===================================================================
--- people/jriddell/systemsettings/debian/docs 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/docs 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,5 @@
+TODO
+AUTHOR
+
+
+
Added: people/jriddell/systemsettings/debian/kde-settings-bluetooth.directory
===================================================================
--- people/jriddell/systemsettings/debian/kde-settings-bluetooth.directory 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/kde-settings-bluetooth.directory 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Bluetooth
+Icon=kdebluetooth
Added: people/jriddell/systemsettings/debian/kde-settings-laptops.directory
===================================================================
--- people/jriddell/systemsettings/debian/kde-settings-laptops.directory 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/kde-settings-laptops.directory 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Laptops & Power
+Name[br]=Gremm
+Name[el]=Ισχύς
+Name[it]=Energia
+Name[mt]=Elettriku
+Name[nl]=Energie
+Name[pa]=ਊਰਜਾ(power)
+Name[pt_BR]=Energia
+Name[ru]=Управление питанием
+Name[sv]=Effekt
+Icon=energy
Added: people/jriddell/systemsettings/debian/patches/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/systemsettings/debian/patches/kubuntu_01_kdepot.diff 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/patches/kubuntu_01_kdepot.diff 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+ test -z "$VERBOSE" || echo "Making messages in $subdir"
+ (cd $subdir
+@@ -554,10 +556,10 @@
+ fi
+ perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+- if ! test -f $kdepotpath; then
+- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+- fi
++# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++# if ! test -f $kdepotpath; then
++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++# fi
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
Added: people/jriddell/systemsettings/debian/patches/kubuntu_02_update_menus.diff
===================================================================
--- people/jriddell/systemsettings/debian/patches/kubuntu_02_update_menus.diff 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/patches/kubuntu_02_update_menus.diff 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,61 @@
+--- systemsetttings/systemsettings/menu/system-settings.menu 2005-09-24 18:35:46.000000000 +0100
++++ systemsetttings/systemsettings/menu/system-settings.menu 2005-09-24 18:35:31.000000000
++0100
+@@ -176,7 +176,7 @@
+
+ <Menu>
+ <Name>Connections</Name>
+- <Directory>kde-settings-networkconnection.directory</Directory>
++ <Directory>kde-settings-networkconnections.directory</Directory>
+
+ <Include>
+ <Filename>kde-kcmwifi.desktop</Filename>
+@@ -195,6 +195,16 @@
+ <Filename>kde-lanbrowser.desktop</Filename>
+ </Include>
+ </Menu>
++
++ <Menu>
++ <Name>Bluetooth</Name>
++ <Directory>kde-settings-bluetooth.directory</Directory>
++
++ <Include>
++ <Filename>kde-kcm_btpaired.desktop</Filename>
++ <Filename>kde-kcm_kbluetoothd.desktop</Filename>
++ </Include>
++ </Menu>
+
+ <Include>
+ <Category>X-KDE-settings-network</Category>
+@@ -213,6 +223,10 @@
+
+ <!-- This really should be in a Server version of KControl right -->
+ <Filename>kde-kcmsambaconf.desktop</Filename>
++
++ <!-- bluetooth -->
++ <Filename>kde-kcm_btpaired.desktop</Filename>
++ <Filename>kde-kcm_kbluetoothd.desktop</Filename>
+ </Exclude>
+ </Menu>
+
+@@ -247,7 +261,7 @@
+ <Menu>
+ <Name>Power</Name>
+ <!-- This is here because there is both desktop/laptop with power settings -->
+- <Directory>kde-settings-power.directory</Directory>
++ <Directory>kde-settings-laptops.directory</Directory>
+ <Include>
+ <Category>X-KDE-settings-power</Category>
+ <Filename>kde-laptop.desktop</Filename>
+@@ -278,6 +292,11 @@
+ <Filename>kde-linuz.desktop</Filename>
+ <!-- Moved to user account -->
+ <Filename>kde-desktoppath.desktop</Filename>
++
++ <!-- in hardware laptops and power -->
++ <Filename>kde-thinkpad.desktop</Filename>
++ <Filename>kde-kvaio.desktop</Filename>
++ <Filename>kde-k3bsetup2.desktop</Filename>
+ </Exclude>
+ </Menu>
+ </Menu>
Added: people/jriddell/systemsettings/debian/patches/kubuntu_03_no_kbuildsycoca.diff
===================================================================
--- people/jriddell/systemsettings/debian/patches/kubuntu_03_no_kbuildsycoca.diff 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/patches/kubuntu_03_no_kbuildsycoca.diff 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,10 @@
+--- systemsettings/systemsettings/menu/Makefile.am 2006-03-14 00:31:37.000000000 +0000
++++ systemsettings/systemsettings/menu/Makefile.am 2006-03-15 01:02:00.000000000 +0000
+@@ -16,5 +16,5 @@
+ kde-settings-networkconnections.directory \
+ system-settings.directory
+
+-install-data-local:
+- kbuildsycoca
++#install-data-local:
++# kbuildsycoca
Added: people/jriddell/systemsettings/debian/rules
===================================================================
--- people/jriddell/systemsettings/debian/rules 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/rules 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+cdbs_kde_enable_debug = --disable-debug
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+cleanbuilddir/kde-systemsettings::
+ rm -f systemsettings.1
+
+build/kde-systemsettings::
+ docbook2x-man debian/systemsettings.1.docbook
+
+install/kde-systemsettings::
+ # Kubuntu uses a moved XDG menu
+ mv debian/kde-systemsettings/etc/xdg/menus/applications-merged debian/kde-systemsettings/etc/xdg/menus/kde-applications-merged
+ # Don't clash files, just Use the ones from kcontrol
+ rm debian/kde-systemsettings/usr/share/desktop-directories/kde-settings-power.directory
+ rm debian/kde-systemsettings/usr/share/desktop-directories/kde-settings-system.directory
+ rm debian/kde-systemsettings/usr/share/applications/kde/kcmfontinst.desktop
+ cp debian/kde-settings-laptops.directory debian/kde-systemsettings/usr/share/desktop-directories/
+ cp debian/kde-settings-bluetooth.directory debian/kde-systemsettings/usr/share/desktop-directories/
+
+DEB_INSTALL_MANPAGES_kde-systemsettings = systemsettings.1
+
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) unsermake -C $(DEB_BUILDDIR) -p
Property changes on: people/jriddell/systemsettings/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: people/jriddell/systemsettings/debian/systemsettings.1.docbook
===================================================================
--- people/jriddell/systemsettings/debian/systemsettings.1.docbook 2006-05-02 00:44:01 UTC (rev 3675)
+++ people/jriddell/systemsettings/debian/systemsettings.1.docbook 2006-05-02 01:38:48 UTC (rev 3676)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+]>
+<refentry>
+ <refentryinfo>
+ <author>
+ <firstname>Jonathan</firstname>
+ <surname>Riddell</surname>
+ <email>jriddell at ubuntu.com</email>
+ </author>
+ <copyright>
+ <year>2005</year>
+ <holder>Jonathan Riddell</holder>
+ </copyright>
+ <!-- XXX IMPORTANT XXX -->
+ <!-- Keep this date up to date: -->
+ <date>2005-06-09</date>
+ <!-- ^^^^^^^^^^ -->
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>systemsettings</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>systemsettings</refname>
+ <refpurpose>KDE System Settings.</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>systemsettings</command>
+ <arg choice="opt">
+ <option><replaceable>Qt-options</replaceable></option>
+ </arg>
+ <arg choice="opt">
+ <option><replaceable>KDE-options</replaceable></option>
+ </arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ System Settings is a user friendly control centre for KDE.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+ <para>
+ All <productname>KDE</productname> and <productname>Qt</productname>
+ programs accept a some common command-line options.
+ </para>
+ <para>
+ <variablelist>
+ <title>Options:</title>
+ <varlistentry>
+ <term> <option>-e, --noembed</option> </term>
+ <listitem> <para>Do not embed windows</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--menu >argument<</option> </term>
+ <listitem> <para>XDG menu to use (default is systemsettings)</para> </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ <para>
+ <variablelist>
+ <title>Generic options:</title>
+ <varlistentry>
+ <term> <option>--help</option> </term>
+ <listitem> <para>Show help about options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-qt</option> </term>
+ <listitem> <para>Show Qt specific options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-kde</option> </term>
+ <listitem> <para>Show KDE specific options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-all</option> </term>
+ <listitem> <para>Show all options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--author</option> </term>
+ <listitem> <para>Show author information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>-v</option>, <option>--version</option> </term>
+ <listitem> <para>Show version information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--license</option> </term>
+ <listitem> <para>Show license information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--</option> </term>
+ <listitem> <para>Indicates end of options</para> </listitem>
+ </varlistentry>
+ </variablelist>
+ <!-- TODO * add all the rest of the options, but maybe find an automated
+ way to keep it up to date -->
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>COPYRIGHT</title>
+ <para>
+ This manual page was written by Jonathan Riddell
+ <email>jriddell at ubuntu.com</email> for
+ <productname>Kubuntu</productname> (but may be used by others).
+ Permission is granted to copy, distribute and/or modify this document
+ under either the terms of the <acronym>GNU</acronym> General Public License,
+ Version 2 or any later version published by the Free Software Foundation or
+ the <acronym>GNU</acronym> Free Documentation License 1.2 or any later version
+ published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in
+ <filename>/usr/share/common-licenses/GPL</filename>.
+ </para>
+ </refsect1>
+</refentry>
More information about the pkg-kde-commits
mailing list