Merge branch 'debian'

Conflicts:
	debian/control

diff --cc debian/changelog
Simple merge

diff --cc debian/control
index ab8779a,22a06d0..54a98f6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,24 -1,33 +1,37 @@@
  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.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}, genext2fs, live-boot-grml-initramfs-tools | live-boot-backend
- Recommends: live-boot-grml-doc, live-tools, eject, file, rsync, uuid-runtime
+ Depends:
+  ${misc:Depends},
 - live-boot-initramfs-tools | live-boot-backend,
++ live-boot-grml-initramfs-tools | live-boot-backend,
++ genext2fs,
+ Recommends:
 - live-boot-doc,
++ live-boot-grml-doc,
+  live-tools,
++ eject,
++ file,
+  rsync,
+  uuid-runtime,
+ Suggests:
+  curlftpfs,
+  cryptsetup,
+  httpfs2,
+  wget,
 +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).
   .

diff --cc debian/live-boot-grml.bug-script
Simple merge