From: Evgeni Golov <evgeni@debian.org>
Date: Tue, 4 Dec 2012 14:15:58 +0000 (+0100)
Subject: Merge branch 'debian': Imported 3.0~b8-1 from Debian Live
X-Git-Tag: v3.0_b8-1+grml.1~1
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=b5809b75c8aabfef185edb36f141019e69f8b3de

Merge branch 'debian': Imported 3.0~b8-1 from Debian Live

Conflicts:
	debian/control
---

b5809b75c8aabfef185edb36f141019e69f8b3de
diff --cc debian/control
index d60958b,a4e0cf3..9b10877
--- a/debian/control
+++ b/debian/control
@@@ -1,26 -1,22 +1,26 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Debian Live Project <debian-live@lists.debian.org>
 -Uploaders: Daniel Baumann <daniel@debian.org>
 -Build-Depends: debhelper (>= 9)
 +Maintainer: Grml Team <team@grml.org>
 +Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~)
  Standards-Version: 3.9.4
  Homepage: http://live.debian.net/devel/live-boot/
 -Vcs-Browser: http://live.debian.net/gitweb/?p=live-boot.git
 -Vcs-Git: git://live.debian.net/git/live-boot.git
 +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
 -Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend
 -Recommends: live-boot-doc, rsync, uuid-runtime
++Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools | live-boot-backend
 +Recommends: live-boot-grml-doc, eject, file, rsync, uuid-runtime
 +Conflicts: live-boot
 +Replaces: live-boot
 +Provides: live-boot
  Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
- Description: Debian Live - System Boot Scripts
-  live-boot contains the scripts that configure a Debian Live system during the
-  boot process (early userspace).
+ Description: Live System Boot Scripts
+  live-boot contains the scripts that configure a live system during the boot
+  process (early userspace).
   .
   In addition to live-boot, a backend for the initrd generation is required, such
   as live-boot-initramfs-tools.
@@@ -33,33 -25,23 +33,31 @@@ Package: live-boot-grml-do
  Section: doc
  Architecture: all
  Depends: ${misc:Depends}
- Conflicts: live-boot (<< 3.0~a18~), live-boot-doc
- Replaces: live-boot, live-boot-doc
- Provides: live-boot-doc
- Description: Debian Live - System Boot Scripts (documentation)
-  live-boot contains the scripts that configure a Debian Live system during the
-  boot process (early userspace).
+ Conflicts: live-boot (<< 3.0~a18~)
+ Replaces: live-boot
+ Description: Live System Boot Scripts (documentation)
+  live-boot contains the scripts that configure a live system during the boot
+  process (early userspace).
   .
   This package contains the documentation.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.
  
 -Package: live-boot-initramfs-tools
 +Package: live-boot-grml-initramfs-tools
  Architecture: all
  Depends:
   ${misc:Depends}, busybox | busybox-initramfs, initramfs-tools, udev
  Conflicts: live-boot-backend
  Replaces: live-boot-backend
  Provides: live-boot-backend
- Breaks: klibc-utils (<< 2.0-2)
- Description: Debian Live - System Boot Scripts (initramfs-tools backend)
-  live-boot contains the scripts that configure a Debian Live system during the
-  boot process (early userspace).
+ Description: Live System Boot Scripts (initramfs-tools backend)
+  live-boot contains the scripts that configure a live system during the boot
+  process (early userspace).
   .
   This package contains the initramfs-tools backend.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.