[Python-apps-commits] r1389 - in packages/screenlets/trunk/debian (12 files)
gilir-guest at users.alioth.debian.org
gilir-guest at users.alioth.debian.org
Thu Jun 5 21:53:28 UTC 2008
Date: Thursday, June 5, 2008 @ 21:53:26
Author: gilir-guest
Revision: 1389
* New upstream release
Added:
packages/screenlets/trunk/debian/screenlets-daemon.1
packages/screenlets/trunk/debian/screenlets.1
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/watch
Deleted:
packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch
packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch
packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch
packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch
Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/changelog 2008-06-05 21:53:26 UTC (rev 1389)
@@ -1,3 +1,24 @@
+screenlets (0.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/control
+ - Add python-imaging as Recommends for WallpaperClockScreenlet Screenlets.
+ * debian/patches
+ - 01-scripts-cleanup.patch : Update.
+ - Drop others patches, merged upstream.
+ * debian/rules
+ - Don't remove empty directory, fixed upstream.
+ - Install screenlets.1 and screenlets-daemon.1 man pages.
+ - Add a get-orig-source to repack the tarball.
+ * debian/copyright
+ - Update Authors and Copyright.
+ * debian/watch
+ - Update to upload bz2 tarball.
+ * Add screenlets.1 and screenlets-daemon.1 man pages.
+TODO :
+ - add a get-orig rule
+ -- Julien Lavergne <julien.lavergne at gmail.com> Wed, 04 Jun 2008 21:39:02 +0200
+
screenlets (0.1.1-2) unstable; urgency=low
* debian/patches
Modified: packages/screenlets/trunk/debian/control
===================================================================
--- packages/screenlets/trunk/debian/control 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/control 2008-06-05 21:53:26 UTC (rev 1389)
@@ -28,7 +28,8 @@
python-feedparser,
python-gmenu,
python-gnome2-extras,
- iceweasel | firefox
+ iceweasel | firefox,
+ python-imaging
Suggests: metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2),
python-dcop,
evolution,
Modified: packages/screenlets/trunk/debian/copyright
===================================================================
--- packages/screenlets/trunk/debian/copyright 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/copyright 2008-06-05 21:53:26 UTC (rev 1389)
@@ -6,7 +6,8 @@
Upstream Authors:
Rico Pfaus <ryx at ryxperience.com>.
- Helder Fraga.
+ Helder Fraga. <helder.fraga at hotmail.com>
+ Natan Yellin (Aantn) <aantny at gmail.com>
License for *.svg and *.png
@@ -18,7 +19,7 @@
include at the end for this file.
-Licence for src/share/screenlets/ClearCalendar/iCal.py,
+Licence for src/lib/plugins/iCal.py,
src/share/screenlets/ClearRSS/feedparser.py
Copyright (c) Jiva DeVoe <jiva at devoesquared.com>
@@ -29,10 +30,11 @@
License for src/share/screenlets/Gmail/pyDes.py,
- src/share/screenlets/NowPlaying/amazon/*
src/share/screenlets/MainMenuScreenlet.py
src/share/screenlets/Trash/TrashScreenlet.py
src/share/screenlets/Netmonitor/NetmonitorScreenlet.py
+ src/lib/plugins/AmazonCoverArtSearch.py
+ src/lib/plugins/Loader.py
Copyright (C) follower at myrealbox.com
Copyright (C) Todd Whiteman
@@ -78,7 +80,7 @@
Boston, MA 02110-1301 USA.
-Licence for NowPlaying/Players/*
+Licence for src/lib/plugins/mpdclient2.py
Copyright (C) 2005 - Nick Welch <mack at incise.org>.
This files are licenced under the Public Domain licence. See above for the
@@ -88,8 +90,11 @@
Copyright (C) 2007 Rico Pfaus <ryx at ryxperience.com> for
src/share/examples/*
- src/share/screenlets-manager/*
- src/lib/*
+ src/lib/backend.py
+ src/lib/menu.py
+ src/lib/options.py
+ src/lib/services.py
+ src/lib/session.py
src/share/screenlets/Clock/ClockScreenlet.py
src/share/screenlets/Control/ControlScreenlet.py
src/share/screenlets/CopyStack/CopyStackScreenle*.py
@@ -105,13 +110,11 @@
src/share/screenlets/Test/TestScreenlet.py
src/share/screenlets/Windowlist/WindowlistScreenlet.py
- Copyright (C) 2007 robgig1088 for src/share/screenlets/Calendar/CalendarScreenlet.py
-
Copyright (C) JMDK 2007 for src/share/screenlets/ACPI/ACPIBatteryScreenlet.py
Copyright (C) Cobra for src/share/screenlets/Calc/CalcScreenlet.py
- Copyright (C) Helder Fraga for
+ Copyright (C) Helder Fraga <helder.fraga at hotmail.com> for
src/share/screenlets/ClearCalendar/ClearCalendarScreenlet.py
src/share/screenlets/ClearRSS/ClearRssScreenlet.py
src/share/screenlets/ClearWeather/ClearWeatherScreenlet.py
@@ -142,9 +145,43 @@
src/share/screenlets/Sidebar/SidebarScreenlet.py
src/share/screenlets/Speech/SpeechScreenlet.py
src/share/screenlets/Tomboy/TomboyScreenlet.py
+ src/lib/sensors.py
+ src/lib/drawing.py
+ src/lib/install.py
+ src/share/screenlets/Calendar/CalendarScreenlet.py
+ src/lib/plugins/Amarok.py
+ src/lib/plugins/Audacious.py
+ src/lib/plugins/Banshee.py
+ src/lib/plugins/CoverSearch.py
+ src/lib/plugins/Evolution.py
+ src/lib/plugins/Exaile.py
+ src/lib/plugins/Flickr.py
+ src/lib/plugins/GenericPlayer.py
+ src/lib/plugins/Juk.py
+ src/lib/plugins/Kaffeine.py
+ src/lib/plugins/LastFMProxy.py
+ src/lib/plugins/Listen.py
+ src/lib/plugins/Mplayer.py
+ src/lib/plugins/Proxy.py
+ src/lib/plugins/Quodlibet.py
+ src/lib/plugins/Sonata.py
+ src/lib/plugins/Songbird.py
+ src/share/screenlets/Meter/MeterScreenlet.py
+ src/share/screenlets/Output/OutputScreenlet.py
+ Copyright (C) Helder Fraga <helder.fraga at hotmail.com> &
+ Rico Pfaus 2007 <ryx at ryxperience.com>
+ src/lib/__init__.py
+ src/lib/utils.py
+ src/share/screenlets-manager/screenlets-*.py
+
Copyright (c) Vasek Potocek 2007 <vasek.potocek at post.cz> for
src/share/screenlets/Convert/ConvertScreenlet.py
+ src/lib/plugins/BaseConverter.py
+ src/lib/plugins/Convert.py
+ src/lib/plugins/LenghtConverter.py
+ src/lib/plugins/SizeConverter.py
+ src/lib/plugins/TemperatureConvert.py
Copyright (c) 2007 DeathCarrot <jsk105 at ecs.soton.ac.uk> for
src/share/screenlets/VolumeControl/VolumeControlScreenlet.py
@@ -152,6 +189,9 @@
Copyright (c) Patrik Kullman 2007 <patrik at yes.nu> for
src/share/screenlets/Stocks/StocksScreenlet.py
+ Copyright (c) 2008 Pavel Panchekha <pavpanchekha at gmail.com> for
+ src/lib/plugins/keyring.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-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch 2008-06-05 21:53:26 UTC (rev 1389)
@@ -1,13 +1,13 @@
-diff -ur screenlets.orig/bin/screenletsd screenlets/bin/screenletsd
---- screenlets.orig/bin/screenletsd 2008-04-02 19:34:44.000000000 +0200
-+++ screenlets/bin/screenletsd 2008-04-02 19:38:14.000000000 +0200
+diff -ur screenlets.orig/src/bin/screenletsd screenlets/src/bin/screenletsd
+--- screenlets.orig/src/bin/screenletsd 2008-06-05 22:09:02.000000000 +0200
++++ screenlets/src/bin/screenletsd 2008-06-05 22:12:00.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This application is released under the GNU General Public License
# v3 (or, at your option, any later version). You can find the full
# text of the license under [url]http://www.gnu.org/licenses/gpl.txt[/url].
-@@ -12,10 +12,10 @@
+@@ -17,10 +17,10 @@
runDaemon()
{
if [ -z "`ps -f -C python | grep screenlets-daemon`" ]; then #Check if Daemon is running
@@ -20,7 +20,7 @@
fi
}
-@@ -27,7 +27,7 @@
+@@ -32,7 +32,7 @@
if [ -d $l/$d ]; then
screenletpy="$l/$d/${d}Screenlet.py"
if [ -e $screenletpy ]; then
@@ -29,7 +29,7 @@
fi
fi
done
-@@ -51,7 +51,7 @@
+@@ -56,7 +56,7 @@
fi
done
if [ -z $location ]; then
@@ -38,7 +38,7 @@
exit 1
fi
}
-@@ -59,11 +59,11 @@
+@@ -64,11 +64,11 @@
auScreenlet()
{
AU_DIR="$HOME/.config/autostart" #Autostart folder
@@ -47,15 +47,15 @@
-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
++printf "[Desktop Entry]" > $AU_DIR/${1}Screenlet.desktop #Make a .desktop entry to autostart the screenlet
++printf "Name=${1}Screenlet" >> $AU_DIR/${1}Screenlet.desktop
++printf "Version=1.0" >> $AU_DIR/${1}Screenlet.desktop
++printf "Exec=python -u $location > /dev/null" >> $AU_DIR/${1}Screenlet.desktop
++printf "X-GNOME-Autostart-enabled=true" >> $AU_DIR/${1}Screenlet.desktop
}
runScreenlet()
-@@ -73,30 +73,30 @@
+@@ -78,30 +78,30 @@
help_me() #Help
{
@@ -66,13 +66,13 @@
-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"
++printf " Options:"
++printf "\t --gui \t\t\t Open up the Graphical Interface"
++printf "\t --cli \t\t\t Use the Command Line interface"
++printf " Cli Options (only use one at a time):"
++printf "\t run \t\t\t Run the Screenlet"
++printf "\t au \t\t\t Add the Screenlet to your autostart list"
++printf "\t list \t\t\t List all installed screenlets"
}
-if [ x$1 == x"--gui" ]; then #Decide what to do
@@ -99,4 +99,4 @@
listScreenlets
exit 0
else
-Seulement dans screenlets/bin: screenletsd~
+Seulement dans screenlets/src/bin: screenletsd~
Deleted: packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch 2008-06-05 21:53:26 UTC (rev 1389)
@@ -1,32 +0,0 @@
-=== modified file 'src/share/screenlets/ClearRss/ClearRssScreenlet.py'
---- src/share/screenlets/ClearRss/ClearRssScreenlet.py 2008-04-26 17:52:49 +0000
-+++ src/share/screenlets/ClearRss/ClearRssScreenlet.py 2008-05-13 18:09:22 +0000
-@@ -17,18 +17,19 @@
- import sys
- import gtk
- import gobject
--from screenlets import DefaultMenuItem
-+from screenlets import DefaultMenuItem, utils
- from screenlets.options import IntOption, BoolOption, StringOption, FontOption, ColorOption, FloatOption
- import os
-+
-+is_manager = utils.is_manager_running_me()
- try:
- import feedparser
--except ImportError:
-- dialog = gtk.MessageDialog(buttons=gtk.BUTTONS_CLOSE)
-- dialog.set_markup("You don't have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.")
-- dialog.run()
-- dialog.destroy()
-- print("You don't have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.")
-- sys.exit()
-+except:
-+ if not is_manager:
-+ screenlets.show_message(None,'You don\'t have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.')
-+ sys.exit()
-+ else:
-+ print 'You don\'t have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.'
-
- class ClearRssScreenlet(screenlets.Screenlet):
- """Screenlet for reading RSS and Atom feeds , with the ability to scroll through all of the rss txt , ability to visit the rss news site"""
-
Deleted: packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch 2008-06-05 21:53:26 UTC (rev 1389)
@@ -1,17 +0,0 @@
---- /usr/share/pyshared/screenlets/__init__.py 2008-05-07 14:54:09.000000000 +0200
-+++ src/lib/__init__.py 2008-05-11 15:53:53.000000000 +0200
-@@ -1138,12 +1138,13 @@
- self.window.present()
-
-
-- # the keep above and keep bellow must be reset after the window is shown this is absolutly necessary
-+ # the is sticky, keep above and keep below must be reset after the window is shown this is absolutly necessary
- self.window.hide()
- self.window.move(self.x, self.y)
- self.window.present()
- self.has_started = True
- self.is_dragged = False
-+ self.is_sticky = self.is_sticky
- self.keep_above= self.keep_above
- self.keep_below= self.keep_below
- self.skip_taskbar = self.skip_taskbar
Deleted: packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch 2008-06-05 21:53:26 UTC (rev 1389)
@@ -1,43 +0,0 @@
-=== modified file 'src/share/screenlets/Clock/ClockScreenlet.py'
---- src/share/screenlets/Clock/ClockScreenlet.py 2008-05-16 12:36:59 +0000
-+++ src/share/screenlets/Clock/ClockScreenlet.py 2008-05-27 00:36:38 +0000
-@@ -33,7 +33,7 @@
- import math
- import cairo
- import pango
--from datetime import datetime
-+import datetime
- import gobject
- import os
- from os import environ
-@@ -94,7 +94,7 @@
- __timeout = None
- __buffer_back = None
- __buffer_fore = None
-- __time = datetime.now()
-+ __time = datetime.datetime.now()
- __alarm_running = False
- __alarm_state = 0
- __alarm_count = 0
-@@ -212,8 +212,9 @@
-
- def get_date (self):
- """Only needed for the service."""
-- self.__time = datetime.now()
-- return self.__time.strftime(self.date_format)
-+ self.__time = datetime.datetime.now()
-+ add_offset=datetime.timedelta(hours=self.time_offset)
-+ return (self.__time+add_offset).strftime(self.date_format)
-
- def get_time (self):
- """Only needed for the service."""
-@@ -321,7 +322,7 @@
- def update (self):
- """Update the time and redraw the canvas"""
- environ['TZ'] = self.timezone
-- self.__time = datetime.now()
-+ self.__time = datetime.datetime.now()
- if self.alarm_activated:
- self.check_alarm()
- if self.show_date:
-
Deleted: packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch 2008-06-05 21:53:26 UTC (rev 1389)
@@ -1,12 +0,0 @@
-=== modified file 'src/share/screenlets/ClearWeather/ClearWeatherScreenlet.py'
---- src/share/screenlets/ClearWeather/ClearWeatherScreenlet.py 2008-05-25 13:57:38 +0000
-+++ src/share/screenlets/ClearWeather/ClearWeatherScreenlet.py 2008-05-27 00:03:37 +0000
-@@ -13,7 +13,6 @@
- from urllib import urlopen
- import screenlets
- from screenlets.options import StringOption, BoolOption
--from Numeric import *
- import pygtk
- pygtk.require('2.0')
- import cairo
-
Modified: packages/screenlets/trunk/debian/rules
===================================================================
--- packages/screenlets/trunk/debian/rules 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/rules 2008-06-05 21:53:26 UTC (rev 1389)
@@ -11,7 +11,7 @@
DEB_PYTHON_PRIVATE_MODULES_DIRS := debian/tmp/usr/share/screenlets
DEB_PYTHON_SETUP_CMD := setup.py
-DEB_INSTALL_MANPAGES_screenlets := debian/screenlets-manager.1 debian/screenlets-packager.1 debian/screenletsd.1
+DEB_INSTALL_MANPAGES_screenlets := debian/screenlets-manager.1 debian/screenlets-packager.1 debian/screenletsd.1 debian/screenlets.1 debian/screenlets-daemon.1
DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG
#Build docs in docs/html
@@ -23,8 +23,16 @@
binary-predeb/screenlets::
find debian/screenlets/usr/share/screenlets-manager/ -name "*.png" -perm 755 | xargs chmod 644
- rmdir debian/screenlets/usr/share/screenlets/Storage/themes/default
clean::
# rm -fR docs/html
rm -fR build/locale
+
+get-orig-source:
+ dh_testdir
+ cd ..
+ uscan --force-download --verbose --destdir=../$(CURDIR)
+ version=$$(uscan --force-download --dehs | \
+ sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p') && \
+ bzcat ../screenlets-$${version}.tar.bz2 | gzip --best -c - > \
+ ../screenlets_$${version}.orig.tar.gz
Added: packages/screenlets/trunk/debian/screenlets-daemon.1
===================================================================
--- packages/screenlets/trunk/debian/screenlets-daemon.1 (rev 0)
+++ packages/screenlets/trunk/debian/screenlets-daemon.1 2008-06-05 21:53:26 UTC (rev 1389)
@@ -0,0 +1,16 @@
+.TH SCREENLETS-DAEMON 1 "June 5, 2008"
+
+.SH NAME
+screenlets-daemon \- An application to track activity of Screenlets
+
+.SH SYNOPSIS
+.B screenlets-daemon
+
+.SH DESCRIPTION
+/fBscreenlets-daemon\fP is a program which tracks Screenlets activity.
+
+.SH AUTHOR
+screenlets-manager was written by Rico Pfaus <ryx at ryxperience.com>.
+.PP
+This manual page was written by Julien Lavergne <julien.lavergne at gmail.com>,
+for the Debian project (but may be used by others).
Added: packages/screenlets/trunk/debian/screenlets.1
===================================================================
--- packages/screenlets/trunk/debian/screenlets.1 (rev 0)
+++ packages/screenlets/trunk/debian/screenlets.1 2008-06-05 21:53:26 UTC (rev 1389)
@@ -0,0 +1,17 @@
+.TH SCREENLETS 1 "June 5, 2008"
+
+.SH NAME
+screenlets \- Widget-like mini-applications for GNOME
+
+.SH SYNOPSIS
+.B screenlets
+
+.SH DESCRIPTION
+/fBscreenlets\fP Screenlets are small owner-drawn applications that can be described as "the virtual representation of things lying/standing around on your desk". Sticky notes, clocks, rulers, ....
+screenlets actually starts screenlets-manager, the GUI to manager all screenlets (see man screenlets-manager).
+
+.SH AUTHOR
+screenlets was written by Rico Pfaus <ryx at ryxperience.com>.
+.PP
+This manual page was written by Julien Lavergne <julien.lavergne at gmail.com>,
+for the Debian project (but may be used by others).
Modified: packages/screenlets/trunk/debian/watch
===================================================================
--- packages/screenlets/trunk/debian/watch 2008-06-05 08:58:38 UTC (rev 1388)
+++ packages/screenlets/trunk/debian/watch 2008-06-05 21:53:26 UTC (rev 1389)
@@ -1,2 +1,2 @@
version=3
-https://launchpad.net/screenlets/+download http://launchpad.net/screenlets/.*/screenlets-(.+).tar.gz
+https://launchpad.net/screenlets/+download http://launchpad.net/screenlets/.*/screenlets-(.+).tar.bz2
More information about the Python-apps-commits
mailing list