r2013: * Remove DOS line endings from dh_icons scriptlets. Thanks, Daniel Holbach.

  Closes: #432321

diff --git a/autoscripts/postinst-icons b/autoscripts/postinst-icons
index 3c018b354e76f8901c46e83f2016b78940da23d7..d35f30c0fd4e64c3385091006b24e9abdfb98202 100644 (file)
--- a/autoscripts/postinst-icons
+++ b/autoscripts/postinst-icons
@@ -1,7 +1,7 @@
-if which gtk-update-icon-cache >/dev/null 2>&1; then\r
-       for dir in #DIRLIST#; do\r
-               if [ -f "$dir"/icon-theme.cache ]; then\r
-                       gtk-update-icon-cache --force --quiet "$dir"\r
-               fi\r
-       done\r
-fi\r
+if which gtk-update-icon-cache >/dev/null 2>&1; then
+       for dir in #DIRLIST#; do
+               if [ -f "$dir"/icon-theme.cache ]; then
+                       gtk-update-icon-cache --force --quiet "$dir"
+               fi
+       done
+fi

diff --git a/autoscripts/postrm-icons b/autoscripts/postrm-icons
index 3765560cb370e029f68646bf591d2fefb3be3e5f..87fd790b993cd855c41b7b182cb3f5f6512439df 100644 (file)
--- a/autoscripts/postrm-icons
+++ b/autoscripts/postrm-icons
@@ -1,15 +1,15 @@
-if [ "$1" = "remove" ]; then\r
-       for dir in #DIRLIST#; do\r
-               if [ -d "$dir" ]; then\r
-                       if [ -f "$dir"/index.theme ] && \\r
-                          [ -f "$dir"/icon-theme.cache ] && \\r
-                          which gtk-update-icon-cache >/dev/null 2>&1\r
-                       then\r
-                               gtk-update-icon-cache --force --quiet "$dir"\r
-                       else\r
-                               rm -f "$dir"/icon-theme.cache\r
-                               rmdir -p --ignore-fail-on-non-empty "$dir"\r
-                       fi\r
-               fi\r
-       done\r
-fi\r
+if [ "$1" = "remove" ]; then
+       for dir in #DIRLIST#; do
+               if [ -d "$dir" ]; then
+                       if [ -f "$dir"/index.theme ] && \
+                          [ -f "$dir"/icon-theme.cache ] && \
+                          which gtk-update-icon-cache >/dev/null 2>&1
+                       then
+                               gtk-update-icon-cache --force --quiet "$dir"
+                       else
+                               rm -f "$dir"/icon-theme.cache
+                               rmdir -p --ignore-fail-on-non-empty "$dir"
+                       fi
+               fi
+       done
+fi

diff --git a/debian/changelog b/debian/changelog
index 1cc9e0d6649632935bbb48f504d8695bc019cb40..0ac6f688e001f9d0b2a4671538c867b1bbb53510 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (5.0.52) UNRELEASED; urgency=low
+
+  * Remove DOS line endings from dh_icons scriptlets. Thanks, Daniel Holbach.
+    Closes: #432321
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Jul 2007 11:24:59 -0400
+
 debhelper (5.0.51) unstable; urgency=low
 
   * dh_icons: New program to update Freedesktop icon caches. Thanks