X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fchangelog;h=b57d0a2c338a0a681895436762cd0be04a035008;hb=aa79a70ee51dce6c2dc06ac51d6e65a6c0b7a3e9;hp=8250de2916edd7b7dce68e7483a22dac9c240691;hpb=73f8d3e2ebcd928cb5ecc7f429fbc4b1c2c8477f;p=live-boot-grml.git

diff --git a/debian/changelog b/debian/changelog
index 8250de2..b57d0a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,52 @@
-live-boot (5.0~a4-1+grml.1) UNRELEASED; urgency=medium
+live-boot (1:20151213+grml.1) UNRELEASED; urgency=medium
+
+  * Merge latest Debian changes.
+  * [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>  Wed, 06 Jan 2016 18:07:09 +0100
+
+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
+
+live-boot (5.0~a5-1) unstable; urgency=low
+
+  [ Richard Nelson ]
+  * Adjusting whitespace to tabs on components/9990-overlay.sh
+  * Adjusting whitespace to tabs on components/9990-misc-helpers.sh
+  * Adjusting whitespace to tabs on components/9990-mount-http.sh
+
+  [ Daniel Baumann ]
+  * Wrap and sort debian control file.
+
+  [ Steven Shiau ]
+  * Support predictable network interface names.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 23 Aug 2015 10:55:32 +0200
+
+live-boot (5.0~a4-1+grml.1) unstable; urgency=medium
 
   [ Evgeni Golov ]
   * Import 5.0~a4-1 from Debian.
@@ -10,13 +58,14 @@ live-boot (5.0~a4-1+grml.1) UNRELEASED; urgency=medium
   * [5f1c62a] create a single debian patch :/
   * [214cc03] use auto instead of allow-hotplug in generated /e/n/interfaces
     (Closes: issue1568)
-  * [6795067] backport Allow-selecting-boot-eth-dev-by-MAC-address.patch from upstream
+  * [6795067] backport Allow-selecting-boot-eth-dev-by-MAC-address.patch
+    from upstream
 
   [ Laurens Vanderhoven ]
   * [5eb34d4] Allow +2 nameserver entries for dns= boot option
     (Closes: issue1234)
 
- -- Evgeni Golov <evgeni@grml.org>  Tue, 18 Aug 2015 13:04:08 +0200
+ -- Evgeni Golov <evgeni@grml.org>  Tue, 18 Aug 2015 14:14:10 +0200
 
 live-boot (5.0~a4-1) unstable; urgency=low