Merge branch 'master' into harmattan

Conflicts:
	debian/changelog
	debian/patches/06ls.patch
	debian/patches/init-console.patch
	debian/patches/parse-complete-hostname.patch
	debian/patches/ps-accept-and-ignore-missing-options.patch
	debian/patches/supress-bad-number.patch
	debian/patches/top-display-rss.patch
	debian/rules

diff --cc debian/changelog
index 27eede7,3ff7403..b80cb8f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ busybox-power (1.21.0power1) unstable; urgency=low
+ 
+   * New upstream release (BusyBox 1.21.0)
+   * Correct the symlink locations of several applets
+   * Generate busybox-power-althist package
+ 
+  -- Dennis Groenen <tj.groenen@gmail.com>  Tue, 22 Jan 2013 12:45:45 +0100
+ 
 +busybox-power (1.20.2power5+harmattan0) unstable; urgency=low
 +
 +  * Merged master
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Fri, 30 Nov 2012 19:55:53 +0100
 +
  busybox-power (1.20.2power5) unstable; urgency=low
  
    * Introduce Diablo support (by Teemu Ikonen)

diff --cc debian/config/config.busybox
Simple merge

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
index 4ba5619,3d36226..68b6651
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -73,11 -73,11 +73,12 @@@ clean
        dh_testdir
        rm -rf $(BUILD_DIR) $(STAMPS_DIR)
        dh_clean
+       rm -rf debian/busybox-power-althistory*
 +      rm -rf debian/busybox-power-noaegis*
  
  binary-indep:
  
- binary-arch: binary-arch_busybox binary-arch_busybox-noaegis binary-arch_all
 -binary-arch: binary-arch_busybox binary-arch_busybox-althist binary-arch_all
++binary-arch: binary-arch_busybox binary-arch_busybox-noaegis binary-arch_busybox-althist binary-arch_all
  
  binary-arch_busybox: DIR = $(BUILD_DIR)/build_busybox
  binary-arch_busybox: DH_OPTIONS = -pbusybox-power
@@@ -88,16 -88,18 +89,29 @@@ binary-arch_busybox: $(STAMPS_DIR)/buil
        install -D -m644 debian/scripts/functions debian/busybox-power/opt/busybox-power/functions
        install -D -m755 $(DIR)/busybox_unstripped debian/busybox-power/opt/busybox-power/busybox.power
  
++
 +binary-arch_busybox-noaegis: DIR = $(BUILD_DIR)/build_busybox
 +binary-arch_busybox-noaegis: DH_OPTIONS = -pbusybox-power-noaegis
 +binary-arch_busybox-noaegis: $(STAMPS_DIR)/build_busybox
 +      dh_testdir
 +      dh_testroot
 +      # busybox-power-noaegis == busybox-power, only debian/control differs
 +      # Therefore, duplicate busybox-power into busybox-power-noaegis
 +      for f in debian/busybox-power*; do cp -a "$$f" "$${f/busybox-power/busybox-power-noaegis}"; done
 +      sed -i s/busybox-power/busybox-power-noaegis/ debian/busybox-power-noaegis.aegis
 +
+ binary-arch_busybox-althist: DIR = $(BUILD_DIR)/build_busybox-althist
+ binary-arch_busybox-althist: DH_OPTIONS = -pbusybox-power-althist
+ binary-arch_busybox-althist: $(STAMPS_DIR)/build_busybox-althist
+       dh_testdir
+       dh_testroot
+       # busybox-power-althist == busybox-power, only BusyBox' .config differs
+       # Duplicate the maintainer scripts etc. into busybox-power-althist
+       for f in debian/busybox-power.*; do cp -p "$$f" "$${f/busybox-power/busybox-power-althist}"; done
+       install -D -m644 debian/scripts/applets debian/busybox-power-althist/opt/busybox-power/applets
+       install -D -m644 debian/scripts/functions debian/busybox-power-althist/opt/busybox-power/functions
+       install -D -m755 $(DIR)/busybox_unstripped debian/busybox-power-althist/opt/busybox-power/busybox.power
+ 
  binary-arch_all:
        dh_installdirs
        dh_installdocs