Merge lp:~ubuntu-branches/ubuntu/lucid/oxygen-icons/lucid-201002221433 into lp:ubuntu/lucid/oxygen-icons

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

Unmerged revisions

20. By Jonathan Riddell on 2010-02-22

* Split out 256x256 icons into new package, allows to save space
  on CD if we have to
* Use lzma compression

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-22 13:16:35 +0000
+++ debian/changelog	2010-02-22 14:38:17 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 oxygen-icons (4:4.4.0-0ubuntu3) lucid; urgency=low
 
   * Add build-dep on pkg-kde-tools
@@ -12,6 +13,16 @@
 
  -- Jonathan Riddell <[e-mail]>  Mon, 22 Feb 2010 12:01:59 +0000
 
+=======
+oxygen-icons (4:4.4.0-0ubuntu2) lucid; urgency=low
+
+  * Split out 256x256 icons into new package, allows to save space
+    on CD if we have to
+  * Use lzma compression
+
+ -- Jonathan Riddell <[e-mail]>  Mon, 22 Feb 2010 12:01:59 +0000
+
+>>>>>>> MERGE-SOURCE
 oxygen-icons (4:4.4.0-0ubuntu1) lucid; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
=== added file 'debian/oxygen-icon-theme-complete.install'
--- debian/oxygen-icon-theme-complete.install	1970-01-01 00:00:00 +0000
+++ debian/oxygen-icon-theme-complete.install	2010-02-22 14:38:17 +0000
@@ -0,0 +1,1 @@
+usr/share/icons/oxygen/256x256

=== renamed file 'debian/oxygen-icon-theme-complete.install' => 'debian/oxygen-icon-theme-complete.install.moved'