[Python-apps-commits] r918 - in packages/screenlets/trunk/debian (10 files)

gilir-guest at users.alioth.debian.org gilir-guest at users.alioth.debian.org
Sun Apr 6 11:52:12 UTC 2008


    Date: Sunday, April 6, 2008 @ 11:52:10
  Author: gilir-guest
Revision: 918

* New upstream release

Modified:
  packages/screenlets/trunk/debian/changelog
  packages/screenlets/trunk/debian/control
  packages/screenlets/trunk/debian/copyright
  packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
  packages/screenlets/trunk/debian/rules
  packages/screenlets/trunk/debian/screenlets-doc.install
Deleted:
  packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch
  packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch
  packages/screenlets/trunk/debian/patches/05-clean-shebang.patch
  packages/screenlets/trunk/debian/patches/06-use-default-browser.patch

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/changelog	2008-04-06 11:52:10 UTC (rev 918)
@@ -1,3 +1,24 @@
+screenlets (0.1-1) UNREALESED; urgency=low
+
+  * New upstream release (Closes: #474510)
+  * debian/patches
+   - 02-Clean-Desktop.patch: removed, merged upstream.
+   - 03-fix-menu-icon.patch: removed, merged upstream.
+   - 05-clean-shebang.patch: removed, merged upstream.
+   - 06-use-default-browser.patch: removed, merged upstream.
+   - 01-scripts-cleanup.patch: Updated.
+  * debian/control
+   - Drop Build-Depends for the documentation.
+   - Add python-gnome2-extras and iceweasel as Recommends for Web Screenlets.
+  * debian/rules
+   - Don't build documentation, included upstream.
+   - Clean locale directory.
+   - Fix 755 mode for png files.
+  * debian/screenlets-doc.install
+   - Update location of the documentation.
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Wed, 02 Apr 2008 19:42:37 +0200
+
 screenlets (0.0.14-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/screenlets/trunk/debian/control
===================================================================
--- packages/screenlets/trunk/debian/control	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/control	2008-04-06 11:52:10 UTC (rev 918)
@@ -7,16 +7,7 @@
 		cdbs,
 		python-dev (>= 2.3.5-11)
 Build-Depends-Indep:	python-central (>= 0.6.0),
-			python-epydoc,
-			doc-base,
-			python-docutils,
-			python-gtk2,
-			python-gnome2,
-			python-gnome2-desktop,
- 			python-dbus,
-			python-xdg,
-			python-cairo,
-			python-gobject
+			doc-base
 Standards-Version: 3.7.3
 Homepage: http://screenlets.org
 XS-Python-Version: current
@@ -37,7 +28,9 @@
 		python-feedparser,
 		python-gmenu,
 		python-numeric,
-		python-chardet
+		python-chardet,
+		python-gnome2-extras,
+		iceweasel | firefox
 Suggests: 	metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2), 
 		python-dcop
 XB-Python-Version: ${python:Versions}

Modified: packages/screenlets/trunk/debian/copyright
===================================================================
--- packages/screenlets/trunk/debian/copyright	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/copyright	2008-04-06 11:52:10 UTC (rev 918)
@@ -126,6 +126,10 @@
 	src/share/screenlets/Sysmonitor/SysmonitorScreenlet.py
 	src/share/screenlets/Kclock/KclockScreenlet.py
 	src/share/screenlets-manager/KarambaScreenlet.py
+	src/share/screenlets-manager/WebappScreenlet.py
+	src/share/screenlets-manager/WidgetScreenlet.py
+	src/share/screenlets/RingSensors/RingSensorsScreenlet.py
+	src/share/screenlets/Youtube/YoutubeScreenlet.py
 
     Copyright (c) Vasek Potocek 2007 <vasek.potocek at post.cz> for 
 	src/share/screenlets/Convert/ConvertScreenlet.py
@@ -133,6 +137,9 @@
     Copyright (c) 2007 DeathCarrot <jsk105 at ecs.soton.ac.uk> for 
 	src/share/screenlets/VolumeControl/VolumeControlScreenlet.py 
 
+    Copyright  (c) Patrik Kullman 2007 <patrik at yes.nu> for
+	src/share/screenlets/Stocks/StocksScreenlet.py
+
     This package 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; version 3 dated June, 2007.

Modified: packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch	2008-04-06 11:52:10 UTC (rev 918)
@@ -1,68 +1,57 @@
 diff -ur screenlets.orig/bin/screenletsd screenlets/bin/screenletsd
---- screenlets.orig/bin/screenletsd	2008-03-27 21:31:15.000000000 +0100
-+++ screenlets/bin/screenletsd	2008-03-27 21:37:42.000000000 +0100
-@@ -1,18 +1,18 @@
--#!/bin/bash
-+#!/bin/sh
- 
+--- screenlets.orig/bin/screenletsd	2008-04-02 19:34:44.000000000 +0200
++++ screenlets/bin/screenletsd	2008-04-02 19:38:14.000000000 +0200
+@@ -12,10 +12,10 @@
  runDaemon()
  {
- if [ -z "`ps -f -C python | grep screenlets-daemon`" ]; then		#Check if Daemon is running
--	echo "Loading Daemon"		#Load Daemon
-+	printf "Loading Daemon"		#Load Daemon
- 	/usr/share/screenlets-manager/screenlets-daemon.py > /dev/null &
+ if [ -z "`ps -f -C python | grep screenlets-daemon`" ]; then            #Check if Daemon is running
+-        echo "Loading Daemon"           #Load Daemon
++        printf "Loading Daemon"           #Load Daemon
+         $PREFIX/share/screenlets-manager/screenlets-daemon.py > /dev/null &
  else
--	echo "Daemon is already running"
-+	printf "Daemon is already running"
+-        echo "Daemon is already running"
++        printf "Daemon is already running"
  fi
  }
  
- startgui()
- {
--exec /usr/share/screenlets-manager/screenlets-manager.py $@		#Load Gui
-+exec python -u /usr/share/screenlets-manager/screenlets-manager.py $@		#Load Gui
- }
- 
- findScreenlet()
-@@ -20,12 +20,12 @@
- screenlet="$1"
- 
- #find new screenlet
--if [ -e $HOME/.screenlets/$screenlet/`echo -en $screenlet`Screenlet.py ]; then 			#Check in /usr/share/screenlet
--	location="$HOME/.screenlets/$screenlet/`echo -en $screenlet`Screenlet.py"
--elif [ -e /usr/share/screenlets/$screenlet/`echo -en $screenlet`Screenlet.py ]; then 		#Check in ~/.screenlets
--	location="/usr/share/screenlets/$screenlet/`echo -en $screenlet`Screenlet.py"
-+if [ -e $HOME/.screenlets/$screenlet/`printf $screenlet`Screenlet.py ]; then 			#Check in /usr/share/screenlet
-+	location="$HOME/.screenlets/$screenlet/`printf $screenlet`Screenlet.py"
-+elif [ -e /usr/share/screenlets/$screenlet/`printf $screenlet`Screenlet.py ]; then 		#Check in ~/.screenlets
-+	location="/usr/share/screenlets/$screenlet/`printf $screenlet`Screenlet.py"
- else
+@@ -27,7 +27,7 @@
+             if [ -d $l/$d ]; then
+                 screenletpy="$l/$d/${d}Screenlet.py"
+                 if [ -e $screenletpy ]; then
+-                    echo -e $d
++                    printf $d
+                 fi
+             fi
+         done
+@@ -51,7 +51,7 @@
+     fi
+ done
+ if [ -z $location ]; then
 -    echo -e "There is no screenlet named $screenlet"
 +    printf "There is no screenlet named $screenlet"
      exit 1
  fi
  }
-@@ -33,12 +33,11 @@
+@@ -59,11 +59,11 @@
  auScreenlet()
  {
- AU_DIR="$HOME/.config/autostart"		#Autostart folder
--echo -e "[Desktop Entry]" > $AU_DIR/`echo -e $1`Screenlet.desktop		#Make a .desktop entry to autostart the screenlet
--echo -e "Name=`echo -e $1`Screenlet" >> $AU_DIR/`echo -e $1`Screenlet.desktop
--echo -e "Encoding=UTF-8" >> $AU_DIR/`echo -e $1`Screenlet.desktop
--echo -e "Version=1.0" >> $AU_DIR/`echo -e $1`Screenlet.desktop
--echo -e "Exec=$location > /dev/null" >> $AU_DIR/`echo -e $1`Screenlet.desktop
--echo -e "X-GNOME-Autostart-enabled=true" >> $AU_DIR/`echo -e $1`Screenlet.desktop
-+printf "[Desktop Entry]\n" > $AU_DIR/`printf $1`Screenlet.desktop		#Make a .desktop entry to autostart the screenlet
-+printf "Name=`printf $1`Screenlet\n" >> $AU_DIR/`printf $1`Screenlet.desktop
-+printf "Version=1.0\n" >> $AU_DIR/`printf $1`Screenlet.desktop
-+printf "Exec=python -u $location > /dev/null\n" >> $AU_DIR/`printf $1`Screenlet.desktop
-+printf "X-GNOME-Autostart-enabled=true\n" >> $AU_DIR/`printf $1`Screenlet.desktop
+ AU_DIR="$HOME/.config/autostart"                #Autostart folder
+-echo -e "[Desktop Entry]" > $AU_DIR/${1}Screenlet.desktop              #Make a .desktop entry to autostart the screenlet
+-echo -e "Name=${1}Screenlet" >> $AU_DIR/${1}Screenlet.desktop
+-echo -e "Version=1.0" >> $AU_DIR/${1}Screenlet.desktop
+-echo -e "Exec=python -u $location > /dev/null" >> $AU_DIR/${1}Screenlet.desktop
+-echo -e "X-GNOME-Autostart-enabled=true" >> $AU_DIR/${1}Screenlet.desktop
++printf "[Desktop Entry]\n" > $AU_DIR/${1}Screenlet.desktop              #Make a .desktop entry to autostart the screenlet
++printf "Name=${1}Screenlet\n" >> $AU_DIR/${1}Screenlet.desktop
++printf "Version=1.0\n" >> $AU_DIR/${1}Screenlet.desktop
++printf "Exec=python -u $location > /dev/null\n" >> $AU_DIR/${1}Screenlet.desktop
++printf "X-GNOME-Autostart-enabled=true\n" >> $AU_DIR/${1}Screenlet.desktop
  }
  
  runScreenlet()
-@@ -48,24 +47,24 @@
+@@ -73,30 +73,30 @@
  
- help_me()			#Help
+ help_me()                       #Help
  {
 -echo -e "  Options:"
 -echo -e "\t --gui \t\t\t Open up the Graphical Interface"
@@ -70,48 +59,38 @@
 -echo -e "  Cli Options (only use one at a time):"
 -echo -e "\t    run \t\t\t Run the Screenlet"
 -echo -e "\t    au \t\t\t Add the Screenlet to your autostart list"
+-echo -e "\t    list \t\t\t List all installed screenlets"
 +printf "  Options:\n"
 +printf "\t --gui \t\t\t Open up the Graphical Interface\n"
 +printf "\t --cli \t\t\t Use the Command Line interface\n"
 +printf "  Cli Options (only use one at a time):\n"
 +printf "\t    run \t\t\t Run the Screenlet\n"
 +printf "\t    au \t\t\t Add the Screenlet to your autostart list\n"
++printf "\t    list \t\t\t List all installed screenlets\n"
  }
  
--if [ x$1 == x"--gui" ]; then		#Decide what to do
-+if [ x$1 = x"--gui" ]; then		#Decide what to do
- 	runDaemon
- 	startgui $2 $3 $4 $5 $6 $7
- 	exit 0
+-if [ x$1 == x"--gui" ]; then            #Decide what to do
++if [ x$1 = x"--gui" ]; then            #Decide what to do
+         runDaemon
+-    MANAGER_OPTIONS=`echo $@ | sed -e s/$1//`
++    MANAGER_OPTIONS=`printf $@ | sed -e s/$1//`
+         startgui $MANAGER_OPTIONS
+         exit 0
 -elif [ x$1 == x"--cli" ]; then
--	if [ x$2 == x"run" ]; then
+-        if [ x$2 == x"run" ]; then
 +elif [ x$1 = x"--cli" ]; then
-+	if [ x$2 = x"run" ]; then
- 		findScreenlet $3
- 		runScreenlet
- 		exit 0
--	elif [ x$2 == x"au" ]; then
-+	elif [ x$2 = x"au" ]; then
- 		findScreenlet $3
- 		auScreenlet $3
- 		exit 0
++        if [ x$2 = x"run" ]; then
+                 findScreenlet $3
+                 runScreenlet
+                 exit 0
+-        elif [ x$2 == x"au" ]; then
++        elif [ x$2 = x"au" ]; then
+                 findScreenlet $3
+                 auScreenlet $3
+                 exit 0
+-    elif [ x$2 == x"list" ]; then
++    elif [ x$2 = x"list" ]; then
+         listScreenlets
+         exit 0
+         else
 Seulement dans screenlets/bin: screenletsd~
-diff -ur screenlets.orig/bin/screenlets-manager screenlets/bin/screenlets-manager
---- screenlets.orig/bin/screenlets-manager	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/bin/screenlets-manager	2008-02-28 23:10:22.000000000 +0100
-@@ -1,3 +1,3 @@
--#!/bin/bash
--python -u /usr/share/screenlets-manager/screenlets-manager.py
-+#!/bin/sh
-+exec python -u /usr/share/screenlets-manager/screenlets-manager.py
- 
-Seulement dans screenlets/bin: screenlets-manager~
-diff -ur screenlets.orig/bin/screenlets-packager screenlets/bin/screenlets-packager
---- screenlets.orig/bin/screenlets-packager	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/bin/screenlets-packager	2008-02-28 23:10:16.000000000 +0100
-@@ -1,2 +1,2 @@
--#!/bin/bash
--python -u /usr/share/screenlets-manager/screenlets-packager.py $@
-+#!/bin/sh
-+exec python -u /usr/share/screenlets-manager/screenlets-packager.py $@
-Seulement dans screenlets/bin: screenlets-packager~

