r14492 - in /packages/unstable/gdesklets-data/debian: NEWS.Debian changelog dirs install_desklet rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Mon Feb 11 17:13:02 UTC 2008
Author: lool
Date: Mon Feb 11 17:13:02 2008
New Revision: 14492
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14492
Log:
Cleanups.
Modified:
packages/unstable/gdesklets-data/debian/NEWS.Debian
packages/unstable/gdesklets-data/debian/changelog
packages/unstable/gdesklets-data/debian/dirs
packages/unstable/gdesklets-data/debian/install_desklet
packages/unstable/gdesklets-data/debian/rules
Modified: packages/unstable/gdesklets-data/debian/NEWS.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets-data/debian/NEWS.Debian?rev=14492&op=diff
==============================================================================
--- packages/unstable/gdesklets-data/debian/NEWS.Debian (original)
+++ packages/unstable/gdesklets-data/debian/NEWS.Debian Mon Feb 11 17:13:02 2008
@@ -11,7 +11,7 @@
- LT Disk - LT Memory - LT Processor
- LT Xmmsb - Sysinfo
- -- Clément Stenac <zorglub at via.ecp.fr> Sat, 23 Jul 2005 11:41:40 +0200
+ -- Clément Stenac <zorglub at via.ecp.fr> Sat, 23 Jul 2005 11:41:40 +0200
gdesklets-data (0.30) unstable; urgency=low
Modified: packages/unstable/gdesklets-data/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets-data/debian/changelog?rev=14492&op=diff
==============================================================================
--- packages/unstable/gdesklets-data/debian/changelog (original)
+++ packages/unstable/gdesklets-data/debian/changelog Mon Feb 11 17:13:02 2008
@@ -1,6 +1,7 @@
gdesklets-data (0.35.6-2) UNRELEASED; urgency=low
* Wrap build-deps and deps.
+ * Cleanups.
-- Loic Minier <lool at dooz.org> Mon, 11 Feb 2008 18:04:44 +0100
Modified: packages/unstable/gdesklets-data/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets-data/debian/dirs?rev=14492&op=diff
==============================================================================
--- packages/unstable/gdesklets-data/debian/dirs (original)
+++ packages/unstable/gdesklets-data/debian/dirs Mon Feb 11 17:13:02 2008
@@ -9,7 +9,7 @@
/usr/share/gdesklets/Displays/bugzilla
/usr/share/gdesklets/Displays/calendar
/usr/share/gdesklets/Displays/circlebuttonbar
-/usr/share/gdesklets/Displays/clock-desklet
+/usr/share/gdesklets/Displays/clock-desklet
/usr/share/gdesklets/Displays/countdown
/usr/share/gdesklets/Displays/disk
/usr/share/gdesklets/Displays/diskio
@@ -70,8 +70,8 @@
/usr/share/gdesklets/Displays/sidecandy-rss
/usr/share/gdesklets/Displays/sidecandy-weather
/usr/share/gdesklets/Displays/stockinfo
-/usr/share/gdesklets/Displays/starterbar-desklet
-/usr/share/gdesklets/Displays/sysinfo-desklet
+/usr/share/gdesklets/Displays/starterbar-desklet
+/usr/share/gdesklets/Displays/sysinfo-desklet
/usr/share/gdesklets/Displays/sytadin
/usr/share/gdesklets/Displays/temperature
/usr/share/gdesklets/Displays/todo
Modified: packages/unstable/gdesklets-data/debian/install_desklet
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets-data/debian/install_desklet?rev=14492&op=diff
==============================================================================
--- packages/unstable/gdesklets-data/debian/install_desklet (original)
+++ packages/unstable/gdesklets-data/debian/install_desklet Mon Feb 11 17:13:02 2008
@@ -1,9 +1,9 @@
-#! /bin/sh
+#!/bin/sh
set -e
set -x
-echo $PWD
+pwd
USE_GFX=$1
USE_SENSOR=$2
@@ -12,22 +12,19 @@
DST_FOLDER=$5
DISPLAY_FOLDER=$6
-if [ "x"$6 = "x" ]
-then
+if [ "x$DISPLAY_FOLDER" = "x" ]; then
DISPLAY_FOLDER=$SRC_FOLDER
fi
-$SRC_FOLDER/$BIN_PKG --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
+$SRC_FOLDER/$BIN_PKG --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
-# Copy only displays or folder too ?
-if [ "x"$7 = "x" ]
-then
+# Copy only displays or folder too?
+if [ "x"$7 = "x" ]; then
cp -f $DISPLAY_FOLDER/*.display debian/gdesklets-data/usr/share/gdesklets/Displays/$DST_FOLDER
else
cp -af $DISPLAY_FOLDER/* debian/gdesklets-data/usr/share/gdesklets/Displays/$DST_FOLDER
-fi
+fi
# Copy GFX ?
-if test $USE_GFX = 1
-then
+if test $USE_GFX = 1; then
cp -af $DISPLAY_FOLDER/gfx debian/gdesklets-data/usr/share/gdesklets/Displays/$DST_FOLDER/gfx
fi
Modified: packages/unstable/gdesklets-data/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets-data/debian/rules?rev=14492&op=diff
==============================================================================
--- packages/unstable/gdesklets-data/debian/rules (original)
+++ packages/unstable/gdesklets-data/debian/rules Mon Feb 11 17:13:02 2008
@@ -1,10 +1,7 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
build:
# Nothing to do.
@@ -14,15 +11,13 @@
dh_testroot
dh_clean
-install: build
+install: build
dh_testdir
dh_testroot
dh_clean -k
dh_install
-
mkdir -p debian/gdesklets-data/usr/share/gdesklets/Sensors
dh_installdirs
-
# ACPI
/bin/sh debian/install_desklet 1 1 Install_ACPI_Sensor.bin acpi-desklet-0.1 acpi-desklet
# Battery
@@ -38,10 +33,10 @@
cp -af psi/psi-displays-v0.2/border* debian/gdesklets-data/usr/share/gdesklets/Displays/borders/
# Boxmail
cp -af boxmail-0.50.0/controls/* debian/gdesklets-data/usr/share/gdesklets/Controls/
- cp -af boxmail-0.50.0/gfx debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
- cp -f boxmail-0.50.0/*display debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
- cp -f boxmail-0.50.0/*script debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
- cp -f boxmail-0.50.0/*png debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
+ cp -af boxmail-0.50.0/gfx debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
+ cp -f boxmail-0.50.0/*display debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
+ cp -f boxmail-0.50.0/*script debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
+ cp -f boxmail-0.50.0/*png debian/gdesklets-data/usr/share/gdesklets/Displays/boxmail-desklet/
# PSI Theme
psi/Theme-0.1.1/Install_Theme_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
cp -af psi/Themes debian/gdesklets-data/usr/share/gdesklets/Themes
@@ -63,7 +58,7 @@
# Clock - Old is still needed to provide sensor for others
/bin/sh debian/install_desklet 1 1 Install_Clock_Sensor.bin clock-desklet-0.32 clock-desklet
cp -af clock-desklet-0.50/* debian/gdesklets-data/usr/share/gdesklets/Displays/clock-desklet
- # CLock2
+ # Clock2
cp -af clock2 debian/gdesklets-data/usr/share/gdesklets/Displays
# External interval - dependency for several displays
ExternalInterval-0.1.4/Install_ExternalInterval_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
@@ -73,13 +68,13 @@
cp -f Countdown2/*display debian/gdesklets-data/usr/share/gdesklets/Displays/countdown
cp -f Countdown2/*script debian/gdesklets-data/usr/share/gdesklets/Displays/countdown
# Deskaquote
-# deskquote-1.2/Install_DeskQuote_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
-# cp -af desktao-3.0 debian/gdesklets-data/usr/share/gdesklets/Displays/desktao
+ #deskquote-1.2/Install_DeskQuote_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
+ #cp -af desktao-3.0 debian/gdesklets-data/usr/share/gdesklets/Displays/desktao
# Dinocam
- cp -af DinoCam-1.0/ debian/gdesklets-data/usr/share/gdesklets/Displays/
+ cp -af DinoCam-1.0/ debian/gdesklets-data/usr/share/gdesklets/Displays/
# PSi disk
-# psi/Disk-0.2.0/Install_Disk_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
-# cp -af psi/psi-displays-v0.2/diskinfo.display debian/gdesklets-data/usr/share/gdesklets/Displays/disk/
+ #psi/Disk-0.2.0/Install_Disk_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
+ #cp -af psi/psi-displays-v0.2/diskinfo.display debian/gdesklets-data/usr/share/gdesklets/Displays/disk/
# Diskio
/bin/sh debian/install_desklet 0 1 Install_DiskIo_Sensor.bin DiskIo diskio
# Diskmount
@@ -157,9 +152,9 @@
# Infodomesticbar
cp -af InfodomesticsBar debian/gdesklets-data/usr/share/gdesklets/Displays/infodomesticsbar
# IRC
-# /bin/sh debian/install_desklet 1 1 Install_irc_Sensor.bin irc irc
-# rm -f debian/gdesklets-data/usr/share/gdesklets/Sensors/irc/COPYING
-# chmod 644 debian/gdesklets-data/usr/share/gdesklets/Sensors/irc/__init__.py
+ #/bin/sh debian/install_desklet 1 1 Install_irc_Sensor.bin irc irc
+ #rm -f debian/gdesklets-data/usr/share/gdesklets/Sensors/irc/COPYING
+ #chmod 644 debian/gdesklets-data/usr/share/gdesklets/Sensors/irc/__init__.py
# Lmsensors
lmsensors/Install_lmsensors_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
cp -af lmsensors/Displays/lmsensors debian/gdesklets-data/usr/share/gdesklets/Displays/lmsensors
@@ -215,7 +210,7 @@
psi-small/sensors/Install_Battery2_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
psi-small/sensors/Install_CPUTemp_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
psi-small/sensors/Install_GoodTime_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
- psi-small/sensors/Install_Mixer_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
+ psi-small/sensors/Install_Mixer_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
psi-small/sensors/Install_SpeedfreqMon_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
cp -f psi-small/border*display debian/gdesklets-data/usr/share/gdesklets/Displays/psi-small/
cp -f psi-small/battery*display debian/gdesklets-data/usr/share/gdesklets/Displays/psi-small/
@@ -286,7 +281,7 @@
cp -f SideCandy-HDDTemp/*display debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-hddtemp
cp -f SideCandy-HDDTemp/*script debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-hddtemp
cp -af SideCandy-HDDTemp/gfx debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-hddtemp
- # SC Uptime
+ # SC Uptime
cp -f SideCandy-Uptime/*display debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-uptime
cp -f SideCandy-Uptime/*script debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-uptime
cp -af SideCandy-Uptime/gfx debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-uptime
@@ -312,13 +307,12 @@
cp -af SideCandyRSS/gfx debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-rss
cp -f SideCandyRSS/sc_rss.display debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-rss
cp -f SideCandyRSS/*script debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-rss
- cp -af NewsGrab debian/gdesklets-data/usr/share/gdesklets/Controls/
+ cp -af NewsGrab debian/gdesklets-data/usr/share/gdesklets/Controls/
# SC Weather
cp -af SC-Weather-0.3/SC-Weather/* debian/gdesklets-data/usr/share/gdesklets/Displays/sidecandy-weather
cp -af SC-Weather-0.3/controls/YahooWeather debian/gdesklets-data/usr/share/gdesklets/Controls/
-
# Starterbar
- /bin/sh debian/install_desklet 1 1 Install_StarterBar_Sensor.bin starterbar-desklet-0.31.3 starterbar-desklet
+ /bin/sh debian/install_desklet 1 1 Install_StarterBar_Sensor.bin starterbar-desklet-0.31.3 starterbar-desklet
cp -f starterbar-desklet-0.31.3/README debian/gdesklets-data/usr/share/gdesklets/Displays/starterbar-desklet
# StickyNotes
cp -af StickyNotes debian/gdesklets-data/usr/share/gdesklets/Displays/stickynotes
@@ -341,7 +335,7 @@
# Variable border
psi/VariableBorder-0.1.4/Install_VariableBorder_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
cp -af psi/psi-displays-v0.2/variable* debian/gdesklets-data/usr/share/gdesklets/Displays/variable-border/
- # Weather
+ # Weather
/bin/sh debian/install_desklet 1 1 Install_Weather_Sensor.bin weather-desklet-0.26 weather-desklet
# Weekly calendar
cp -af weeklycalendar debian/gdesklets-data/usr/share/gdesklets/Displays/weeklycalendar
@@ -356,23 +350,18 @@
# XMLQuotes
xmlquotes/Install_XMLQuotes_Sensor.bin --nomsg debian/gdesklets-data/usr/share/gdesklets/Sensors
cp -af xmlquotes/deskquotes debian/gdesklets-data/usr/share/gdesklets/Displays/xml-quotes
-
-#clean
+ # clean
mkdir -p debian/gdesklets-data/usr/share/gdesklets/Displays/others
cp -af others-desklets-0.1/debian-cow.display debian/gdesklets-data/usr/share/gdesklets/Displays/others
-
rm -f debian/gdesklets-data/usr/share/gdesklets/Sensors/Clock/locale/install_locales.py
rm -f debian/gdesklets-data/usr/share/gdesklets/Sensors/Weather/locale/install_locales.py
-# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
+
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs
dh_installdocs
dh_pysupport usr/share/gdesklets
dh_python usr/share/gdesklets/
More information about the pkg-gnome-commits
mailing list