Ubuntu
cobbler package

Merge lp:~ubuntu-branches/ubuntu/oneiric/cobbler/oneiric-201108111912 into lp:ubuntu/oneiric/cobbler

  1. Oneiric (11.10)
  2. oneiric-201108111912
  3. Merge into oneiric
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/cobbler/oneiric-201108111912
Merge into: lp:ubuntu/oneiric/cobbler
Diff against target: 134 lines (+119/-0) (has conflicts)
2 files modified
debian/patches/55_ubuntu_branding.patch (+118/-0)
debian/source/include-binaries (+1/-0)
Conflict adding file debian/logo-ubuntu.png.  Moved existing file to debian/logo-ubuntu.png.moved.
Conflict adding file debian/patches/55_ubuntu_branding.patch.  Moved existing file to debian/patches/55_ubuntu_branding.patch.moved.
Conflict adding file debian/source/include-binaries.  Moved existing file to debian/source/include-binaries.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/cobbler/oneiric-201108111912
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+73907@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/cobbler reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/cobbler/oneiric-201108111912. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

44. By Dustin Kirkland 

releasing version 2.1.0+git20110602-0ubuntu19

43. By Dustin Kirkland 

* debian/cobbler-ubuntu-import:
  - move the loop_mount logic over from orchestra-import-isos (which now
    uses cobbler-ubuntu-import)

42. By Dustin Kirkland 

releasing version 2.1.0+git20110602-0ubuntu18

41. By Dustin Kirkland 

fix install location, move png to right location

40. By Dustin Kirkland 

* debian/patches/55_ubuntu_branding.patch, debian/patches/series,
  web/content/logo-ubuntu.png:
  - skin the web interface with Ubuntu colors/logo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/logo-ubuntu.png'
