[Python-apps-commits] r726 - in packages/screenlets/trunk/debian (6 files)
gilir-guest at users.alioth.debian.org
gilir-guest at users.alioth.debian.org
Thu Feb 28 23:17:30 UTC 2008
Date: Thursday, February 28, 2008 @ 23:17:28
Author: gilir-guest
Revision: 726
* Adapt and reapply old patches
Added:
packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch
packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch
Modified:
packages/screenlets/trunk/debian/changelog
Deleted:
packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch
packages/screenlets/trunk/debian/patches/02-Fix-encoding-desktop-file.patch
Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog 2008-02-28 22:43:09 UTC (rev 725)
+++ packages/screenlets/trunk/debian/changelog 2008-02-28 23:17:28 UTC (rev 726)
@@ -35,10 +35,16 @@
- Rename links to screenlets.links.
* debian/patches
- Drop 09-delete-example-files.patch, handle by *.install files.
- - Drop previous patches, merge upstream.
- - 01-fix-menu-icon.patch : Fix "non icon" bug in contextual menu.
- - 02-Fix-encoding-desktop-file.patch : Delete encoding in screenlets-manager
- desktop file.
+ - Drop 01-Install-to-usr-directory.patch, merged upstream.
+ - Drop 04-Fix-python-heritage-empaty.patch, merged upsteam.
+ - Drop 05-Test-in-home-dir.patch, merged upsteam.
+ - Drop 06-Fix-error-type-pager-windowslist.patch, merged upstream.
+ - Drop 07-Add-python-to-autostart-files.patch, merged upstream.
+ - Drop 03-Clean-hashbang-shebang.patch: merged upstream.
+ - 01-scripts-cleanup.patch: Replace bash by sh, add exec and python in
+ some commands.
+ - 02-Clean-Desktop.patch: Updated.
+ - 03-fix-menu-icon.patch : Fix "non icon" bug in contextual menu.
* debian/watch
- Update to the new location of upstream tarball.
* Debian/README
Deleted: packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch 2008-02-28 22:43:09 UTC (rev 725)
+++ packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch 2008-02-28 23:17:28 UTC (rev 726)
@@ -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~
Added: packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch (rev 0)
+++ packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch 2008-02-28 23:17:28 UTC (rev 726)
@@ -0,0 +1,49 @@
+diff -ur screenlets.orig/bin/screenletsd screenlets/bin/screenletsd
+--- screenlets.orig/bin/screenletsd 2008-02-08 03:46:21.000000000 +0100
++++ screenlets/bin/screenletsd 2008-02-28 23:10:05.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ runDaemon()
+ {
+@@ -12,7 +12,7 @@
+
+ startgui()
+ {
+-exec /usr/share/screenlets-manager/screenlets-manager.py $@ #Load Gui
++exec python -u /usr/share/screenlets-manager/screenlets-manager.py $@ #Load Gui
+ }
+
+ findScreenlet()
+@@ -35,9 +35,8 @@
+ 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 "Exec=python -u $location > /dev/null" >> $AU_DIR/`echo -e $1`Screenlet.desktop
+ echo -e "X-GNOME-Autostart-enabled=true" >> $AU_DIR/`echo -e $1`Screenlet.desktop
+ }
+
+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~
Added: packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch (rev 0)
+++ packages/screenlets/trunk/debian/patches/02-Clean-Desktop.patch 2008-02-28 23:17:28 UTC (rev 726)
@@ -0,0 +1,165 @@
+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/02-Fix-encoding-desktop-file.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/02-Fix-encoding-desktop-file.patch 2008-02-28 22:43:09 UTC (rev 725)
+++ packages/screenlets/trunk/debian/patches/02-Fix-encoding-desktop-file.patch 2008-02-28 23:17:28 UTC (rev 726)
@@ -1,12 +0,0 @@
-diff -ur screenlets.orig/desktop-menu/screenlets-manager.desktop screenlets/desktop-menu/screenlets-manager.desktop
---- screenlets.orig/desktop-menu/screenlets-manager.desktop 2008-02-26 22:22:10.000000000 +0100
-+++ screenlets/desktop-menu/screenlets-manager.desktop 2008-02-26 22:25:46.000000000 +0100
-@@ -7,7 +7,6 @@
- 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
- StartupNotify=true
-Seulement dans screenlets/desktop-menu: screenlets-manager.desktop~
Added: packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch (rev 0)
+++ packages/screenlets/trunk/debian/patches/03-fix-menu-icon.patch 2008-02-28 23:17:28 UTC (rev 726)
@@ -0,0 +1,24 @@
+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~
More information about the Python-apps-commits
mailing list