Merge lp:~soaringsky/plymouth-theme-ugr/universe into lp:plymouth-theme-ugr

Proposed by JC Hulce
Status: Merged
Approved by: JC Hulce
Approved revision: 22
Merged at revision: 20
Proposed branch: lp:~soaringsky/plymouth-theme-ugr/universe
Merge into: lp:plymouth-theme-ugr
Diff against target: 90 lines (+5/-52)
3 files modified
debian/changelog (+0/-50)
debian/control (+3/-2)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~soaringsky/plymouth-theme-ugr/universe
Reviewer Review Type Date Requested Status
JC Hulce (community) diffconfirm Approve
Review via email: mp+70838@code.launchpad.net

Commit message

 * Cleanups for universe

Description of the change

Cleanups for universe as described in blueprint: https://blueprints.launchpad.net/plymouth-theme-ugr/+spec/oneiric-universe

Under the accelerated sprint reviews, this only needs diffconfirm

To post a comment you must log in.
Revision history for this message
JC Hulce (soaringsky) :
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:51:16 +0000
4@@ -0,0 +1,5 @@
5+plymouth-theme-ugr (1.0.0) oneiric; urgency=low
6+
7+ * Initial release. (Closes: #823163)
8+
9+ -- JC Hulce <jc@teampr0xy.net> Tue, 09 Aug 2011 04:42:44 -0500
10
11=== removed file 'debian/changelog'
12--- debian/changelog 2011-06-17 21:19:19 +0000
13+++ debian/changelog 1970-01-01 00:00:00 +0000
14@@ -1,50 +0,0 @@
15-plymouth-theme-ugr (0.3.0.5) natty; urgency=low
16-
17- * Corrected update-alternatives in debian/plymouth-theme-ugr-text.postinst
18-
19- -- JC Hulce <jc@teampr0xy.net> Fri, 17 Jun 2011 16:18:28 -0500
20-
21-plymouth-theme-ugr (0.3.0.4) oneiric; urgency=low
22-
23- * Added ugr-text/ugr-text.plymouth.in
24-
25- -- JC Hulce <jc@teampr0xy.net> Fri, 17 Jun 2011 01:11:00 -0500
26-
27-plymouth-theme-ugr (0.3.0.3) oneiric; urgency=low
28-
29- * Corrected debian/ugr-text.install
30-
31- -- JC Hulce <jc@teampr0xy.net> Thu, 16 Jun 2011 20:22:38 -0500
32-
33-plymouth-theme-ugr (0.3.0.2) oneiric; urgency=low
34-
35- * Removed lib/plymouth/ugr-text.so from debian/ugr-text.install
36-
37- -- JC Hulce <jc@teampr0xy.net> Thu, 16 Jun 2011 12:53:03 -0500
38-
39-plymouth-theme-ugr (0.3.0.1) oneiric; urgency=low
40-
41- * Added ugr-text theme
42-
43- -- JC Hulce <jc@teampr0xy.net> Thu, 16 Jun 2011 03:39:06 -0500
44-
45-plymouth-theme-ugr (0.3.0) oneiric; urgency=low
46-
47- * Bumped standards-version to 3.9.2
48- * Changed ugr-logo update-alternatives priority to 151
49- * Changed ugr-super update-alternatives priority to 153
50-
51- -- JC Hulce <jc@teampr0xy.net> Wed, 15 Jun 2011 21:55:11 -0500
52-
53-plymouth-theme-ugr (0.1.2) natty; urgency=low
54-
55- * Changed update-alternatives priority to 101 for ugr-logo and 102 for ugr-super to override other themes.
56-
57- -- JC Hulce <jc@teampr0xy.net> Sun, 08 May 2011 19:11:50 -0500
58-
59-plymouth-theme-ugr (0.1.1) natty; urgency=low
60-
61- * Initial release with debian packaging.
62- * Merged ugr-logo and ugr-super together.
63-
64- -- JC Hulce <jc@teampr0xy.net> Sun, 08 May 2011 15:11:50 -0500
65
66=== modified file 'debian/control'
67--- debian/control 2011-06-16 08:40:16 +0000
68+++ debian/control 2011-08-09 09:51:16 +0000
69@@ -1,11 +1,12 @@
70 Source: plymouth-theme-ugr
71 Section: x11
72 Priority: optional
73-Maintainer: Team UGR <ubuntugnometeam@lists.launchpad.net>
74+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
75+XSBC-Original-Maintainer: Team UGR <ubuntugnometeam@lists.launchpad.net>
76 Build-Depends: debhelper (>= 7.0.50~)
77 Standards-Version: 3.9.2
78 Homepage: http://ugr.teampr0xy.net
79-Vcs-Bzr: lp:~ubuntugnometeam/plymouth-theme-ugr/ugr-super
80+Vcs-Bzr: lp:plymouth-theme-ugr
81 Vcs-Browser: http://bazaar.launchpad.net/~ubuntugnometeam/plymouth-theme-ugr/ugr-super/files
82
83 Package: plymouth-theme-ugr-super
84
85=== added file 'debian/watch'
86--- debian/watch 1970-01-01 00:00:00 +0000
87+++ debian/watch 2011-08-09 09:51:16 +0000
88@@ -0,0 +1,2 @@
89+#version=3
90+# This project does not publish source tarballs - It was built to be turned into an ubuntu package

Subscribers

People subscribed via source and target branches

to all changes: