Merge lp:~ari-tczew/gbrainy/ubuntu into lp:~ubuntu-desktop/gbrainy/ubuntu

Proposed by Artur Rona
Status: Merged
Merged at revision: 12
Proposed branch: lp:~ari-tczew/gbrainy/ubuntu
Merge into: lp:~ubuntu-desktop/gbrainy/ubuntu
Diff against target: 174 lines (+86/-9)
4 files modified
debian/changelog (+76/-0)
debian/control (+5/-5)
debian/copyright (+1/-1)
debian/patches/01_lpi.patch (+4/-3)
To merge this branch: bzr merge lp:~ari-tczew/gbrainy/ubuntu
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Robert Ancell Pending
Review via email: mp+45649@code.launchpad.net
To post a comment you must log in.
lp:~ari-tczew/gbrainy/ubuntu updated
12. By Robert Ancell

* Merge from debian unstable. Remaining changes: (LP: #700773)
  - debian/control:
    + Add Vcs-Bzr link related to Ubuntu Desktop Team.
    + Build-Depends on liblaunchpad-integration-cil-dev.
    + Build-Depends on dh-autoreconf, gnome-common for autotools.
  - debian/patches/01_lpi.patch: Add Launchpad integration.
  - debian/rules: Run autoreconf due to patch on configure.ac.
* New upstream release:
   - Added new games (7 logic, 1 calculation and 16 verbal analogies).
   - Added support for exporting to PDF.
   - Several bug fixes and improved internationalization support.
* New upstream release:
   - Bug fixes and translation updates.
* Drop debian/patches/fix-ca-translation, it's now included upstream.
* New upstream release:
  - Bug fixes and translation updates (LP: #572607, #622197, #565293).
* debian/control:
   - Mention verbal analogies in the long description.
   - Bump Standards-Version to 3.9.1.
* debian/source/format:
   - Switch to the 3.0 (quilt) source format.
* debian/rules:
   - Remove simple-patchsys.
* Add debian/patches/fix-ca-translation.
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Add Vcs-Bzr link
  - Build-depend on gnome-common for autotools
  - Build-depend on liblaunchpad-integration-cil-dev
* debian/rules:
  - Run autoreconf on build
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* New upstream release
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/rules:
  - Run autoreconf on build
* debian/control:
  - Add Vcs-Bzr link
  - Build-depend on gnome-common instead of autotools-dev

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-20 03:46:01 +0000
3+++ debian/changelog 2011-01-09 20:09:08 +0000
4@@ -1,3 +1,24 @@
5+gbrainy (1.60-1ubuntu1) natty; urgency=low
6+
7+ * Merge from debian unstable. Remaining changes: (LP: #700773)
8+ - debian/control:
9+ + Add Vcs-Bzr link related to Ubuntu Desktop Team.
10+ + Build-Depends on liblaunchpad-integration-cil-dev.
11+ + Build-Depends on dh-autoreconf, gnome-common for autotools.
12+ - debian/patches/01_lpi.patch: Add Launchpad integration.
13+ - debian/rules: Run autoreconf due to patch on configure.ac.
14+
15+ -- Artur Rona <ari-tczew@ubuntu.com> Sun, 09 Jan 2011 19:26:54 +0100
16+
17+gbrainy (1.60-1) unstable; urgency=low
18+
19+ * New upstream release:
20+ - Added new games (7 logic, 1 calculation and 16 verbal analogies).
21+ - Added support for exporting to PDF.
22+ - Several bug fixes and improved internationalization support.
23+
24+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Sun, 05 Dec 2010 13:49:40 +0100
25+
26 gbrainy (1.60-0ubuntu1) natty; urgency=low
27
28 * New upstream release
29@@ -10,12 +31,35 @@
30
31 -- Robert Ancell <robert.ancell@canonical.com> Mon, 20 Dec 2010 14:37:58 +1100
32
33+gbrainy (1.52-1) unstable; urgency=low
34+
35+ * New upstream release:
36+ - Bug fixes and translation updates.
37+ * Drop debian/patches/fix-ca-translation, it's now included upstream.
38+
39+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Sun, 05 Dec 2010 11:27:42 +0100
40+
41 gbrainy (1.52-0ubuntu1) natty; urgency=low
42
43 * New upstream release
44
45 -- Robert Ancell <robert.ancell@canonical.com> Thu, 04 Nov 2010 15:58:59 +1100
46
47+gbrainy (1.51-1) unstable; urgency=low
48+
49+ * New upstream release:
50+ - Bug fixes and translation updates (LP: #572607, #622197, #565293).
51+ * debian/control:
52+ - Mention verbal analogies in the long description.
53+ - Bump Standards-Version to 3.9.1.
54+ * debian/source/format:
55+ - Switch to the 3.0 (quilt) source format.
56+ * debian/rules:
57+ - Remove simple-patchsys.
58+ * Add debian/patches/fix-ca-translation.
59+
60+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Sat, 04 Sep 2010 19:53:28 +0200
61+
62 gbrainy (1.51-0ubuntu1) maverick; urgency=low
63
64 * New upstream release
65@@ -47,6 +91,20 @@
66
67 -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Tue, 03 Aug 2010 01:05:34 +0200
68
69+gbrainy (1.42-1ubuntu1) maverick; urgency=low
70+
71+ * Merge with Debian unstable, remaining Ubuntu changes:
72+ * debian/control:
73+ - Add Vcs-Bzr link
74+ - Build-depend on gnome-common for autotools
75+ - Build-depend on liblaunchpad-integration-cil-dev
76+ * debian/rules:
77+ - Run autoreconf on build
78+ * debian/patches/01_lpi.patch:
79+ - Add Launchpad integration
80+
81+ -- Robert Ancell <robert.ancell@canonical.com> Wed, 23 Jun 2010 16:32:19 +1000
82+
83 gbrainy (1.42-1) unstable; urgency=low
84
85 * New upstream release:
86@@ -56,6 +114,24 @@
87
88 -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Wed, 26 May 2010 19:12:35 +0200
89
90+gbrainy (1.42-0ubuntu1) maverick; urgency=low
91+
92+ * New upstream release
93+
94+ -- Robert Ancell <robert.ancell@canonical.com> Mon, 31 May 2010 21:50:20 +1000
95+
96+gbrainy (1.41-1ubuntu1) lucid; urgency=low
97+
98+ * debian/patches/01_lpi.patch:
99+ - Add Launchpad integration
100+ * debian/rules:
101+ - Run autoreconf on build
102+ * debian/control:
103+ - Add Vcs-Bzr link
104+ - Build-depend on gnome-common instead of autotools-dev
105+
106+ -- Robert Ancell <robert.ancell@canonical.com> Tue, 13 Apr 2010 09:25:13 +0800
107+
108 gbrainy (1.41-1) unstable; urgency=low
109
110 * New upstream release:
111
112=== modified file 'debian/control'
113--- debian/control 2010-12-20 03:46:01 +0000
114+++ debian/control 2011-01-09 20:09:08 +0000
115@@ -1,14 +1,11 @@
116 Source: gbrainy
117 Section: games
118 Priority: optional
119-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
120-XSBC-Original-Maintainer: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
121+Maintainer: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
122 Homepage: http://live.gnome.org/gbrainy
123 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gbrainy/ubuntu
124 Build-Depends: cdbs (>= 0.4.49),
125 debhelper (>= 5.0.37.1),
126- dh-autoreconf,
127- gnome-common,
128 autotools-dev,
129 cli-common-dev (>= 0.4.4),
130 intltool (>= 0.35),
131@@ -20,7 +17,9 @@
132 mono-devel (>= 2.4.3),
133 gnome-doc-utils,
134 mono-csharp-shell,
135- liblaunchpad-integration-cil-dev
136+ liblaunchpad-integration-cil-dev,
137+ dh-autoreconf,
138+ gnome-common
139 Standards-Version: 3.9.1
140
141 Package: gbrainy
142@@ -42,3 +41,4 @@
143 to prove your mental calculation skills.
144 * Memory Trainers: games designed to challenge your short term
145 memory.
146+ * Verbal Analogies: games that challenge your verbal aptitude.
147
148=== modified file 'debian/copyright'
149--- debian/copyright 2010-06-23 06:32:40 +0000
150+++ debian/copyright 2011-01-09 20:09:08 +0000
151@@ -40,7 +40,7 @@
152 On Debian systems, the complete text of the GNU General Public
153 License can be found in /usr/share/common-licenses/GPL.
154
155-The Debian packaging is © 2007-2009, Siegfried-A. Gevatter <rainct@ubuntu.com>
156+The Debian packaging is © 2007-2010, Siegfried-A. Gevatter <rainct@ubuntu.com>
157 and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
158
159
160
161=== modified file 'debian/patches/01_lpi.patch'
162--- debian/patches/01_lpi.patch 2010-12-20 03:46:01 +0000
163+++ debian/patches/01_lpi.patch 2011-01-09 20:09:08 +0000
164@@ -1,6 +1,7 @@
165-## Description: add some description
166-## Origin/Author: add some origin or author
167-## Bug: bug URL
168+Description: Add Launchpad integration.
169+Author: Robert Ancell <robert.ancell@canonical.com>
170+Last-Update: 2010-12-20
171+
172 Index: gbrainy-1.60/configure.ac
173 ===================================================================
174 --- gbrainy-1.60.orig/configure.ac 2010-12-12 00:27:04.000000000 +1100

Subscribers

People subscribed via source and target branches

to all changes: