Merge lp:~soaringsky/ugr-wallpapers/universe into lp:~pr0xybot/ugr-wallpapers/dev

Proposed by JC Hulce
Status: Merged
Approved by: JC Hulce
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~soaringsky/ugr-wallpapers/universe
Merge into: lp:~pr0xybot/ugr-wallpapers/dev
Diff against target: 74 lines (+2/-47)
2 files modified
debian/changelog (+0/-45)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~soaringsky/ugr-wallpapers/universe
Reviewer Review Type Date Requested Status
JC Hulce (community) diffconfirm Approve
Review via email: mp+70832@code.launchpad.net

Commit message

 * Clean and split changelog (LP: #823040)
 * Change maintainer (LP: #823043)

Description of the change

Final cleanups for universe. Fixes bugs in https://blueprints.launchpad.net/ugr-wallpapers/+spec/oneiric-universe

 * Clean and split changelog (LP: #823040)
 * Change maintainer (LP: #823043)

To post a comment you must log in.
Revision history for this message
JC Hulce (soaringsky) wrote :

Accelerated review for the sprint

review: Approve (diffconfirm)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/changelog'
2--- debian/changelog 1970-01-01 00:00:00 +0000
3+++ debian/changelog 2011-08-09 09:03:33 +0000
4@@ -0,0 +1,5 @@
5+ugr-wallpapers (1.0.0) oneiric; urgency=low
6+
7+ * Initial release. (LP: #823149)
8+
9+ -- JC Hulce <jc@teampr0xy.net> Tue, 09 Aug 2011 03:49:56 -0500
10
11=== removed file 'debian/changelog'
12--- debian/changelog 2011-08-07 00:38:09 +0000
13+++ debian/changelog 1970-01-01 00:00:00 +0000
14@@ -1,45 +0,0 @@
15-ugr-wallpapers (0.2.1) oneiric; urgency=low
16-
17- * Add debian/watch (LP: #798249)
18- * Updated translations
19-
20- -- JC Hulce <jc@teampr0xy.net> Sat, 06 Aug 2011 19:29:30 -0500
21-
22-ugr-wallpapers (0.2.0) oneiric; urgency=low
23-
24- * Bumped standards-version to 3.9.2
25- * cleaned up junk
26-
27- -- JC Hulce <jc@teampr0xy.net> Wed, 15 Jun 2011 21:31:19 -0500
28-
29-ugr-wallpapers (0.1.4) natty; urgency=low
30-
31- * Added debian/install file to fix missing wallpapers in build
32-
33- -- JC Hulce <jc@teampr0xy.net> Tue, 17 May 2011 23:48:26 -0500
34-
35-ugr-wallpapers (0.1.3) natty; urgency=low
36-
37- * fixed issues with debian/rules
38- * added po files, as they are required for gnome-wallpaper-properties generation
39-
40- -- JC Hulce <jc@teampr0xy.net> Tue, 17 May 2011 02:08:28 -0500
41-
42-ugr-wallpapers (0.1.2) natty; urgency=low
43-
44- * Fixed install location references, moved wallpapers to subfolder
45-
46- -- JC Hulce <jc@teampr0xy.net> Tue, 17 May 2011 01:28:19 -0500
47-
48-ugr-wallpapers (0.1.1) natty; urgency=low
49-
50- * Changed install location to /usr/share/backgrounds/ugr
51- * Removed old ubuntu translations
52-
53- -- JC Hulce <jc@teampr0xy.net> Tue, 17 May 2011 00:28:35 -0500
54-
55-ugr-wallpapers (0.1.0) natty; urgency=low
56-
57- * Initial release.
58-
59- -- JC Hulce <jc@teampr0xy.net> Wed, 11 May 2011 02:23:16 -0500
60
61=== modified file 'debian/control'
62--- debian/control 2011-06-16 02:32:40 +0000
63+++ debian/control 2011-08-09 09:03:33 +0000
64@@ -1,8 +1,8 @@
65 Source: ugr-wallpapers
66 Section: x11
67 Priority: optional
68-Maintainer: Team UGR <ubuntugnometeam@lists.launchpad.net>
69-XSBC-Original-Maintainer: JC Hulce <jc@teampr0xy.net>
70+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
71+XSBC-Original-Maintainer: Team UGR <ubuntugnometeam@lists.launchpad.net>
72 Vcs-Bzr: lp:ugr-wallpapers
73 Homepage: http://ugr.teampr0xy.net
74 Build-Depends: debhelper (>= 5), cdbs, python, python-central

Subscribers

People subscribed via source and target branches

to all changes: