Merge lp:~ubuntu-branches/ubuntu/lucid/libpng/lucid-201002130207 into lp:ubuntu/lucid/libpng

[James Westby]

[James Westby (james-w)]

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/libpng now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/libpng/lucid-201002130207. A merge should be performed if necessary.

Unmerged revisions

23. By Steve Langasek on 2010-01-25

releasing version 1.2.40-1ubuntu1

22. By Steve Langasek on 2010-01-25

Move libpng from /usr/lib to /lib, so that plymouth is usable on systems
with a separate /usr.

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-28 11:57:34 +0000
+++ debian/changelog	2010-02-13 02:13:15 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 libpng (1.2.42-1ubuntu1) lucid; urgency=low
 
   * Merge from Debian testing.  Remaining changes:
@@ -34,6 +35,15 @@
 
  -- Anibal Monsalve Salazar <[e-mail]>  Fri, 04 Dec 2009 11:23:50 +1100
 
+=======
+libpng (1.2.40-1ubuntu1) lucid; urgency=low
+
+  * Move libpng from /usr/lib to /lib, so that plymouth is usable on systems
+    with a separate /usr.
+
+ -- Steve Langasek <[e-mail]>  Sun, 24 Jan 2010 23:59:10 -0800
+
+>>>>>>> MERGE-SOURCE
 libpng (1.2.40-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/control'