Merge branch 'debian'

diff --cc debian/changelog
index 0145ae2,8c03dbc..ecafa41
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,25 +1,36 @@@
+ live-boot (1:20151213) unstable; urgency=medium
+ 
+   [ Iain R. Learmonth ]
+   * Change to native package.
+   * debian/control:
+    - Added myself to uploaders.
+    - Updated Vcs-* and Homepage fields.
+ 
+   [ trebmuh ]
+   * Adding French translation for live-boot manpage and prep for
+     persistence.conf.
+ 
+   [ Carlos Zuferri ]
+   * Using 'Live Systems Project' as default project in .pot files.
+ 
+  -- Iain R. Learmonth <irl@debian.org>  Sun, 13 Dec 2015 16:12:07 +0000
+ 
+ live-boot (5.0~a5-2) unstable; urgency=low
+ 
+   * Removing myself from uploaders, lost trust in Debian (#804315).
+ 
+  -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 20 Nov 2015 13:04:24 +0100
++>>>>>>> debian
++
 +live-boot (5.0~a5-1+grml.1) UNRELEASED; urgency=medium
 +
 +  [ Evgeni Golov ]
 +  * [aea94ce] add gbp.conf
 +  * [9f0266a] fix "unexpected operator" error when stopping live-boot
 +  * [83abdd6] Revert "restore support for old persistence media"
 +  * [f0db64b] use pristine-tar by default
 +
 + -- Evgeni Golov <evgeni@grml.org>  Mon, 24 Aug 2015 21:04:50 +0200
  
  live-boot (5.0~a5-1) unstable; urgency=low
  

diff --cc debian/control
index 378a61e,96fee1b..8140c5a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,25 -1,23 +1,26 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Live Systems Maintainers <debian-live@lists.debian.org>
 -Uploaders: Iain R. Learmonth <irl@debian.org>
 +Maintainer: Grml Team <team@grml.org>
- Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~)
+ Build-Depends:
+  debhelper (>= 9),
  Standards-Version: 3.9.6
 -Homepage: https://debian-live.alioth.debian.org/live-boot/
 -Vcs-Browser: https://anonscm.debian.org/cgit/debian-live/live-boot.git
 -Vcs-Git: https://anonscm.debian.org/git/debian-live/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:
 - live-boot-initramfs-tools | live-boot-backend,
 + live-boot-grml-initramfs-tools | live-boot-backend,
   ${misc:Depends},
  Recommends:
 - live-boot-doc,
 + live-boot-grml-doc,
   live-tools,
 + eject,
 + file,
   rsync,
   uuid-runtime,
  Suggests: