Aisleriot

Merge lp:~noskcaj/aisleriot/3.14.2 into lp:~ubuntu-desktop/aisleriot/ubuntu

Proposed by Jackson Doak on 2014-11-15

Status:	Merged
Merged at revision:	14
Proposed branch:	lp:~noskcaj/aisleriot/3.14.2
Merge into:	lp:~ubuntu-desktop/aisleriot/ubuntu
Diff against target:	26 lines (+7/-1) 2 files modified debian/changelog (+6/-0) debian/control (+1/-1)
To merge this branch:	bzr merge lp:~noskcaj/aisleriot/3.14.2
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Desktop		2014-11-15	Pending
Review via email: mp+241885@code.launchpad.net

new upstream release

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/changelog'
2	--- debian/changelog 2014-10-26 20:43:03 +0000
3	+++ debian/changelog 2014-11-15 23:38:10 +0000
4	@@ -1,3 +1,9 @@
5	+aisleriot (1:3.14.2-0ubuntu1) vivid; urgency=medium
6	+
7	+ * New upstream release
8	+
9	+ -- Jackson Doak <noskcaj@ubuntu.com> Sun, 16 Nov 2014 09:16:29 +1100
10	+
11	aisleriot (1:3.14.1-1ubuntu1) vivid; urgency=medium
12
13	* Merge from debian (LP: #1385745). Remaining changes:
14
15	=== modified file 'debian/control'
16	--- debian/control 2014-10-26 20:43:03 +0000
17	+++ debian/control 2014-11-15 23:38:10 +0000
18	@@ -7,7 +7,7 @@
19	Priority: optional
20	Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
21	XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
22	-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Jordi Mallach <jordi@debian.org>, Michael Biebl <biebl@debian.org>
23	+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>
24	Build-Depends: cdbs,
25	debhelper (>= 8),
26	dh-autoreconf,