Merge lp:~mitya57/gnome-icon-theme/ubuntu-fix-lp-877451 into lp:~ubuntu-desktop/gnome-icon-theme/ubuntu

[Dmitry Shachnev]

Some icons were removed from Humanity in the end of Oneiric development cycle (see bug 832170 for details), but currently only stock_search is listed in not-in-humanity.txt.

This causes some bugs like bug 878980.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-20 14:37:16 +0000
+++ debian/changelog	2011-11-12 07:01:24 +0000
@@ -1,3 +1,9 @@
+gnome-icon-theme (3.2.1.2-1ubuntu2) precise; urgency=low
+
+  * Add more missing icons to debian/not-in-humanity.txt (LP: #877451)
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 12 Nov 2011 10:50:33 +0400
+
 gnome-icon-theme (3.2.1.2-1ubuntu1) precise; urgency=low
 
   * Merge with Debian testing. Remaining Ubuntu changes:

=== modified file 'debian/not-in-humanity.txt'
--- debian/not-in-humanity.txt	2011-10-14 19:15:01 +0000
+++ debian/not-in-humanity.txt	2011-11-12 07:01:24 +0000
@@ -5,8 +5,8 @@
 appointment-missed
 appointment-soon
 avatar-default
+battery-full
 battery-good-charging
-battery-full
 call-start
 call-stop
 camera
@@ -15,6 +15,8 @@
 computer
 computer-fail
 document-send
+edit-find
+edit-find-replace
 emblem-default
 emblem-downloads
 emblem-mail
@@ -44,7 +46,9 @@
 face-uncertain
 face-wink
 face-worried
+filefind
 file-manager
+find
 format-indent-less
 format-indent-more
 format-justify-center
@@ -58,24 +62,34 @@
 gnome-character-map
 gnome-fs-executable
 gnome-modem
+gnome-searchtool
 gnome-stock-text-indent
 gnome-stock-text-unindent
 gtk-bold
+gtk-find
+gtk-find-and-replace
 gtk-italic
 gtk-justify-center
 gtk-justify-fill
 gtk-justify-left
 gtk-justify-right
+gtk-missing-image
+gtk-search
 gtk-sort-ascending
 gtk-sort-descending
 gtk-spell-check
 gtk-strikethrough
 gtk-underline
+gtk-zoom-100
+gtk-zoom-fit
+gtk-zoom-in
+gtk-zoom-out
 gucharmap
 help-faq
 input-tablet
 insert-image
 insert-link
+kfind
 kfm
 mail-attachment
 media-removable
@@ -85,6 +99,7 @@
 network-wired-disconnected
 preferences-desktop-font
 scanner
+search
 security-high
 security-low
 security-medium
@@ -94,11 +109,25 @@
 stock_lock-broken
 stock_lock-ok
 stock_search
+stock_search-and-replace
+stock_zoom-1
+stock_zoom-in
+stock_zoom-out
+stock_zoom-page
 system-file-manager
+system-search
 text-x-preview
 tools-check-spelling
+viewmag-
+viewmag+
+viewmag1
+viewmagfit
 view-sort-ascending
 view-sort-descending
 xfce4-mixer
 x-office-presentation
-gtk-missing-image
+zoom-best-fit
+zoom-fit-best
+zoom-in
+zoom-original
+zoom-out