Deleted: packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch	2008-04-06 11:52:10 UTC (rev 918)
@@ -1,165 +0,0 @@
-diff -ur screenlets.orig/desktop-menu/applications/ClockScreenlet.desktop screenlets/desktop-menu/applications/ClockScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/ClockScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/ClockScreenlet.desktop	2008-02-28 23:44:38.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Eine wunderschöne Bildschirm-Uhr mit Alarm-Funktion und wechselbaren Stilen.
- Comment[et]=Suurepärane kell erinevate teemade ja alarmidega.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Clock/icon.svg
--Exec=/usr/share/screenlets/Clock/ClockScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/Clock/ClockScreenlet.py > /dev/null
- StartupNotify=true
-Seulement dans screenlets/desktop-menu/applications: ClockScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/ControlScreenlet.desktop screenlets/desktop-menu/applications/ControlScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/ControlScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/ControlScreenlet.desktop	2008-02-28 23:44:52.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Ein einfacher Kontroll-Button zum Starten von Screenlets und anderen Anwendungen.
- Comment[et]=Lihtne kontrollnupp uute Screenlet vidinate lisamiseks ning muude programmide käivitamiseks.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Control/icon.svg
--Exec=/usr/share/screenlets/Control/ControlScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/Control/ControlScreenlet.py > /dev/null
- 
-Seulement dans screenlets/desktop-menu/applications: ControlScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/CPUMeterScreenlet.desktop screenlets/desktop-menu/applications/CPUMeterScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/CPUMeterScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/CPUMeterScreenlet.desktop	2008-02-28 23:45:06.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Ein CPU-Meter mit wechselbaren Stilen, das die aktuelle CPU-Auslastung anzeigt.
- Comment[et]=CPU-näidik, mis kuvab protsessori koormust.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/CPUMeter/icon.svg
--Exec=/usr/share/screenlets/CPUMeter/CPUMeterScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/CPUMeter/CPUMeterScreenlet.py > /dev/null
- 
-Seulement dans screenlets/desktop-menu/applications: CPUMeterScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/FlowerScreenlet.desktop screenlets/desktop-menu/applications/FlowerScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/FlowerScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/FlowerScreenlet.desktop	2008-02-28 23:45:17.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Eine wachsende Pflanze für Ihren Desktop, mit auswechselbaren Stilen.
- Comment[et]=Erinevate teemade abil kohandatav lill sinu töölauale.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Flower/icon.svg
--Exec=/usr/share/screenlets/Flower/FlowerScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/Flower/FlowerScreenlet.py > /dev/null
- 
-Seulement dans screenlets/desktop-menu/applications: FlowerScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/LauncherScreenlet.desktop screenlets/desktop-menu/applications/LauncherScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/LauncherScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/LauncherScreenlet.desktop	2008-02-28 23:45:26.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Ein Icon, das Anwendungen startet (wie ein Desktop-Icon).
- Comment[et]=Lihtne ikoon rakenduste käivitamiseks.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Launcher/icon.svg
--Exec=/usr/share/screenlets/Launcher/LauncherScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/Launcher/LauncherScreenlet.py > /dev/null
- 
-Seulement dans screenlets/desktop-menu/applications: LauncherScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/MailCheckScreenlet.desktop screenlets/desktop-menu/applications/MailCheckScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/MailCheckScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/MailCheckScreenlet.desktop	2008-02-28 23:45:38.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Ein Screenlet, das in bestimmten Zeitabständen einen Ort/Server nach neuen E-Mails durchsucht.
- Comment[et]=Screenlet vidin, mis kindla ajavahemiku järel kontrollib sinu e-posti kontot.  
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/MailCheck/icon.svg
--Exec=/usr/share/screenlets/MailCheck/MailCheckScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/MailCheck/MailCheckScreenlet.py > /dev/null
- 
-Seulement dans screenlets/desktop-menu/applications: MailCheckScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/NotesScreenlet.desktop screenlets/desktop-menu/applications/NotesScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/NotesScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/NotesScreenlet.desktop	2008-02-28 23:45:50.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Hilfreiche Klebezettel mit Transparenz und wechselbarem Aussehen.
- Comment[et]=Kasulik vidin märkmete tegemiseks.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Notes/icon.svg
--Exec=/usr/share/screenlets/Notes/NotesScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/Notes/NotesScreenlet.py > /dev/null
- StartupNotify=true
-Seulement dans screenlets/desktop-menu/applications: NotesScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/PicframeScreenlet.desktop screenlets/desktop-menu/applications/PicframeScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/PicframeScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/PicframeScreenlet.desktop	2008-02-28 23:45:59.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Ein Bilderrahmen zum Ausstellen Ihrer Bilder.
- Comment[et]=Screenlet vidin, mida saab kasutada oma fotode kuvamiseks töölaual.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Picframe/icon.svg
--Exec=/usr/share/screenlets/Picframe/PicframeScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/Picframe/PicframeScreenlet.py > /dev/null
- 
-Seulement dans screenlets/desktop-menu/applications: PicframeScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/RulerScreenlet.desktop screenlets/desktop-menu/applications/RulerScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/RulerScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/RulerScreenlet.desktop	2008-02-28 23:46:06.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Ein Bildschirm-Lineal mit wechselbaren Stilen. Zum Abmessen von Entfernungen am Bildschirm.
- Comment[et]=Teemadega kohandatav joonlaud mõõtmistöödeks ekraanil.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Ruler/icon.svg
- Exec=python -u /usr/share/screenlets/Ruler/RulerScreenlet.py > /dev/null
- StartupNotify=true
-Seulement dans screenlets/desktop-menu/applications: RulerScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/applications/WindowlistScreenlet.desktop screenlets/desktop-menu/applications/WindowlistScreenlet.desktop
---- screenlets.orig/desktop-menu/applications/WindowlistScreenlet.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/applications/WindowlistScreenlet.desktop	2008-02-28 23:46:18.000000000 +0100
-@@ -8,7 +8,6 @@
- Comment[de]=Eine Fensterliste, die Fenster-Icons auf transparentem Hintergund anzeigt.
- Comment[et]=Screenlet vidin, mis näitab kõiki su lahtiolevaid aknaid.
- MimeType=application/x-screenlet
--Encoding=UTF-8
- Icon=/usr/share/screenlets/Windowlist/icon.svg
--Exec=/usr/share/screenlets/Windowlist/WindowlistScreenlet.py > /dev/null
-+Exec=python -u /usr/share/screenlets/Windowlist/WindowlistScreenlet.py > /dev/null
- 
-Seulement dans screenlets/desktop-menu/applications: WindowlistScreenlet.desktop~
-diff -ur screenlets.orig/desktop-menu/screenlets-daemon.desktop screenlets/desktop-menu/screenlets-daemon.desktop
---- screenlets.orig/desktop-menu/screenlets-daemon.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/screenlets-daemon.desktop	2008-02-28 23:47:50.000000000 +0100
-@@ -1,8 +1,8 @@
- [Desktop Entry]
-+Type=Application
- Version=1.0
--Encoding=UTF-8
- Name=Screenlets Daemon
--Exec=/usr/share/screenlets-manager/screenlets-daemon.py
-+Exec=python -u /usr/share/screenlets-manager/screenlets-daemon.py
- X-GNOME-Autostart-enabled=true
- Name[de_DE]=Screenlets Daemon
- Name[et_EE]=Screenlets'i deemon
-Seulement dans screenlets/desktop-menu: screenlets-daemon.desktop~
-diff -ur screenlets.orig/desktop-menu/screenlets-manager.desktop screenlets/desktop-menu/screenlets-manager.desktop
---- screenlets.orig/desktop-menu/screenlets-manager.desktop	2008-02-08 03:46:21.000000000 +0100
-+++ screenlets/desktop-menu/screenlets-manager.desktop	2008-02-28 23:47:21.000000000 +0100
-@@ -1,14 +1,13 @@
- [Desktop Entry]
- Type=Application
--Categories=Settings;
-+Categories=Utility;
- Name=Screenlets
- Name[de]=Screenlets
- Name[et]=Screenlets
- Comment=A graphical tool to manage your Screenlets.
- Comment[de]=Ein grafisches Werkzeug, um Ihre Screenlets zu verwalten.
- Comment[et]=Graafiline tööriist Screenlets vidinate haldamiseks
--Encoding=UTF-8
- Icon=/usr/share/icons/screenlets.svg
--Exec=/usr/share/screenlets-manager/screenlets-manager.py > /dev/null
-+Exec=screenlets-manager > /dev/null
- StartupNotify=true
- 
-Seulement dans screenlets/desktop-menu: screenlets-manager.desktop~