2Binary files debian/logo-ubuntu.png 1970-01-01 00:00:00 +0000 and debian/logo-ubuntu.png 2011-09-02 23:01:26 +0000 differ
3=== renamed file 'debian/logo-ubuntu.png' => 'debian/logo-ubuntu.png.moved'
4=== added file 'debian/patches/55_ubuntu_branding.patch'
5--- debian/patches/55_ubuntu_branding.patch 1970-01-01 00:00:00 +0000
6+++ debian/patches/55_ubuntu_branding.patch 2011-09-02 23:01:26 +0000
7@@ -0,0 +1,118 @@
8+=== modified file 'web/cobbler_web/templates/login.tmpl'
9+--- a/web/cobbler_web/templates/login.tmpl 2011-06-03 09:25:37 +0000
10++++ b/web/cobbler_web/templates/login.tmpl 2011-08-10 20:22:24 +0000
11+@@ -7,7 +7,8 @@
12+ </head>
13+ <body class="loginscreen">
14+ <div id="login">
15+- <img src="/cobbler_webui_content/logo-cobbler.png" width="185" />
16++ <img src="/cobbler_webui_content/logo-ubuntu.png" width="185" />
17++ <b><big>Orchestra</big></b><br/>(powered by <a href="https://fedorahosted.org/cobbler/">Cobbler</a>)<br/><br/>
18+ {% if form.errors %}
19+ <p class="error">Sorry, that's not a valid username or password</p>
20+ {% endif %}
21+
22+=== modified file 'web/cobbler_web/templates/master.tmpl'
23+--- a/web/cobbler_web/templates/master.tmpl 2011-06-03 09:25:37 +0000
24++++ b/web/cobbler_web/templates/master.tmpl 2011-08-10 20:19:44 +0000
25+@@ -7,6 +7,7 @@
26+ <script src="/cobbler_webui_content/jsGrowl.js" type="text/javascript"></script>
27+ <script src="/cobbler_webui_content/jsGrowl_jquery.js" type="text/javascript"></script>
28+ <script src="/cobbler_webui_content/cobbler.js" type="text/javascript"></script>
29++ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
30+ <link rel="stylesheet" type="text/css" media="all" href="/cobbler_webui_content/style.css" />
31+ <link rel="stylesheet" type="text/css" media="all" href="/cobbler_webui_content/jsGrowl.css" />
32+ </head>
33+@@ -17,6 +18,7 @@
34+ Logged in: <b>{{ username }}</b> <a class="action" href="/cobbler_web/logout">Logout</a>
35+ </div>
36+ <div id="menubar">
37++ <big><b>Orchestra</b></big><br/><i>powered by <a href="https://fedorahosted.org/cobbler/">Cobbler</a></i><br/><br/>
38+ <h1>Configuration</h1>
39+ <ul>
40+ <li><a href="/cobbler_web/distro/list" class="edit">Distros</a></li>
41+
42+=== modified file 'web/content/style.css'
43+--- a/web/content/style.css 2011-06-03 09:25:37 +0000
44++++ b/web/content/style.css 2011-08-10 20:22:29 +0000
45+@@ -30,10 +30,10 @@
46+ /* Lets set the primary styles and feel for the app */
47+ body {
48+ height: 100%;
49+- font-family: "URW Gothic", "Liberation Sans", "Helvetica", "Luxi Sans", "Bitstream Vera Sans", arial,helvetica,clean,sans-serif;
50++ font-family: Ubuntu, "URW Gothic", "Liberation Sans", "Helvetica", "Luxi Sans", "Bitstream Vera Sans", arial,helvetica,clean,sans-serif;
51+ color: #333333;
52+- background-color: #EEEEEE;
53+- background-image: url('/cobbler_webui_content/logo-cobbler.png');
54++ background-color: #FFFFFF;
55++ background-image: url('/cobbler_webui_content/logo-ubuntu.png');
56+ background-repeat: no-repeat;
57+ background-position: 0% 0%;
58+ padding-top: 80px;
59+@@ -41,13 +41,13 @@
60+ }
61+
62+ a { color: #333333; text-decoration: none; }
63+-a:hover { color: #306CAC; }
64++a:hover { color: #dddddd; }
65+ img { border: 0px; }
66+-h1,h2,legend { color: #306CAC; font-weight: bold; }
67++h1,h2,legend { color: #DD4814; font-weight: bold; }
68+ h1 { font-size: 1.5em; }
69+ h2,legend { font-size: 1.2em; margin-bottom: 0px; }
70+ hr { height: 1px; margin: 0px; }
71+-input, textarea { background-color: white; padding: 2px 4px; border: 1px solid #306CAC; border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; }
72++input, textarea { background-color: white; padding: 2px 4px; border: 1px solid #DD4814; border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; }
73+ input[type=text], input[type=password], select { width: 200px; }
74+ input[type=submit], input[type=reset] { margin-top: 10px; }
75+ input[type=checkbox] { background: none; border: none; margin-right: 196px; margin-top: 5px; }
76+@@ -59,7 +59,7 @@
77+ /* Defining the classes */
78+ .button, .action {
79+ text-decoration: none;
80+- background-color: #306CAC;
81++ background-color: #DD4814;
82+ border: 0px;
83+ font-weight: bold;
84+ color: #dddddd;
85+@@ -72,7 +72,7 @@
86+ }
87+ .button:hover, .action:hover {
88+ color: #DDDDDD;
89+- background-color: #333333;
90++ background-color: #77216F;
91+ }
92+ .warn { color: #990000; font-weight: bold; font-size: 1.0em; }
93+ .rpointers { font-size: 1.0em; margin-left: 5px; }
94+@@ -95,12 +95,12 @@
95+ background-repeat: no-repeat;
96+ background-image: url('/cobbler_webui_content/tooltip.png');
97+ padding-left: 30px;
98+- color: #EEEEEE;
99++ color: #FFFFFF;
100+ }
101+ span.context-tip:hover {
102+ background: none;
103+ padding: 0;
104+- color: #333333;
105++ color: #c099b8;
106+ font-size: .7em;
107+ font-style: italic;
108+ }
109+@@ -131,13 +131,13 @@
110+ #batchactions option:first-child { font-weight: bold; padding-left: 0; }
111+
112+ #listitems { clear: both; }
113+-#listitems thead { background-color: #306CAC; color: #dddddd; font-weight: bold; text-align: left; }
114++#listitems thead { background-color: #DD4814; color: #dddddd; font-weight: bold; text-align: left; }
115+ #listitems thead a { color: #dddddd; }
116+ #listitems thead tr th:first-child { width: 2em; padding-left: .3em;}
117+ #listitems tbody tr a.action, #listitems tbody tr span.action { font-size: .8em; float: left; padding: 1px 7px; }
118+ #listitems tbody tr { background-color: #eeeeee; }
119+ #listitems tbody tr.selected { background-color: #e0e0e0; }
120+-#listitems tbody tr:hover { background-color: #cccccc; }
121++#listitems tbody tr:hover { background-color: #c099b8; }
122+ #listitems tbody td { border-bottom: 1px solid #cccccc; }
123+ #listitems tbody td:first-child { width: 2em; padding-left: .3em;}
124+ #listitems tbody td:last-child { width: 21em; }
125+
126
127=== renamed file 'debian/patches/55_ubuntu_branding.patch' => 'debian/patches/55_ubuntu_branding.patch.moved'
128=== added file 'debian/source/include-binaries'
129--- debian/source/include-binaries 1970-01-01 00:00:00 +0000
130+++ debian/source/include-binaries 2011-09-02 23:01:26 +0000
131@@ -0,0 +1,1 @@
132+debian/logo-ubuntu.png
133
134=== renamed file 'debian/source/include-binaries' => 'debian/source/include-binaries.moved'

Subscribers

People subscribed via source and target branches

to all changes: