← Back to team overview

xubuntu-dev team mailing list archive

[Branch ~xubuntu-dev/xubuntu-default-settings/trunk] Rev 252: * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml:

 

------------------------------------------------------------
revno: 252
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Wed 2011-02-09 19:47:25 +0100
message:
  * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml:
    replace xfce4-orageclock-plugin by the simpler clock plugin from
    the panel; let it use the same exact time/date format as orageclock
    did, and set the hidden "command" property to launch orage when
    double-clicking on the time, to reproduce a feature of orageclock.
  * etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc: dropped,
    not needed anymore. Also handle its removal in maintainer scripts.
removed:
  etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc
modified:
  debian/changelog
  debian/postinst
  debian/postrm
  debian/preinst
  etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-08 20:22:03 +0000
+++ debian/changelog	2011-02-09 18:47:25 +0000
@@ -4,6 +4,13 @@
     usr/share/xubuntu/applications/Thunar.desktop: added (were previously
     in thunar); hide Bulk Rename from the menu (lp: #441278); display
     thunar in Accessories, not System.
+  * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml:
+    replace xfce4-orageclock-plugin by the simpler clock plugin from
+    the panel; let it use the same exact time/date format as orageclock
+    did, and set the hidden "command" property to launch orage when
+    double-clicking on the time, to reproduce a feature of orageclock.
+  * etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc: dropped,
+    not needed anymore. Also handle its removal in maintainer scripts.
 
  -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Tue, 08 Feb 2011 21:19:33 +0100
 

=== modified file 'debian/postinst'
--- debian/postinst	2011-01-26 22:05:56 +0000
+++ debian/postinst	2011-02-09 18:47:25 +0000
@@ -2,7 +2,7 @@
 
 set -e
 
-LASTVER="11.04.3"
+LASTVER="11.04.5"
 
 if dpkg-maintscript-helper supports rm_conffile; then
   dpkg-maintscript-helper rm_conffile \
@@ -35,6 +35,8 @@
     /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc "$LASTVER" -- "$@"
   dpkg-maintscript-helper rm_conffile \
     /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc "$LASTVER" -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc "$LASTVER" -- "$@"
 fi
 
 case "$1" in

=== modified file 'debian/postrm'
--- debian/postrm	2011-01-26 22:05:56 +0000
+++ debian/postrm	2011-02-09 18:47:25 +0000
@@ -2,7 +2,7 @@
 
 set -e
 
-LASTVER="11.04.3"
+LASTVER="11.04.5"
 
 if dpkg-maintscript-helper supports rm_conffile; then
   dpkg-maintscript-helper rm_conffile \
@@ -35,6 +35,8 @@
     /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc "$LASTVER" -- "$@"
   dpkg-maintscript-helper rm_conffile \
     /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc "$LASTVER" -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc "$LASTVER" -- "$@"
 fi
 
 case "$1" in

=== modified file 'debian/preinst'
--- debian/preinst	2011-01-26 22:05:56 +0000
+++ debian/preinst	2011-02-09 18:47:25 +0000
@@ -2,7 +2,7 @@
 
 set -e
 
-LASTVER="11.04.3"
+LASTVER="11.04.5"
 
 if dpkg-maintscript-helper supports rm_conffile; then
   dpkg-maintscript-helper rm_conffile \
@@ -35,6 +35,8 @@
     /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc "$LASTVER" -- "$@"
   dpkg-maintscript-helper rm_conffile \
     /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc "$LASTVER" -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc "$LASTVER" -- "$@"
 fi
 
 #DEBHELPER#

=== removed file 'etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc'
--- etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc	2011-01-26 22:05:56 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-show_frame=false
-fg_set=false
-bg_set=false
-timezone=
-width_set=false
-height_set=false
-data0=%a, %d %b  %H:%M
-font0=Droid Sans 10
-tooltip=%A %d %B %Y/%V
-hib_timing=false
-

=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml	2011-01-26 22:05:56 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml	2011-02-09 18:47:25 +0000
@@ -77,7 +77,11 @@
     <property name="plugin-6" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
     </property>
-    <property name="plugin-7" type="string" value="xfce4-orageclock-plugin"/>
+    <property name="plugin-7" type="string" value="clock">
+      <property name="digital-format" type="string" value="%a, %d %b  %H:%M"/>
+      <property name="tooltip-format" type="string" value="%A %d %B %Y/%V"/>
+      <property name="command" type="string" value="orage"/>
+    </property>
     <property name="plugin-8" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
     </property>