AlarmClockProject

Merge lp:alarmclockproject into lp:alarmclockproject/stable

  1. trunk
  2. Merge into stable
Proposed by Mark Grant
Status: Merged
Approved by: Mark Grant
Approved revision: 15
Merged at revision: 13
Proposed branch: lp:alarmclockproject
Merge into: lp:alarmclockproject/stable
Diff against target: 148 lines (+24/-12)
6 files modified
ChangeLog (+3/-0)
NEWS (+3/-0)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+6/-0)
distobjects/manpages/AlarmClock.1 (+1/-1)
To merge this branch: bzr merge lp:alarmclockproject
Reviewer Review Type Date Requested Status
Mark Grant Approve
Review via email: mp+182920@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mark Grant (m-grant-prg) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-08-20 10:12:31 +0000
3+++ ChangeLog 2013-08-29 14:30:37 +0000
4@@ -1,3 +1,6 @@
5+2013-08-29 v 1.0.7 Mark Grant <m.grant.prg@gmail.com>
6+ * Release of new version 1.0.6 of AlarmClock.jar
7+
8 2013-08-20 v 1.0.6 Mark Grant <m.grant.prg@gmail.com>
9 * Release of new version 1.0.3 of AlarmClock script.
10 Name changed from AlarmClock.sh to AlarmClock.
11
12=== modified file 'NEWS'
13--- NEWS 2013-08-20 10:12:31 +0000
14+++ NEWS 2013-08-29 14:30:37 +0000
15@@ -1,3 +1,6 @@
16+Release 1.0.7 2013-08-29
17+Release of new version of AlarmClock.jar v 1.0.6.
18+
19 Release 1.0.6 2013-08-20
20 Release of new version 1.0.3 of AlarmClock script.
21 Name changed from AlarmClock.sh to AlarmClock.
22
23=== modified file 'configure'
24--- configure 2013-08-20 10:12:31 +0000
25+++ configure 2013-08-29 14:30:37 +0000
26@@ -1,6 +1,6 @@
27 #! /bin/sh
28 # Guess values for system-dependent variables and create Makefiles.
29-# Generated by GNU Autoconf 2.69 for AlarmClockUbuntuDist 1.0.6.
30+# Generated by GNU Autoconf 2.69 for AlarmClockUbuntuDist 1.0.7.
31 #
32 # Report bugs to <m.grant.prg@gmail.com>.
33 #
34@@ -579,8 +579,8 @@
35 # Identity of this package.
36 PACKAGE_NAME='AlarmClockUbuntuDist'
37 PACKAGE_TARNAME='alarmclockubuntudist'
38-PACKAGE_VERSION='1.0.6'
39-PACKAGE_STRING='AlarmClockUbuntuDist 1.0.6'
40+PACKAGE_VERSION='1.0.7'
41+PACKAGE_STRING='AlarmClockUbuntuDist 1.0.7'
42 PACKAGE_BUGREPORT='m.grant.prg@gmail.com'
43 PACKAGE_URL=''
44
45@@ -1196,7 +1196,7 @@
46 # Omit some internal or obsolete options to make the list less imposing.
47 # This message is too long to be a string in the A/UX 3.1 sh.
48 cat <<_ACEOF
49-\`configure' configures AlarmClockUbuntuDist 1.0.6 to adapt to many kinds of systems.
50+\`configure' configures AlarmClockUbuntuDist 1.0.7 to adapt to many kinds of systems.
51
52 Usage: $0 [OPTION]... [VAR=VALUE]...
53
54@@ -1263,7 +1263,7 @@
55
56 if test -n "$ac_init_help"; then
57 case $ac_init_help in
58- short | recursive ) echo "Configuration of AlarmClockUbuntuDist 1.0.6:";;
59+ short | recursive ) echo "Configuration of AlarmClockUbuntuDist 1.0.7:";;
60 esac
61 cat <<\_ACEOF
62
63@@ -1330,7 +1330,7 @@
64 test -n "$ac_init_help" && exit $ac_status
65 if $ac_init_version; then
66 cat <<\_ACEOF
67-AlarmClockUbuntuDist configure 1.0.6
68+AlarmClockUbuntuDist configure 1.0.7
69 generated by GNU Autoconf 2.69
70
71 Copyright (C) 2012 Free Software Foundation, Inc.
72@@ -1347,7 +1347,7 @@
73 This file contains any messages produced by compilers while
74 running configure, to aid debugging if configure makes a mistake.
75
76-It was created by AlarmClockUbuntuDist $as_me 1.0.6, which was
77+It was created by AlarmClockUbuntuDist $as_me 1.0.7, which was
78 generated by GNU Autoconf 2.69. Invocation command line was
79
80 $ $0 $@
81@@ -2163,7 +2163,7 @@
82
83 # Define the identity of the package.
84 PACKAGE='alarmclockubuntudist'
85- VERSION='1.0.6'
86+ VERSION='1.0.7'
87
88
89 cat >>confdefs.h <<_ACEOF
90@@ -2844,7 +2844,7 @@
91 # report actual input values of CONFIG_FILES etc. instead of their
92 # values after options handling.
93 ac_log="
94-This file was extended by AlarmClockUbuntuDist $as_me 1.0.6, which was
95+This file was extended by AlarmClockUbuntuDist $as_me 1.0.7, which was
96 generated by GNU Autoconf 2.69. Invocation command line was
97
98 CONFIG_FILES = $CONFIG_FILES
99@@ -2897,7 +2897,7 @@
100 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
101 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
102 ac_cs_version="\\
103-AlarmClockUbuntuDist config.status 1.0.6
104+AlarmClockUbuntuDist config.status 1.0.7
105 configured by $0, generated by GNU Autoconf 2.69,
106 with options \\"\$ac_cs_config\\"
107
108
109=== modified file 'configure.ac'
110--- configure.ac 2013-08-20 10:12:31 +0000
111+++ configure.ac 2013-08-29 14:30:37 +0000
112@@ -2,7 +2,7 @@
113 # Process this file with autoconf to produce a configure script.
114
115 AC_PREREQ([2.65])
116-AC_INIT([AlarmClockUbuntuDist], [1.0.6], [m.grant.prg@gmail.com])
117+AC_INIT([AlarmClockUbuntuDist], [1.0.7], [m.grant.prg@gmail.com])
118
119 AM_INIT_AUTOMAKE
120
121
122=== modified file 'debian/changelog'
123--- debian/changelog 2013-08-25 12:29:41 +0000
124+++ debian/changelog 2013-08-29 14:30:37 +0000
125@@ -1,3 +1,9 @@
126+alarmclock (1.0.7-0ubuntu1) raring; urgency=low
127+
128+ * New upstream release.
129+
130+ -- Mark Grant <mgrantprg@Poseidon> Thu, 29 Aug 2013 15:19:22 +0100
131+
132 alarmclock (1.0.6-0ubuntu1) raring; urgency=low
133
134 * New upstream release.
135
136=== modified file 'distobjects/manpages/AlarmClock.1'
137--- distobjects/manpages/AlarmClock.1 2013-08-20 10:12:31 +0000
138+++ distobjects/manpages/AlarmClock.1 2013-08-29 14:30:37 +0000
139@@ -1,5 +1,5 @@
140 .\"Text automatically generated by txt2man
141-.TH AlarmClock 1 "20 August 2013" "" "AlarmClock Script Manual"
142+.TH AlarmClock 1 "29 August 2013" "" "AlarmClock Script Manual"
143 .SH NAME
144 \fBAlarmClock \fP- Invoke AlarmClock application
145 .SH SYNOPSIS
146
147=== modified file 'distobjects/share/AlarmClock.jar'
148Binary files distobjects/share/AlarmClock.jar 2013-08-15 08:09:45 +0000 and distobjects/share/AlarmClock.jar 2013-08-29 14:30:37 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: