Merge branch 'debian'

Conflicts:
	debian/changelog
	debian/control

diff --cc debian/changelog
index bbaab55,da4f021..723b709
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ live-boot (4.0.1-1) unstable; urgency=low
+ 
+   [ victory ]
+   * Change a wording and fix a typo in the po header, in Japanese
+     translation.
+ 
+   [ Daniel Baumann ]
+   * Updating to standards version 3.9.6.
+ 
+   [ Carlos Zuferri ]
+   * Fixing typo in warning message.
+ 
+   [ Daniel Baumann ]
+   * Dropping empty German manpage translations.
+ 
+  -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 25 Oct 2014 14:26:22 +0200
+ 
 +live-boot (4.0.0-1+grml.1) unstable; urgency=medium
 +
 +  * Import 4.0.0-1 from Debian.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Thu, 28 Aug 2014 17:55:20 +0200
 +
  live-boot (4.0.0-1) unstable; urgency=low
  
    [ Carlos Zuferri ]

diff --cc debian/control
index c82bf72,9fcef5b..ab8779a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,24 -1,34 +1,24 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Live Systems Maintainers <debian-live@lists.debian.org>
 -Uploaders: Daniel Baumann <mail@daniel-baumann.ch>
 -Build-Depends: debhelper (>= 9)
 +Maintainer: Grml Team <team@grml.org>
 +Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~)
- Standards-Version: 3.9.5
+ Standards-Version: 3.9.6
 -Homepage: http://live-systems.org/devel/live-boot/
 -Vcs-Browser: http://live-systems.org/gitweb/?p=live-boot.git
 -Vcs-Git: git://live-systems.org/git/live-boot.git
 +Homepage: http://live.debian.net/devel/live-boot/
 +Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git
 +Vcs-Git: git://git.grml.org/live-boot-grml.git
 +Origin: Grml
 +Bugs: mailto:bugs@grml.org
  
 -Package: live-boot
 +Package: live-boot-grml
  Architecture: all
 -Depends:
 - ${misc:Depends},
 - live-boot-initramfs-tools | live-boot-backend,
 -Recommends:
 - live-boot-doc,
 - live-tools,
 - rsync,
 - uuid-runtime,
 -Suggests:
 - curlftpfs,
 - cryptsetup,
 - httpfs2,
 - unionfs-fuse,
 - wget,
 +Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools | live-boot-backend
 +Recommends: live-boot-grml-doc, live-tools, eject, file, rsync, uuid-runtime
 +Conflicts: live-boot
 +Replaces: live-boot
 +Provides: live-boot
 +Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
  Description: Live System Boot Components
 - The Live Systems project maintains the components to build Debian based Live
 - systems and the official Debian Live images themselves.
 - .
   live-boot contains the components to configure a live system during the boot
   process (early userspace).
   .