1
=== modified file 'debian/changelog'
2
--- debian/changelog	2016-07-28 02:27:13 +0000
3
+++ debian/changelog	2016-08-03 14:55:06 +0000
4
@@ -1,8 +1,8 @@
6
1
maas (2.0.0~rc4+bzr5180-0ubuntu1) UNRELEASED; urgency=medium
1
maas (2.1.0~alpha1+bzr5222-0ubuntu1) UNRELEASED; urgency=medium
7
2
2
8
3
  * UNRELEASED
3
  * UNRELEASED
9
4
4
11
5
 -- Andres Rodriguez <andreserl@ubuntu.com>  Wed, 27 Jul 2016 22:26:55 -0400
5
 -- Andres Rodriguez <andreserl@ubuntu.com>  Wed, 03 Aug 2016 10:51:50 -0400
12
6
6
13
7
maas (2.0.0~rc3+bzr5180-0ubuntu2) yakkety; urgency=medium
7
maas (2.0.0~rc3+bzr5180-0ubuntu2) yakkety; urgency=medium
14
8
8
15
9
9
16
=== modified file 'debian/rules'
17
--- debian/rules	2016-07-06 13:49:52 +0000
18
+++ debian/rules	2016-08-03 14:55:06 +0000
19
@@ -81,4 +81,4 @@
20
81
              | sed -rne 's,^Version: ([^-]+).*,\1,p')
81
              | sed -rne 's,^Version: ([^-]+).*,\1,p')
21
82
get-orig-source:
82
get-orig-source:
22
83
	bzr export -r $(REV) --root=maas-$(VER).orig \
83
	bzr export -r $(REV) --root=maas-$(VER).orig \
24
84
             maas_$(VER).orig.tar.gz lp:maas/2.0
84
             maas_$(VER).orig.tar.gz lp:maas
Status:	Merged
Approved by:	Andres Rodriguez on 2016-08-03
Approved revision:	510
Merged at revision:	510
Proposed branch:	lp:~andreserl/maas/2.1
Merge into:	lp:~maas-maintainers/maas/packaging
Diff against target:	24 lines (+3/-3) 2 files modified debian/changelog (+2/-2) debian/rules (+1/-1)
To merge this branch:	bzr merge lp:~andreserl/maas/2.1
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)			Approve on 2016-08-03
Review via email: mp+301916@code.launchpad.net
1	=== modified file 'debian/changelog'
2	--- debian/changelog 2016-07-28 02:27:13 +0000
3	+++ debian/changelog 2016-08-03 14:55:06 +0000
4	@@ -1,8 +1,8 @@
6	1	maas (2.0.0~rc4+bzr5180-0ubuntu1) UNRELEASED; urgency=medium	1	maas (2.1.0~alpha1+bzr5222-0ubuntu1) UNRELEASED; urgency=medium
7	2		2
8	3	* UNRELEASED	3	* UNRELEASED
9	4		4
11	5	-- Andres Rodriguez <andreserl@ubuntu.com> Wed, 27 Jul 2016 22:26:55 -0400	5	-- Andres Rodriguez <andreserl@ubuntu.com> Wed, 03 Aug 2016 10:51:50 -0400
12	6		6
13	7	maas (2.0.0~rc3+bzr5180-0ubuntu2) yakkety; urgency=medium	7	maas (2.0.0~rc3+bzr5180-0ubuntu2) yakkety; urgency=medium
14	8		8
15	9		9
16	=== modified file 'debian/rules'
17	--- debian/rules 2016-07-06 13:49:52 +0000
18	+++ debian/rules 2016-08-03 14:55:06 +0000
19	@@ -81,4 +81,4 @@
20	81	\| sed -rne 's,^Version: ([^-]+).*,\1,p')	81	\| sed -rne 's,^Version: ([^-]+).*,\1,p')
21	82	get-orig-source:	82	get-orig-source:
22	83	bzr export -r $(REV) --root=maas-$(VER).orig \	83	bzr export -r $(REV) --root=maas-$(VER).orig \
24	84	maas_$(VER).orig.tar.gz lp:maas/2.0	84	maas_$(VER).orig.tar.gz lp:maas