synchronize patches with Debian Sid

[busybox-power] / debian / patches / series

diff --git a/debian/patches/series b/debian/patches/series
index 5ee93e5..5b992c2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,10 @@
 #Updated patches from Debian Sid; these are also in Nokia's busybox sources
-#Source: http://ftp.de.debian.org/debian/pool/main/b/busybox/busybox_1.18.4-2.debian.tar.gz
+#Source: http://ftp.de.debian.org/debian/pool/main/b/busybox/busybox_1.20.0-4.debian.tar.gz
 shell-ash-export-HOME.patch
-applets-fallback.patch
 init-console.patch
 version.patch
 
 #Patches ported from Nokia's busybox sources
-03tar.patch
 05thumb.patch
 06ls.patch
 busybox-zero-ifr.ifr_hwaddr.sa_data.patch
@@ -15,13 +13,14 @@ top-display-rss.patch
 #New patches to bring back Maemo's old busybox behaviour
 supress-bad-number.patch
 parse-complete-hostname.patch
+ps-accept-and-ignore-missing-options.patch
 
 #New patches as per reported issues by users
 showkey-default-option.patch
-ps-accept-and-ignore-missing-options.patch
-0001-add-support-for-delayed-history-saving.patch
-0002-hush-don-t-save-history-when-non-interactive.patch
 
 #Hotfixes
-hotfixes/busybox-1.19.2-crond.patch
+
+#Patched pulled from busybox git
+
+#Miscellaneous