Bug#607485: human-icon-theme: FTBFS: will not overwrite just-created `.../usr/share/icons/Human/24x24/apps/system-users.png' with `system-users.png'

[Hideki Yamane]

 GMail bytes previous mail, once again... 


diff -Nru human-icon-theme-0.28.debian/debian/changelog human-icon-theme-0.28.debian/debian/changelog
--- human-icon-theme-0.28.debian/debian/changelog       2010-12-20 10:02:59.000000000 +0900
+++ human-icon-theme-0.28.debian/debian/changelog       2010-12-20 10:00:47.000000000 +0900
@@ -1,3 +1,16 @@
+human-icon-theme (0.28.debian-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * debian/rules
+    - not use simple-patchsys
+  * debian/source/format
+    - set "3.0 (quilt)"
+  * debian/patches
+    - refresh 01_make_type_scalable_for_missing_icons.patch
+    - add 02_delete_duplicate_system-users.png.patch (Closes: #607485)
+
+ -- Hideki Yamane <henrich at debian.org>  Mon, 20 Dec 2010 10:00:42 +0900
+
 human-icon-theme (0.28.debian-3) unstable; urgency=high

   * Use "libmagickcore-dev | libmagick9-dev" as the imagemagick build-dep,
diff -Nru human-icon-theme-0.28.debian/debian/control human-icon-theme-0.28.debian/debian/control
--- human-icon-theme-0.28.debian/debian/control 2010-12-20 10:02:59.000000000 +0900
+++ human-icon-theme-0.28.debian/debian/control 2010-12-20 10:00:51.000000000 +0900
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: human-icon-theme
 Section: non-free/x11
 Priority: optional
diff -Nru human-icon-theme-0.28.debian/debian/patches/01_make_type_scalable_for_missing_icons.patch
human-icon-theme-0.28.debian/debian/patches/01_make_type_scalable_for_missing_icons.patch
--- human-icon-theme-0.28.debian/debian/patches/01_make_type_scalable_for_missing_icons.patch   2010-12-20
10:02:59.000000000 +0900
+++ human-icon-theme-0.28.debian/debian/patches/01_make_type_scalable_for_missing_icons.patch   2010-12-20
09:57:05.000000000 +0900
@@ -1,6 +1,8 @@
 === modified file 'index.theme.in'
---- index.theme.in     2006-07-20 11:46:04 +0000
-+++ index.theme.in     2007-07-04 10:02:31 +0000
+Index: human-icon-theme-0.28.debian/index.theme.in
+===================================================================
+--- human-icon-theme-0.28.debian.orig/index.theme.in   2010-12-20 09:56:51.195434339 +0900
++++ human-icon-theme-0.28.debian/index.theme.in        2010-12-20 09:57:01.699432279 +0900
 @@ -160,7 +160,7 @@
  [24x24/filesystems]
  Size=24
@@ -136,4 +138,3 @@
  Context=Status
  Type=Scalable
  MinSize=32
-
diff -Nru human-icon-theme-0.28.debian/debian/patches/02_delete_duplicate_system-users.png.patch
human-icon-theme-0.28.debian/debian/patches/02_delete_duplicate_system-users.png.patch
--- human-icon-theme-0.28.debian/debian/patches/02_delete_duplicate_system-users.png.patch      1970-01-01
09:00:00.000000000 +0900
+++ human-icon-theme-0.28.debian/debian/patches/02_delete_duplicate_system-users.png.patch      2010-12-20
09:41:57.000000000 +0900
@@ -0,0 +1,12 @@
+Index: human-icon-theme-0.28.debian/24x24/apps/Makefile.am
+===================================================================
+--- human-icon-theme-0.28.debian.orig/24x24/apps/Makefile.am   2010-12-20 09:41:42.819433370 +0900
++++ human-icon-theme-0.28.debian/24x24/apps/Makefile.am        2010-12-20 09:41:51.011429321 +0900
+@@ -6,7 +6,6 @@
+ icons_DATA =  gnome-netstatus-75-100.png      \
+       evolution.png   \
+       ooo-base.png    \
+-      system-users.png        \
+       gnome-session-logout.png        \
+       gnome-session-hibernate.png     \
+       ooo-template.png        \
diff -Nru human-icon-theme-0.28.debian/debian/patches/series human-icon-theme-0.28.debian/debian/patches/series
--- human-icon-theme-0.28.debian/debian/patches/series  1970-01-01 09:00:00.000000000 +0900
+++ human-icon-theme-0.28.debian/debian/patches/series  2010-12-20 09:56:44.000000000 +0900
@@ -0,0 +1,2 @@
+01_make_type_scalable_for_missing_icons.patch
+02_delete_duplicate_system-users.png.patch
diff -Nru human-icon-theme-0.28.debian/debian/rules human-icon-theme-0.28.debian/debian/rules
--- human-icon-theme-0.28.debian/debian/rules   2010-12-20 10:02:59.000000000 +0900
+++ human-icon-theme-0.28.debian/debian/rules   2010-12-20 10:00:40.000000000 +0900
@@ -3,7 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/ubuntu-get-source.mk

 DISTRO := $(shell lsb_release -si)
diff -Nru human-icon-theme-0.28.debian/debian/source/format human-icon-theme-0.28.debian/debian/source/format
--- human-icon-theme-0.28.debian/debian/source/format   1970-01-01 09:00:00.000000000 +0900
+++ human-icon-theme-0.28.debian/debian/source/format   2010-12-20 09:59:53.000000000 +0900
@@ -0,0 +1 @@
+3.0 (quilt)