[Python-apps-commits] r896 - in packages/screenlets/trunk/debian (6 files)

gilir-guest at users.alioth.debian.org gilir-guest at users.alioth.debian.org
Tue Apr 1 17:17:31 UTC 2008 

    Date: Tuesday, April 1, 2008 @ 17:17:29
  Author: gilir-guest
Revision: 896

* Fix FTBFS with disable the documentation build (can be re-enable next 
release)
* Fix watch file
* Fix bashism

Modified:
  packages/screenlets/trunk/debian/changelog
  packages/screenlets/trunk/debian/control
  packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
  packages/screenlets/trunk/debian/patches/06-use-default-browser.patch
  packages/screenlets/trunk/debian/rules
  packages/screenlets/trunk/debian/watch

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-04-01 08:36:49 UTC (rev 895)
+++ packages/screenlets/trunk/debian/changelog	2008-04-01 17:17:29 UTC (rev 896)
@@ -5,17 +5,21 @@
   * debian/rules
    - Remove rmdir for usr/lib, fixed with python-central 0.6 (Closes: #472024)
    - Move rm for feedparser.py to install/screenlets.
-   - Bump version of the documentation.
+   - Disable documentation for this release to fix a FTBFS.
   * debian/patches
+   - 01-scripts-cleanup.patch: delete bashism (Closes: #472897)
    - 05-clean-shebang.patch: remove useless shebang.
    - 06-use-default-browser.patch: Use default browser instead of Firefox.
    - 04-fix-crash-acpi.patch: removed, merged upstream.
-   - 10-problem-on-create-tmpfile.patch: removed merged upstream.
+   - 10-problem-on-create-tmpfile.patch: removed, merged upstream.
   * debian/control
    - Bump python-central Build-Depends to >= 0.6
+   - Remove screenlets Build-Depends, only needed for the documentation.
    - Remove python-imaging as Recommends, SlideShow now doesn't use it.
   * debian/copyright
    - Update Copyright with new screenlets.
+  * debian/watch
+   - Switch to http, require by Launchpad.
 
  -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 16 Mar 2008 18:05:46 +0100
 

Modified: packages/screenlets/trunk/debian/control
===================================================================
--- packages/screenlets/trunk/debian/control	2008-04-01 08:36:49 UTC (rev 895)
+++ packages/screenlets/trunk/debian/control	2008-04-01 17:17:29 UTC (rev 896)
@@ -7,7 +7,6 @@
 		cdbs,
 		python-dev (>= 2.3.5-11)
 Build-Depends-Indep:	python-central (>= 0.6.0),
-			screenlets,
 			python-epydoc,
 			doc-base,
 			python-docutils

Modified: packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch	2008-04-01 08:36:49 UTC (rev 895)
+++ packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch	2008-04-01 17:17:29 UTC (rev 896)
@@ -1,13 +1,21 @@
 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 @@
+--- 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
  
  runDaemon()
  {
-@@ -12,7 +12,7 @@
+ 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 &
+ else
+-	echo "Daemon is already running"
++	printf "Daemon is already running"
+ fi
+ }
  
  startgui()
  {
@@ -16,17 +24,77 @@
  }
  
  findScreenlet()
-@@ -35,9 +35,8 @@
+@@ -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
+-    echo -e "There is no screenlet named $screenlet"
++    printf "There is no screenlet named $screenlet"
+     exit 1
+ fi
+ }
+@@ -33,12 +33,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 "[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 "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
+-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
  }
  
+ runScreenlet()
+@@ -48,24 +47,24 @@
+ 
+ help_me()			#Help
+ {
+-echo -e "  Options:"
+-echo -e "\t --gui \t\t\t Open up the Graphical Interface"
+-echo -e "\t --cli \t\t\t Use the Command Line interface"
+-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"
++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"
+ }
+ 
+-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
+-elif [ x$1 == x"--cli" ]; 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
 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

Modified: packages/screenlets/trunk/debian/patches/06-use-default-browser.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/06-use-default-browser.patch	2008-04-01 08:36:49 UTC (rev 895)
+++ packages/screenlets/trunk/debian/patches/06-use-default-browser.patch	2008-04-01 17:17:29 UTC (rev 896)
@@ -6,7 +6,7 @@
  		
  	def website_open(self, d, link, data):
 -		subprocess.Popen(["firefox", "http://www.screenlets.org"])
-+		subprocess.Popen(["gnome-open", "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):
  			
@@ -15,7 +15,7 @@
  
  		elif id == 'download':
 -			subprocess.Popen(["firefox", screenlets.THIRD_PARTY_DOWNLOAD])
-+			subprocess.Popen(["gnome-open", 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 

Modified: packages/screenlets/trunk/debian/rules
===================================================================
--- packages/screenlets/trunk/debian/rules	2008-04-01 08:36:49 UTC (rev 895)
+++ packages/screenlets/trunk/debian/rules	2008-04-01 17:17:29 UTC (rev 896)
@@ -16,10 +16,13 @@
 
 #Build docs in docs/html
 build/screenlets::
-	epydoc --html --output=docs/html --name="Screenlets 0.0.14" screenlets screenlets.backend screenlets.options screenlets.utils screenlets.session screenlets.services screenlets.sensors
+#	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
+	cd ..	
+	mkdir docs/html
+	touch docs/html/index.html
 
 binary-predeb/screenlets::
 	find debian/screenlets/usr/share/screenlets/MainMenu/ -name "*.conf" -perm 755 | xargs chmod 644

Modified: packages/screenlets/trunk/debian/watch
===================================================================
--- packages/screenlets/trunk/debian/watch	2008-04-01 08:36:49 UTC (rev 895)
+++ packages/screenlets/trunk/debian/watch	2008-04-01 17:17:29 UTC (rev 896)
@@ -1,2 +1,2 @@
 version=3
-https://launchpad.net/screenlets/+download https://launchpad.net/screenlets/.*/screenlets-(.+).tar.gz
+https://launchpad.net/screenlets/+download http://launchpad.net/screenlets/.*/screenlets-(.+).tar.gz

More information about the Python-apps-commits mailing list