Deleted: packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch	2008-04-06 11:52:10 UTC (rev 918)
@@ -1,24 +0,0 @@
-diff -ur screenlets.orig/src/share/screenlets/Gmail/menu.xml screenlets/src/share/screenlets/Gmail/menu.xml
---- screenlets.orig/src/share/screenlets/Gmail/menu.xml	2008-02-20 20:46:15.000000000 +0100
-+++ screenlets/src/share/screenlets/Gmail/menu.xml	2008-02-20 20:46:43.000000000 +0100
-@@ -21,6 +21,6 @@
- 	<!-- Uncomment to add Hide/show option to menu -->
- 	<!--<item label="Hide/Show" id="hide_show" />-->
- 	<!-- user definable actions here: -->
--	<imageitem label="Update"  id="update" />
-+	<item label="Update"  id="update" />
- 
- </menu>
-Seulement dans screenlets/src/share/screenlets/Gmail: menu.xml~
-diff -ur screenlets.orig/src/share/screenlets/MyIp/menu.xml screenlets/src/share/screenlets/MyIp/menu.xml
---- screenlets.orig/src/share/screenlets/MyIp/menu.xml	2008-02-20 20:46:16.000000000 +0100
-+++ screenlets/src/share/screenlets/MyIp/menu.xml	2008-02-20 20:53:11.000000000 +0100
-@@ -22,6 +22,6 @@
- 	<!--<item label="Hide/Show" id="hide_show" />-->
- 	<!-- user definable actions here: -->
- 	<!-- <imageitem label="radio name"  id="radio address SPACE radio name" />-->
--	<imageitem label="Update now"  id="update" />
-+	<item label="Update now"  id="update" />
- 	
- </menu>
-Seulement dans screenlets/src/share/screenlets/MyIp: menu.xml~

Deleted: packages/screenlets/trunk/debian/patches/05-clean-shebang.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/05-clean-shebang.patch	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/patches/05-clean-shebang.patch	2008-04-06 11:52:10 UTC (rev 918)
@@ -1,9 +0,0 @@
-diff -ur screenlets.orig/src/share/screenlets/Kclock/KclockScreenlet.py screenlets/src/share/screenlets/Kclock/KclockScreenlet.py
---- screenlets.orig/src/share/screenlets/Kclock/KclockScreenlet.py	2008-03-16 16:24:21.000000000 +0100
-+++ screenlets/src/share/screenlets/Kclock/KclockScreenlet.py	2008-03-16 19:02:07.000000000 +0100
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- 
- # This application is released under the GNU General Public License 
- # v3 (or, at your option, any later version). You can find the full 
-Seulement dans screenlets/src/share/screenlets/Kclock: KclockScreenlet.py~

Deleted: packages/screenlets/trunk/debian/patches/06-use-default-browser.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/06-use-default-browser.patch	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/patches/06-use-default-browser.patch	2008-04-06 11:52:10 UTC (rev 918)
@@ -1,22 +0,0 @@
-diff -ur screenlets.orig/src/share/screenlets-manager/screenlets-manager.py screenlets/src/share/screenlets-manager/screenlets-manager.py
---- screenlets.orig/src/share/screenlets-manager/screenlets-manager.py	2008-03-24 13:03:54.000000000 +0100
-+++ screenlets/src/share/screenlets-manager/screenlets-manager.py	2008-03-24 13:04:45.000000000 +0100
-@@ -961,7 +961,7 @@
- 		dlg.destroy()
- 		
- 	def website_open(self, d, link, data):
--		subprocess.Popen(["firefox", "http://www.screenlets.org"])
-+		subprocess.Popen(["xdg-open", "http://www.screenlets.org"])
- 
- 	def drag_data_received (self, widget, dc, x, y, sel_data, info, timestamp):
- 			
-@@ -1285,7 +1285,7 @@
- 			print "TODO: open website"
- 
- 		elif id == 'download':
--			subprocess.Popen(["firefox", screenlets.THIRD_PARTY_DOWNLOAD])
-+			subprocess.Popen(["xdg-open", screenlets.THIRD_PARTY_DOWNLOAD])
- 
- 	def handle_screenlet_registered (self, name):
- 		"""Callback for dbus-signal, called when a new screenlet gets 
-Seulement dans screenlets/src/share/screenlets-manager: screenlets-manager.py~

Modified: packages/screenlets/trunk/debian/rules
===================================================================
--- packages/screenlets/trunk/debian/rules	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/rules	2008-04-06 11:52:10 UTC (rev 918)
@@ -15,15 +15,18 @@
 DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG
 
 #Build docs in docs/html
-build/screenlets::
-	PYTHONPATH=build/lib/ epydoc --html --output=docs/html --name="Screenlets 0.0.14" screenlets screenlets.backend screenlets.options screenlets.utils screenlets.session screenlets.services screenlets.sensors
+#build/screenlets::
+#	PYTHONPATH=build/lib/ epydoc --html --output=docs/html --name="Screenlets 0.0.14" screenlets screenlets.backend screenlets.options screenlets.utils screenlets.session screenlets.services screenlets.sensors
 
 install/screenlets::
 	rm debian/tmp/usr/share/screenlets/ClearRss/feedparser.py
 
 binary-predeb/screenlets::
 	find debian/screenlets/usr/share/screenlets/MainMenu/ -name "*.conf" -perm 755 | xargs chmod 644
+	find debian/screenlets/usr/share/screenlets-manager/ -name "*.png" -perm 755 | xargs chmod 644
+	chmod 755 debian/screenlets/usr/share/screenlets/Radio/RadioScreenlet.py
 	rmdir debian/screenlets/usr/share/screenlets/Storage/themes/default
 
 clean::
-	rm -fR docs/html
+#	rm -fR docs/html
+	rm -fR build/locale

Modified: packages/screenlets/trunk/debian/screenlets-doc.install
===================================================================
--- packages/screenlets/trunk/debian/screenlets-doc.install	2008-04-06 05:44:44 UTC (rev 917)
+++ packages/screenlets/trunk/debian/screenlets-doc.install	2008-04-06 11:52:10 UTC (rev 918)
@@ -1 +1 @@
-/docs/html/*.html /usr/share/doc/screenlets/API
+/docs/epydoc/* /usr/share/doc/screenlets/API




More information about the Python-apps-commits mailing list