Ubuntu
logwatch package

Merge lp:~ubuntu-branches/ubuntu/lucid/logwatch/lucid-201002122348 into lp:ubuntu/lucid/logwatch

  1. Lucid (10.04)
  2. lucid-201002122348
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/logwatch/lucid-201002122348
Merge into: lp:ubuntu/lucid/logwatch
Diff against target: 57 lines (+46/-0) (has conflicts)
2 files modified
conf/html/footer.html (+26/-0)
conf/html/header.html (+20/-0)
Conflict adding file conf/html.  Moved existing file to conf/html.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/logwatch/lucid-201002122348
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/logwatch now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/logwatch/lucid-201002122348. A merge should be performed if necessary.

Reply

Unmerged revisions

13. By Chuck Short

conf/html/{footer.html,header.html} Re-add dropped from the
previous version of logtwatch. (LP: #481327)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'conf/html'
2=== renamed directory 'conf/html' => 'conf/html.moved'
3=== added file 'conf/html/footer.html'
4--- conf/html/footer.html 1970-01-01 00:00:00 +0000
5+++ conf/html/footer.html 2010-02-12 23:52:19 +0000
6@@ -0,0 +1,26 @@
7+<!-- Start footer.html -->
8+<div class=\"copyright\">
9+<hr>
10+<p>Logwatch &copy;Copyright 2002-2006 Kirk Bauer</p>
11+<p>
12+Permission is hereby granted, free of charge, to any person obtaining a copy of
13+this software and associated documentation files (the "Software"), to deal in
14+the Software without restriction, including without limitation the rights to
15+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
16+of the Software, and to permit persons to whom the Software is furnished to do
17+so, subject to the following conditions:
18+</p>
19+<p>
20+The above copyright notice and this permission notice shall be included in all
21+copies or substantial portions of the Software.
22+</p>
23+<p>
24+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
27+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
29+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30+SOFTWARE.
31+</p></div>
32+</body></html>
33
34=== added file 'conf/html/header.html'
35--- conf/html/header.html 1970-01-01 00:00:00 +0000
36+++ conf/html/header.html 2010-02-12 23:52:19 +0000
37@@ -0,0 +1,20 @@
38+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
39+<html>
40+<head>
41+<title>Logwatch $Version ( $VDate )</title>
42+<meta name="generator" content="Logwatch $Version ( $VDate )">
43+<style type="text/css">
44+ h1 {color: gray; border-bottom: 3px double silver}
45+ h2,h3 {color: gray; border-bottom: 1px solid silver}
46+ .ref {padding-left: 1%}
47+ .service {padding-left: 1%; font-family: Monospace}
48+ .return_link {border-top: 1px; border-bottom: 1px;
49+ padding: 1%; margin-top: 1%; margin-bottom: 1%;}
50+ .copyright {color: black; border-top: 1px solid grey;
51+ border-bottom: 1px solid grey;
52+ padding: 1%; margin-top: 1%; margin-bottom: 1%;}
53+</style>
54+</head>
55+<body style="width:90%; margin-left: 5%; margin-right: 5%" bgcolor="#FFFFFF">
56+<hr>
57+<!-- End header.html -->

Subscribers

People subscribed via source and target branches

to all changes: