diff -Nru wakeup-1.0/data/scripts/wakeup wakeup-1.1/data/scripts/wakeup --- wakeup-1.0/data/scripts/wakeup 2011-05-18 15:00:26.000000000 -0700 +++ wakeup-1.1/data/scripts/wakeup 2011-09-23 12:29:53.000000000 -0700 @@ -16,10 +16,16 @@ # start dbus (necessary for running alarm while not logged in) eval `eval "$dosudo dbus-launch --sh-syntax"` - + # set volume -eval "$(grep "volume" $home/.wakeup/wakeup_settings)" -/usr/bin/amixer set Master unmute $volume\% +# see http://ubuntuforums.org/showthread.php?t=1796713 +volume=$(grep -A 2 "volume" $home/.wakeup/alarm$2/wakeup_settings | grep "F" | sed 's/F//') +/usr/bin/amixer set Master $volume% unmute +/usr/bin/amixer set Master $volume% unmute +/usr/bin/amixer set Headphone unmute +/usr/bin/amixer set Speaker unmute +/usr/bin/amixer set PCM 100% unmute + # function to get pid of child processes function get_ids diff -Nru wakeup-1.0/data/wakeup/plugin_scripts/EvolutionData/read_evolution.py wakeup-1.1/data/wakeup/plugin_scripts/EvolutionData/read_evolution.py --- wakeup-1.0/data/wakeup/plugin_scripts/EvolutionData/read_evolution.py 2011-05-24 12:04:43.000000000 -0700 +++ wakeup-1.1/data/wakeup/plugin_scripts/EvolutionData/read_evolution.py 2011-10-16 10:46:25.000000000 -0700 @@ -70,16 +70,20 @@ if hasattr(parsedTd, "percent_complete") and parsedTd.percent_complete != "100": todo_list.append(parsedTd) -if "schedule" in to_output: - for ev in sorted(todays_events,key=lambda e: e.dtstart.value): - if not ev in all_day_events: - print ev.summary.value + u' at ' + ev.dtstart.value.strftime("%l:%M %p") - else: - print ev.summary.value - if not ev: - print "Nothing listed" -if "todo" in to_output: - for td in todo_list: - print td.summary.value - if not td: - print "Nothing listed" +for out in to_output: + if out == "schedule": + for ev in sorted(todays_events,key=lambda e: e.dtstart.value): + print ev.summary.value, + if not ev in all_day_events: + print u'at ' + ev.dtstart.value.strftime("%l:%M %p"), + if hasattr(ev, "location"): + print u'in ' + ev.location.value, + print ", ", + if not todays_events: + print "Nothing listed" + if out == "todo": + for td in todo_list: + print td.summary.value + u',', + if not todo_list: + print "Nothing listed" + print "" diff -Nru wakeup-1.0/data/wakeup/plugin_scripts/HebrewCalendar/check_hebcal.sh wakeup-1.1/data/wakeup/plugin_scripts/HebrewCalendar/check_hebcal.sh --- wakeup-1.0/data/wakeup/plugin_scripts/HebrewCalendar/check_hebcal.sh 2011-05-22 11:03:13.000000000 -0700 +++ wakeup-1.1/data/wakeup/plugin_scripts/HebrewCalendar/check_hebcal.sh 2011-10-16 10:46:25.000000000 -0700 @@ -20,6 +20,6 @@ # put longitude and latitude in deg,min format. Hebcal requires that longitude sign is switched lat=$(echo $lat | perl -ne '$lat = abs($_); $deg = int($lat); $min = int(60 * ($lat - $deg)); print "$deg,$min"') long=$(echo $long | perl -ne '$long = abs($_); $deg = int($long); $min = int(60 * ($long - $deg)); $deg *= -1 if not /-/; print "$deg,$min"') - echo $(hebcal -Toc -l $lat -L $long | sed /^[0-9].*/d); echo "" + echo $(hebcal -Toc -l $lat -L $long -z $(date +%:::z) | sed /^[0-9].*/d); echo "" fi done diff -Nru wakeup-1.0/data/wakeup/plugin_scripts/Weather/id_by_ip.sh wakeup-1.1/data/wakeup/plugin_scripts/Weather/id_by_ip.sh --- wakeup-1.0/data/wakeup/plugin_scripts/Weather/id_by_ip.sh 2011-05-23 10:45:15.000000000 -0700 +++ wakeup-1.1/data/wakeup/plugin_scripts/Weather/id_by_ip.sh 2011-09-23 08:34:07.000000000 -0700 @@ -15,7 +15,7 @@ # filter metar stations by country, or by state if in United States or Canada wget -q http://aviationweather.gov/adds/metars/stations.txt -O /tmp/metar_stations if [[ $countrycode == "US" || $countrycode == "CA" ]]; then - statecode=$(grep -A 2 "NEW JERSEY" /tmp/metar_stations | grep -P "US$|CA$" | grep -oP "^[A-Z]{2}") + statecode=$(grep -i -A 2 "$state" /tmp/metar_stations | grep -P "US$|CA$" | grep -oP "^[A-Z]{2}") grep "^$statecode" /tmp/metar_stations > /tmp/Stations else grep "$countrycode$" /tmp/metar_stations > /tmp/Stations diff -Nru wakeup-1.0/data/wakeup/wakeup.glade wakeup-1.1/data/wakeup/wakeup.glade --- wakeup-1.0/data/wakeup/wakeup.glade 2011-05-18 15:00:26.000000000 -0700 +++ wakeup-1.1/data/wakeup/wakeup.glade 2011-11-09 22:29:43.000000000 -0800 @@ -1453,7 +1453,7 @@ True 1 1 - <big><big><big><b>Wakeup 1.0.0</b></big></big></big> + <big><big><big><b>Wakeup 1.1</b></big></big></big> Copyright (c) David Glass 2011 &lt;dsglass@gmail.com&gt; diff -Nru wakeup-1.0/data/wakeup/wakeup.glade~ wakeup-1.1/data/wakeup/wakeup.glade~ --- wakeup-1.0/data/wakeup/wakeup.glade~ 1969-12-31 16:00:00.000000000 -0800 +++ wakeup-1.1/data/wakeup/wakeup.glade~ 2011-09-23 10:16:06.000000000 -0700 @@ -0,0 +1,1712 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Minute + + + Hour + + + Day + + + Week + + + Month + + + + + + + + + + + + + + + + + + + + + + + + + + + True + Wakeup Settings Configuration + center + 605 + 440 + appointment-new + + + + True + + + True + + + True + _File + True + + + True + + + gtk-new + True + True + True + + + + + + gtk-apply + True + True + True + + + + + + True + + + + + gtk-quit + True + True + True + + + + + + + + + + True + _Edit + True + + + True + + + gtk-preferences + True + True + True + + + + + + gtk-media-play + True + True + True + + + + + + gtk-remove + True + True + True + + + + + + + + + + True + _Help + True + + + True + + + True + _Usage + True + + + + + + gtk-about + True + True + True + + + + + + + + + + False + False + 0 + + + + + True + 7 + 5 + + + True + 3 + 6 + True + + + True + True + automatic + automatic + etched-in + + + True + True + liststore1 + False + False + 0 + + + + dataitems + + + + 0 + + + + + + + + + 2 + 3 + + + + + True + True + automatic + automatic + etched-in + + + True + True + immediate + word-char + 6 + 6 + textbuffer1 + + + + + 2 + + + + + 0 + + + + + True + True + + + + True + + + True + True + automatic + automatic + etched-in + + + True + True + liststore5 + False + 0 + + + Text + True + + + 7 + + + 0 + + + + + + + Time + 0.5 + + + + 1 + + + + + + + Recurrence + 0.5 + + + + 2 + + + + + + + Boot + 0.5 + + + + 3 + + + + + + + + + 0 + + + + + True + vertical + icons + False + + + True + Add alarm + toolbutton1 + True + gtk-add + + + + False + True + + + + + True + Remove alarm + toolbutton2 + True + gtk-remove + + + + False + True + + + + + False + False + end + 1 + + + + + + + True + Edit multiple alarms... + + + + + False + False + 1 + + + + + True + 5 + True + start + + + gtk-preferences + True + True + True + True + + + + False + False + 0 + True + + + + + gtk-media-play + True + True + True + True + + + + False + False + 1 + True + + + + + gtk-apply + True + True + True + True + + + + False + False + 2 + True + + + + + gtk-close + True + True + True + True + + + + False + False + 3 + True + + + + + gtk-help + True + True + True + True + + + + False + False + 4 + + + + + False + False + end + 2 + + + + + 1 + + + + + + + 5 + Plugins + mouse + 500 + 300 + appointment-new + dialog + + + + + True + True + + + True + 5 + + + True + 8 + + + True + + + True + 0.059999998658895493 + + + True + 12 + + + True + 6 + + + True + Time: + + + False + False + 0 + + + + + True + True + 2 + 0 + adjustment2 + 1 + + + False + False + 1 + + + + + True + : + + + False + False + 2 + + + + + True + True + 2 + 0 + adjustment3 + 1 + + + False + False + 3 + + + + + + + + + True + 0 + 0 + 6 + 6 + Alarm time + True + + + + + False + 0 + + + + + True + 0.070000000298023224 + + + True + 12 + + + True + False + True + + + True + + + Every: + True + True + False + True + True + + + + False + False + 0 + + + + + True + liststore3 + 1 + + + + + 0 + + + + + False + False + 1 + + + + + True + False + Day of month: + + + False + False + 2 + + + + + True + False + True + • + adjustment4 + + + False + False + 3 + + + + + 0 + + + + + True + + + Sun + True + False + True + False + True + + + 0 + + + + + Mon + True + False + True + False + True + + + 1 + + + + + Tue + True + False + True + False + True + + + 2 + + + + + Wed + True + False + True + False + True + + + 3 + + + + + Thu + True + False + True + False + True + + + 4 + + + + + Fri + True + False + True + False + True + + + 5 + + + + + Sat + True + False + True + False + True + + + 6 + + + + + 1 + + + + + True + + + Cron format (m h dom mon dow): + True + True + False + True + True + radiobutton1 + + + + 0 + + + + + True + False + True + • + + + 3 + 1 + + + + + 2 + + + + + + + + + Recurrs + True + True + False + True + + + + + + 1 + + + + + 3 + 0 + + + + + True + + + True + 3 + Volume + center + + + False + False + 0 + + + + + True + True + adjustment1 + True + 0 + + + 1 + + + + + False + 6 + 1 + + + + + 0 + + + + + True + + + Set computer to wake up for alarm (requires root permission) + True + True + False + True + True + + + 10 + 0 + + + + + 2 + + + + + True + 6 + + + gtk-ok + True + True + True + True + + + + False + False + end + 1 + + + + + gtk-cancel + True + True + True + True + + + + False + False + 4 + end + 0 + + + + + False + False + 6 + end + 1 + + + + + + + True + General + + + False + + + + + True + + + True + + + True + 0 + 9 + 5 + Choose voice (using festival speech tool): + + + False + False + 0 + + + + + True + True + automatic + automatic + etched-in + + + True + True + liststore4 + False + False + 0 + + + fixed + 1 + 0 + column + + + + + + + + 40 + column + + + + + + 1 + + + + + + + 400 + column + + + + 0 + + + + + + + + + 1 + + + + + True + + + Use other speech tool: + True + True + False + True + + + + False + False + 5 + 0 + + + + + True + False + True + • + + + 5 + 1 + + + + + False + False + 4 + 2 + + + + + 0 + + + + + True + 6 + + + gtk-ok + True + True + True + True + + + + False + False + end + 2 + + + + + More Voices... + True + True + True + none + http://ubuntuforums.org/showthread.php?t=751169 + + + False + False + end + 1 + + + + + gtk-cancel + True + True + True + True + + + + False + False + 4 + end + 0 + + + + + False + False + 6 + end + 1 + + + + + 1 + + + + + True + Voices + + + 1 + False + + + + + True + 4 + + + True + + + True + 9 + 5 + Available Plugins: + + + False + 0 + + + + + False + False + 0 + + + + + True + True + automatic + automatic + etched-in + + + True + True + liststore2 + False + 0 + + + + Active + 1 + + + + + + 2 + + + + + + + Plugin + True + + + + 0 + + + + + + + Description + True + + + + 1 + + + + + + + + + 1 + + + + + True + 6 + + + gtk-ok + True + True + True + True + + + + False + False + end + 2 + + + + + gtk-preferences + True + False + True + True + True + + + + False + False + end + 1 + + + + + gtk-cancel + True + True + True + True + + + + False + False + 4 + end + 0 + + + + + False + False + 6 + end + 2 + + + + + 2 + + + + + True + Plugins + + + 2 + False + True + + + + + + + 450 + 400 + GDK_KEY_PRESS_MASK | GDK_STRUCTURE_MASK + Help + False + mouse + True + appointment-new + dialog + window + + + + + True + True + + + True + 6 + + + True + True + automatic + automatic + + + True + queue + adjustment6 + + + True + 10 + <b>Alarm Text</b> +In the main text window, simply type the text that you want to have spoken when the alarm runs. +<b>Hot Text</b> +Available hot-text items are listed in the list at the right in the main window. These can be inserted into the text by double-clicking on them or simply typing them into your alarm text. A blank line signifies a new paragraph. Each paragraph's hot-text items are updated immediately before the text is spoken, so if you want the $time, for instance, to reflect the current time somewhere in the middle of your text, leave a blank line before the sentence in which it occurs. +<b>Note</b> that for hot-text items dependent on data from the web to work when not logged in (see Computer Wakeup below), you need to set the wireless network(s) you connect to so that they also connect before you log in. This can be done through NetworkManager, by selecting a connection, clicking "Edit..." and checking "Available to all users." +<b>Plugins</b> +Available plugins are listed in the "Plugins" tab under "Preferences." Each plugin adds hot-text items to the list in the main window. A plugin's hot-text items are only interpreted if the plugin is active. +<b>Alarm Settings</b> +The alarm time and recurrence settings can be set under the "General" tab of "Preferences." The volume of the alarm and preferences for all hot-text items can be set as well. +<b>Computer Wakeup</b> +In the general preferences, there is a default option to wake the computer for alarms. With this checked, your computer will be set to wake up - from shutdown if your computer allows - five minutes prior to the set alarm time. The alarm will run even if you are not logged in. Note that this option requires administrative (root) permission. +<b>Multiple Alarms</b> +Each alarm's settings are completely independent. Click "Edit multiple alarms..." to create and delete alarms. + True + fill + True + + + + + + + 0 + + + + + True + + + gtk-ok + True + True + True + True + + + + False + False + 3 + end + 0 + + + + + False + False + 3 + 1 + + + + + + + True + Usage + + + False + + + + + True + + + True + 1 + 1 + <big><big><big><b>Wakeup 1.0</b></big></big></big> + +Copyright (c) David Glass 2011 +&lt;dsglass@gmail.com&gt; + +Copyright is GPLv3 or later +(/usr/share/common-licenses/GPL-3) + True + center + + + 0 + + + + + True + + + gtk-ok + True + True + True + True + + + + False + False + 3 + end + 0 + + + + + False + False + 3 + 1 + + + + + 1 + + + + + True + About + + + 1 + False + + + + + + + Type your alarm text here, inserting hot text items from the list at the right as desired. For example: + +Good morning. Today is $date. The time is $time. It is $temperature outside with $skyconditions skies, $weatherconditions, and winds $windconditions. + +Note that hot text items are loaded at the beginning of each paragraph (a new paragraph is specified by leaving one or more blank lines). Hence the time is now $time, whereas in the previous paragraph it might have been a minute earlier. + + + 110 + 5 + 10 + 10 + + + 1 + 1 + 31 + 1 + 10 + + + 30 + 59 + 1 + 10 + + + 8 + 23 + 1 + 5 + + + 5 + Wakeup + True + center-on-parent + dialog + True + False + + + + True + immediate + 2 + + + True + label13 + True + center + + + 1 + + + + + True + center + + + gtk-ok + True + True + True + True + + + + False + False + 0 + + + + + False + end + 0 + + + + + + button13 + + + + 5 + Wakeup Introduction + center-on-parent + True + dialog + True + False + + + + True + 2 + + + True + + + True + 0 + 0 + Welcome to Wakeup! Wakeup is a talking alarm clock which will set your computer to wake itself up - from shutdown if your bios allows. +The alarm is spoken from the text in the text box on the left. A list of available data items, which allow the alarm to tell you useful information, is available from installed plugins in the list on the right. Simply type them into the alarm text or double click them. To set the alarm or plugin settings, click "Preferences." For more detailed instruction, click "Help." + +Note that for any part of the alarm which depends on information from the web to work when you are not logged in, you will need to set the wireless network(s) you connect to so that they connect before you log in. This can be done through NetworkManager, by selecting a connection, clicking "Edit..." and checking "Available to all users." + fill + True + 54 + + + + False + 0 + + + + + Always show this message at startup + True + True + False + True + True + + + False + False + 4 + 1 + + + + + 1 + + + + + True + end + + + gtk-ok + True + True + True + True + + + + False + False + 0 + + + + + False + end + 0 + + + + + + button16 + + + + Alarm Text +In the main text window, simply type the text that you want to have spoken when the alarm runs. +Hot Text +Available hot-text items are listed in the list at the right in the main window. These can be inserted into the text by double-clicking on them or simply typing them into your alarm text. A blank line signifies a new paragraph. Each paragraph's hot-text items are updated immediately before the text is spoken, so if you want the $time, for instance, to reflect the current time somewhere in the middle of your text, leave a blank line before the sentence in which it occurs. +Note that for hot-text items dependent on data from the web to work when not logged in (see Computer Wakeup below), you need to set the wireless network(s) you connect to so that they also connect before you log in. This can be done through NetworkManager, by selecting a connection, clicking "Edit..." and checking "Available to all users." +Plugins +Available plugins are listed in the "Plugins" tab under "Preferences." Each plugin adds hot-text items to the list in the main window. A plugin's hot-text items are only interpreted if the plugin is active. +Alarm Settings +The alarm time and recurrence settings can be set under the "General" tab of "Preferences." The volume of the alarm and preferences for all hot-text items can be set as well. +Computer Wakeup +In the general preferences, there is a default option to wake the computer for alarms. With this checked, your computer will be set to wake up - from shutdown if your computer allows - five minutes prior to the set alarm time. The alarm will run even if you are not logged in. Note that this option requires administrative (root) permission. + + + 100 + 1 + 10 + 10 + + diff -Nru wakeup-1.0/debian/changelog wakeup-1.1/debian/changelog --- wakeup-1.0/debian/changelog 2011-05-18 15:28:39.000000000 -0700 +++ wakeup-1.1/debian/changelog 2011-11-09 23:29:41.000000000 -0800 @@ -1,3 +1,16 @@ +wakeup (1.1-0ubuntu1) precise; urgency=low + + * Precise updates (LP: #876649) + * Fixed lack of time zone in hebcalevents location auto-detect + * Fixed schedule not outputting "Nothing listed" when no events + * Fixed reading only first item on schedule. + * Fixed mix-up of schedule and todo depending on which is called first. + * Added reading of event location. + * Removed hard-coding of New Jersey in determing metar ID by IP + * Fixed inability to set volume when previously muted by user + + -- David Glass Wed, 09 Nov 2011 22:26:14 -0800 + wakeup (1.0-0ubuntu1) oneiric; urgency=low * Initial release. (LP: #626381) diff -Nru wakeup-1.0/doc/setalarm.1 wakeup-1.1/doc/setalarm.1 --- wakeup-1.0/doc/setalarm.1 2011-05-18 15:02:08.000000000 -0700 +++ wakeup-1.1/doc/setalarm.1 2011-11-09 22:28:43.000000000 -0800 @@ -1,4 +1,4 @@ -.TH setalarm 1 "Version 1.0.0" "May 2011" +.TH setalarm 1 "Version 1.1" "Nov 2011" .SH NAME setalarm \- sets the system to start and run a script at specified times. diff -Nru wakeup-1.0/doc/setalarm.1~ wakeup-1.1/doc/setalarm.1~ --- wakeup-1.0/doc/setalarm.1~ 1969-12-31 16:00:00.000000000 -0800 +++ wakeup-1.1/doc/setalarm.1~ 2011-05-18 15:02:08.000000000 -0700 @@ -0,0 +1,72 @@ +.TH setalarm 1 "Version 1.0.0" "May 2011" +.SH NAME +setalarm +\- sets the system to start and run a script at specified times. +.SH SYNOPSIS +.B setalarm +[ \-p ] [ [h]h:mm ] [ \-o offset ] [ command ] + +.B setalarm +[ \-p ] [ \-c m h dom mon dow ] [ \-o offset ] [ command ] + +.B setalarm +[ \-p ] [ \-u utc ] [ \-o offset ] [ command ] + +.B setalarm +\-d +.SH DESCRIPTION +This should be run as root, unless using the +.B \-p +option. The time to wake the computer can be given in three possible formats. +The simplest is just a time, written hh:mm or h:mm. This time is +interpreted as the earliest time in the future when that time occurs. +If the +.B \-c +option is provided, a cron\-formatted recurrence (minute hour day_of_month month +day_of_week) may follow. Special times such as "@hourly" are not accepted. +With the +.B \-u +option, the time to wake the computer should be provided in UTC format. +.P +.B command +is run at the closest time in the future that matches the recurrence rules or at +the time specified using an exact hh:mm or UTC time. For this to occur, the +computer is woken up several minutes in advance to allow for boot time. By +default, this "offset" is 5 minutes, but can be changed with the +.B \-o +option, in which case the computer is woken up +.B offset +minutes in advance. To ensure that the computer will wake given the +.B \-c +option, crontab entries are made in root's crontab to rerun +.B setalarm +as necessary. +.P +With the +.B \-p +option, +.B setalarm +will not make any changes to the system wake time or to root's crontab. Instead, +.B +setalarm +just prints the time, in UTC, at which the computer would be set to wake up with +the given input. +.P +Given the +.B \-d +option, +.B setalarm +removes all alarms. +.SH "NOTES" +.B setalarm +was created for use with +\fBwakeup\fR, a fully customizable and extensible talking alarm clock. However, it is +generally usable as a convenient wrapper for setting the system wakeup (see +http://www.mythtv.org/wiki/ACPI_Wakeup for details about ACPI wakeup) +.SH "SEE ALSO" +\fBwakeup\fR(1), \fBwakeup\-settings\fR(1), \fBcron\fR, \fBcrontab\fR +.SH AUTHOR +The program and its documentation are copyrighted (c) 2011 by David Glass +. All rights reserved. They are distributed under the terms +of the GNU General Public License version 3 or later. + diff -Nru wakeup-1.0/doc/wakeup.1 wakeup-1.1/doc/wakeup.1 --- wakeup-1.0/doc/wakeup.1 2011-05-24 12:25:37.000000000 -0700 +++ wakeup-1.1/doc/wakeup.1 2011-11-09 22:28:49.000000000 -0800 @@ -1,4 +1,4 @@ -.TH wakeup 1 "Version 1.0.0" "May 2011" +.TH wakeup 1 "Version 1.1" "Nov 2011" .SH NAME wakeup \- A talking and fully customizable alarm clock diff -Nru wakeup-1.0/doc/wakeup.1~ wakeup-1.1/doc/wakeup.1~ --- wakeup-1.0/doc/wakeup.1~ 1969-12-31 16:00:00.000000000 -0800 +++ wakeup-1.1/doc/wakeup.1~ 2011-05-24 12:25:37.000000000 -0700 @@ -0,0 +1,42 @@ +.TH wakeup 1 "Version 1.0.0" "May 2011" +.SH NAME +wakeup +\- A talking and fully customizable alarm clock +.SH SYNOPSIS +.B wakeup +username alarmID +.SH DESCRIPTION +.B wakeup +plays an alarm for the given username, whose settings for the alarm can be +modified using the +.B wakeup\-settings +utility. The user's alarm that is run is specified by alarmID, which corresponds +to the folder number in the user's wakeup settings folder ~/.wakeup. Alarm text +and all associated options should be defined by running +.B wakeup\-settings +as +\fBusername\fR. Although it is possible to modify the settings directly by +editing the files in ~/.wakeup/, this is not recommended and make cause you to +lose alarm settings. +.P +An option in +.B wakeup\-settings +allows the alarm to wake the computer (from poweroff if the bios +allows). In this case, +.B wakeup +is set by +to run from root's cron, and the alarm will run in this case even if no user is +logged in. One must log in or be logged in to stop the alarm. +.P +Note that for any part of the alarm which depends on information from the web to +work when you are not logged in, you will need to set the wireless network(s) +you connect to so that they connect before you log in. This can be done through +NetworkManager, by selecting a connection, clicking "Edit..." and checking +"Available to all users." +.SH "SEE ALSO" +\fBsetalarm\fR(1), \fBwakeup\-settings\fR(1), \fBcron\fR, \fBcrontab\fR +.SH AUTHOR +The program and its documentation are copyrighted (c) 2011 by David Glass +. All rights reserved. They are distributed under the terms +of the GNU General Public License version 3 or later. + diff -Nru wakeup-1.0/doc/wakeup-settings.1 wakeup-1.1/doc/wakeup-settings.1 --- wakeup-1.0/doc/wakeup-settings.1 2011-05-18 15:02:01.000000000 -0700 +++ wakeup-1.1/doc/wakeup-settings.1 2011-11-09 22:28:57.000000000 -0800 @@ -1,4 +1,4 @@ -.TH wakeup\-settings 1 "Version 1.0.0" "May 2011" +.TH wakeup\-settings 1 "Version 1.1" "Nov 2011" .SH NAME wakeup\-settings \- GUI frontend to configure \fBwakeup\fR, a talking and fully customizable diff -Nru wakeup-1.0/doc/wakeup-settings.1~ wakeup-1.1/doc/wakeup-settings.1~ --- wakeup-1.0/doc/wakeup-settings.1~ 1969-12-31 16:00:00.000000000 -0800 +++ wakeup-1.1/doc/wakeup-settings.1~ 2011-05-18 15:02:01.000000000 -0700 @@ -0,0 +1,32 @@ +.TH wakeup\-settings 1 "Version 1.0.0" "May 2011" +.SH NAME +wakeup\-settings +\- GUI frontend to configure \fBwakeup\fR, a talking and fully customizable +alarm clock +.SH SYNOPSIS +.B wakeup\-settings +.SH DESCRIPTION +This runs a graphical setting in which to edit the alarms run by +.B wakeup. +The time, volume, plugin settings, etc. for all alarms can be set through this +GUI. Given the "set computer to wake up for alarm" option, +.B wakeup +is set by +.B wakeup\-settings +to run from root's cron, and the alarms will run in this case even if no user is +logged in. One must log in or be logged in to stop the alarm. +Settings only pertain to the user who is running +.B wakeup\-settings. +.P +Note that for any part of the alarm which depends on information from the web to +work when you are not logged in, you will need to set the wireless network(s) +you connect to so that they connect before you log in. This can be done through +NetworkManager, by selecting a connection, clicking "Edit..." and checking +"Available to all users." +.SH "SEE ALSO" +\fBsetalarm\fR(1), \fBwakeup\fR(1), \fBcron\fR, \fBcrontab\fR +.SH AUTHOR +The program and its documentation are copyrighted (c) 2011 by David Glass +. All rights reserved. They are distributed under the terms +of the GNU General Public License version 3 or later. +