gfxboot (4.5.2-1.1-6) unstable; urgency=medium

  * QA Upload.
  * Add e2fsprogs to Recommends, also add reiserfsprogs and xfsprogs to
    Suggests. (Closes: #887243)
  * Add debian/watch pointing to https://github.com/OpenSUSE/gfxboot
  * Do dbgsym migration and drop gfxboot-dbg package.
  * Switch from deprecated Priority: extra to optional.

[dgit import unpatched gfxboot 4.5.2-1.1-6]

21 files changed, 881 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..42a9b2d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,309 @@
+gfxboot (4.5.2-1.1-6) unstable; urgency=medium
+
+  * QA Upload.
+  * Add e2fsprogs to Recommends, also add reiserfsprogs and xfsprogs to
+    Suggests. (Closes: #887243)
+  * Add debian/watch pointing to https://github.com/OpenSUSE/gfxboot
+  * Do dbgsym migration and drop gfxboot-dbg package.
+  * Switch from deprecated Priority: extra to optional.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 06 Mar 2018 17:08:15 +0100
+
+gfxboot (4.5.2-1.1-5) unstable; urgency=low
+
+  * I don't care anymore, not worth it.. orphaning.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 25 Jul 2014 20:58:42 +0200
+
+gfxboot (4.5.2-1.1-4) unstable; urgency=low
+
+  * Copying with dereferencing of symlinks in order to make builds more
+    robust when symlinks are used in the build tree.
+  * Copying with dereferencing when install the themes into the packages
+    (Closes: #752231).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 24 Jun 2014 16:43:39 +0200
+
+gfxboot (4.5.2-1.1-3) unstable; urgency=low
+
+  * Adding conflicts/replaces for gfxboot-examples to gfxboot-dev.
+  * Updating dejavu recommends.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 25 Apr 2014 22:08:11 +0200
+
+gfxboot (4.5.2-1.1-2) unstable; urgency=low
+
+  * Building with dh --parallel.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Mar 2014 19:52:21 +0200
+
+gfxboot (4.5.2-1.1-1) experimental; urgency=low
+
+  * Merging upstream version 4.5.2-1.1.
+  * Dropping freetype.patch, included upstream.
+  * Updating year in copyright.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 08 Feb 2014 16:45:50 +0100
+
+gfxboot (4.5.1-3.11-5) experimental; urgency=low
+
+  * Merging themes into gfxboot-themes package.
+  * Adding debug package.
+  * Merging gfxboot-examples into gfxboot-dev.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 17 Jan 2014 06:34:36 +0100
+
+gfxboot (4.5.1-3.11-4) experimental; urgency=low
+
+  * Refreshing ttf-dejavue.patch.
+  * Refreshing adddir.patch.
+  * Refreshing freetype.patch.
+  * Updating year in copyright file for 2014.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 17 Jan 2014 06:33:35 +0100
+
+gfxboot (4.5.1-3.11-3) experimental; urgency=low
+
+  * Adding vcs fields.
+  * Wrapping control fields.
+  * Updating to standards version 3.9.5.
+  * Making gfxboot no longer build-depend on itself to compile examples and
+    themes.
+  * Adding patch to update location of freetype headers (Closes: #733384).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 28 Dec 2013 20:20:31 +0100
+
+gfxboot (4.5.1-3.11-2) experimental; urgency=low
+
+  * Adding link to gitorious to source entry in copyright.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 16 Jul 2013 10:18:13 +0200
+
+gfxboot (4.5.1-3.11-1) experimental; urgency=low
+
+  * Merging upstream version 4.5.1-3.11.
+  * Merging gfxboot-examples packaging into src:gfxboot.
+  * Updating years in copyright file.
+  * Using four digits prefix in patch filenames.
+  * Trimming diff header in patches.
+  * Dropping dpkg-source compression levels.
+  * Sorting targets in rules alphabetically.
+  * Moving examples build-tree into subdirectory within local build
+    directory.
+  * Merging gfxboot-themes packaging into src:gfxboot.
+  * Temporarily adding gfxboot-dev to build-depends for building examples
+    and themes until build has been reworked to use local gfxboot of the
+    build itself.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 23 May 2013 07:47:48 +0200
+
+gfxboot (4.5.1-3) unstable; urgency=low
+
+  * Removing all references to my old email address.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 10 Mar 2013 20:31:54 +0100
+
+gfxboot (4.5.1-2) unstable; urgency=low
+
+  * Removing Otavio from uploaders with his consent.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 10 Mar 2013 20:30:16 +0100
+
+gfxboot (4.5.1-1) unstable; urgency=low
+
+  * Merging upstream version 4.5.1.
+  * Updating to standards version 3.9.4.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 10 Dec 2012 12:32:31 +0100
+
+gfxboot (4.5.0-3) unstable; urgency=low
+
+  * Adding patch to update syslinux paths (Closes: #682974).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 27 Jul 2012 17:44:09 +0200
+
+gfxboot (4.5.0-2) unstable; urgency=low
+
+  * Updating GPL boilerplate in copyright file.
+  * Switching to xz compression.
+  * Trimming auto_install override in rules.
+  * Adding patch to avoid overwriting buildflags.
+  * Enabling hardened buildflags.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 29 Jun 2012 18:05:56 +0200
+
+gfxboot (4.5.0-1) unstable; urgency=low
+
+  * Using compression level 9 also for binary packages.
+  * Merging upstream version 4.5.0.
+  * Updating package to debhelper version 9.
+  * Updating to standards version 3.9.3.
+  * Updating years in copyright file.
+  * Updating copyright file to format version 1.0.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 06 Jun 2012 16:17:29 +0200
+
+gfxboot (4.4.3-1) unstable; urgency=low
+
+  * Merging upstream version 4.4.3.
+  * Updating maintainer and uploaders fields.
+  * Removing vcs fields.
+  * Removing references to my old email address.
+  * Makging packaging distribution neutral.
+  * Updating years in copyright file.
+  * Updating to standards version 3.9.2.
+  * Removing leftover README.source.
+  * Compacting copyright file.
+  * Correcting spelling typo in package description, thanks to Simon
+    Kainz <simon@familiekainz.at> (Closes: #636586).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 28 Aug 2011 18:33:56 +0200
+
+gfxboot (4.3.5-2) experimental; urgency=low
+
+  * Adding patch from Colin Watson <cjwatson@ubuntu.com> to fix link
+    order with 'ld --as-needed' (Closes: #605771).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 03 Dec 2010 17:39:02 +0100
+
+gfxboot (4.3.5-1) experimental; urgency=low
+
+  * Merging upstream version 4.3.5.
+  * Updating to debhelper version 8.
+  * Switching to source format 3.0 (quilt).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 20 Nov 2010 17:25:01 +0100
+
+gfxboot (4.3.1-2) experimental; urgency=low
+
+  * Also building on hurd-i386 (Closes: #597273).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 19 Sep 2010 01:41:57 +0200
+
+gfxboot (4.3.1-1) experimental; urgency=low
+
+  * Merging upstream version 4.3.1.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 15 Sep 2010 08:56:15 +0200
+
+gfxboot (4.3.0-1) experimental; urgency=low
+
+  * Merging upstream version 4.3.0.
+  * Updating standards version to 3.9.1.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 14 Aug 2010 22:44:51 +0200
+
+gfxboot (4.2.2-1) unstable; urgency=low
+
+  * Updating standards version to 3.9.0.
+  * Merging upstream version 4.2.2.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 06 Jul 2010 00:31:03 +0200
+
+gfxboot (4.2.1-1) unstable; urgency=low
+
+  * Merging upstream version 4.2.1.
+  * Dropping dump-malloc-screen-size.patch, not required anymore.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 05 Jun 2010 09:45:57 +0200
+
+gfxboot (4.1.47-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.47.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 22 May 2010 15:51:34 +0200
+
+gfxboot (4.1.44-1) unstable; urgency=low
+
+  * Updating year in copyright file.
+  * Updating to standards 3.8.4.
+  * Merging upstream version 4.1.44.
+  * Sorting dh call in rules to common order.
+  * Updating year in copyright file.
+  * Reordering debhelper install files.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 24 Apr 2010 11:30:17 +0200
+
+gfxboot (4.1.41-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.41.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 23 Dec 2009 09:06:26 +0100
+
+gfxboot (4.1.40-4) unstable; urgency=low
+
+  * Adding cpio to depends of gfxboot-dev (Closes: #560625).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 12 Dec 2009 07:46:17 +0100
+
+gfxboot (4.1.40-3) unstable; urgency=low
+
+  * Also building package on kfreebsd-amd64 (Closes: #559403).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 05 Dec 2009 23:03:47 +0100
+
+gfxboot (4.1.40-2) unstable; urgency=low
+
+  * Also building package on kfreebsd-i386 (Closes: #559403).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 04 Dec 2009 08:12:29 +0100
+
+gfxboot (4.1.40-1) unstable; urgency=low
+
+  * Dropping lpia from architectures, lpia is dead.
+  * Merging upstream version 4.1.40.
+  * Updating README.source.
+  * Adding explicit source version 1.0 until switch to 3.0.
+  * Bumping versioned build-depends on quilt.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 27 Nov 2009 15:11:52 +0100
+
+gfxboot (4.1.39-2) unstable; urgency=low
+
+  * Only building on intel architectures, appears to be non-portable
+    otherwise (Closes: #556638).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 17 Nov 2009 12:32:03 +0100
+
+gfxboot (4.1.39-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.39.
+  * Updating debhelper install and links file for newly added gfxtest.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 10 Nov 2009 11:59:36 +0100
+
+gfxboot (4.1.33-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.33.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 21 Oct 2009 08:35:18 +0200
+
+gfxboot (4.1.31-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.31.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 10 Oct 2009 13:01:05 +0200
+
+gfxboot (4.1.30-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.30.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 06 Oct 2009 20:33:33 +0200
+
+gfxboot (4.1.28-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.28.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 02 Oct 2009 19:52:34 +0200
+
+gfxboot (4.1.24-1) unstable; urgency=low
+
+  * Merging upstream version 4.1.24.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 20 Sep 2009 21:14:37 +0200
+
+gfxboot (4.1.19-1) unstable; urgency=low
+
+  * Initial release (Closes: #465768).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 02 Sep 2009 14:24:36 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..e19f18e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,74 @@
+Source: gfxboot
+Section: misc
+Priority: optional
+Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ cpio,
+ nasm,
+ libfreetype6-dev,
+ libhtml-parser-perl,
+ w3m,
+ xmlto,
+Standards-Version: 3.9.5
+Homepage: http://gfxboot.sourceforge.net/
+Vcs-Browser: http://daniel-baumann.ch/gitweb/?p=debian/packages/gfxboot.git
+Vcs-Git: git://daniel-baumann.ch/git/debian/packages/gfxboot.git
+
+Package: gfxboot
+Architecture: any-amd64 any-i386
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends: e2fsprogs
+Suggests: gfxboot-themes, reiserfsprogs, xfsprogs
+Description: tool to test and create graphical boot logos (runtime)
+ gfxboot is a tool to test and create graphical boot logos for gfxboot compliant
+ boot loaders. Currently, this includes grub, lilo, and syslinux (all payloads).
+ .
+ This package contains the runtime utility.
+
+Package: gfxboot-dev
+Architecture: any-amd64 any-i386
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ gfxboot (= ${binary:Version}),
+ cpio,
+ libfribidi0,
+ libhtml-parser-perl,
+Recommends: fonts-dejavu-core | ttf-dejavu-core
+Suggests: gfxboot-themes
+Conflicts: gfxboot-examples
+Replaces: gfxboot-examples
+Description: tool to test and create graphical boot logos (development)
+ gfxboot is a tool to test and create graphical boot logos for gfxboot compliant
+ boot loaders. Currently, this includes grub, lilo, and syslinux (all payloads).
+ .
+ This package contains the development utilities.
+
+Package: gfxboot-themes
+Architecture: all
+Depends:
+ ${misc:Depends},
+ gfxboot (>= ${source:Version}),
+Recommends: gfxboot-dev
+Conflicts:
+ gfxboot-themes-kde,
+ gfxboot-themes-opensuse,
+ gfxboot-themes-sled,
+ gfxboot-themes-sles,
+ gfxboot-themes-upstream,
+Replaces:
+ gfxboot-themes-kde,
+ gfxboot-themes-opensuse,
+ gfxboot-themes-sled,
+ gfxboot-themes-sles,
+ gfxboot-themes-upstream,
+Provides: gfxboot-theme
+Description: tool to test and create graphical boot logos (themes)
+ gfxboot is a tool to test and create graphical boot logos for gfxboot compliant
+ boot loaders. Currently, this includes grub, lilo, and syslinux (all payloads).
+ .
+ This package contains full featured themes (KDE, openSUSE, SLED, SLES, and
+ upstream).
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5c09f5d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,30 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gfxboot
+Upstream-Contact: Steffen Winterfeldt <snwint@suse.de>
+Source: http://software.opensuse.org/package/gfxboot
+        http://gitorious.org/gfxboot
+
+Files: *
+Copyright: 2004-2014 SUSE LINUX Products GmbH
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2009-2014 Daniel Baumann <mail@daniel-baumann.ch>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/gfxboot-dev.docs b/debian/gfxboot-dev.docs
new file mode 100644
index 0000000..73ed4df
--- /dev/null
+++ b/debian/gfxboot-dev.docs
@@ -0,0 +1,2 @@
+doc/*.html
+doc/*.txt
diff --git a/debian/gfxboot-dev.install b/debian/gfxboot-dev.install
new file mode 100644
index 0000000..a2a65cb
--- /dev/null
+++ b/debian/gfxboot-dev.install
@@ -0,0 +1,4 @@
+usr/bin/gfxboot-*	/usr/bin
+usr/bin/gfxtest		/usr/bin
+
+bin/*			/usr/share/gfxboot/bin
diff --git a/debian/gfxboot-dev.links b/debian/gfxboot-dev.links
new file mode 100644
index 0000000..a583d28
--- /dev/null
+++ b/debian/gfxboot-dev.links
@@ -0,0 +1,3 @@
+/usr/share/man/man1/gfxboot.1.gz	/usr/share/man/man1/gfxboot-compile.1.gz
+/usr/share/man/man1/gfxboot.1.gz	/usr/share/man/man1/gfxboot-font.1.gz
+/usr/share/man/man1/gfxboot.1.gz	/usr/share/man/man1/gfxtest.1.gz
diff --git a/debian/gfxboot.install b/debian/gfxboot.install
new file mode 100644
index 0000000..933f588
--- /dev/null
+++ b/debian/gfxboot.install
@@ -0,0 +1 @@
+usr/bin/gfxboot	/usr/bin
diff --git a/debian/patches/0001-asprintf.patch b/debian/patches/0001-asprintf.patch
new file mode 100644
index 0000000..d62750b
--- /dev/null
+++ b/debian/patches/0001-asprintf.patch
@@ -0,0 +1,113 @@
+Author: Colin Watson <cjwatson@debian.org>
+Description:
+ Fix some non-exploitable buffer overflows in mkbootmsg (LP: #27011).
+
+diff -Naurp gfxboot.orig/gfxboot-compile.c gfxboot/gfxboot-compile.c
+--- gfxboot.orig/gfxboot-compile.c
++++ gfxboot/gfxboot-compile.c
+@@ -1765,7 +1765,7 @@ void log_cline(FILE *lf)
+ }
+ 
+ 
+-char *add_to_line(char *s)
++char *add_to_line(const char *s)
+ {
+   static char buf[10240] = {};
+   static int ind = 0;
+@@ -1814,7 +1814,7 @@ void decompile(unsigned char *data, unsi
+   unsigned inst_size;
+   dict_t *d;
+   unsigned type;
+-  char *s, buf[1024];
++  char *s, *buf;
+   unsigned char *p;
+ 
+   // setup initial vocabulary
+@@ -1891,13 +1891,15 @@ void decompile(unsigned char *data, unsi
+         }
+ 
+       case t_unsigned:
+-        sprintf(buf, "%d", val);
++        asprintf(&buf, "%d", val);
+         add_to_line(buf);
++        free(buf);
+         break;
+ 
+       case t_string:
++        buf = malloc(strlen((char *) data + i + u + 1) * 4 + 3);
+         buf[0] = '"';
+-        for(j = 1, p = data + i + u + 1; *p && j < sizeof buf - 10; p++) {
++        for(j = 1, p = data + i + u + 1; *p; p++) {
+           if(*p == '\n') {
+             buf[j++] = '\\';
+             buf[j++] = 'n';
+@@ -1919,16 +1921,18 @@ void decompile(unsigned char *data, unsi
+         buf[j++] = '"';
+         buf[j] = 0;
+         s = add_to_line(buf);
++        free(buf);
+         break;
+ 
+       case t_sec:
+         if(val < dict_size && dict[val].name) {
+-          sprintf(buf, "%s", dict[val].name);
++          asprintf(&buf, "%s", dict[val].name);
+         }
+         else {
+-          sprintf(buf, "name_%d", val);
++          asprintf(&buf, "name_%d", val);
+         }
+         s = add_to_line(buf);
++        free(buf);
+         printf("%s\n", s);
+         add_to_line("");
+         break;
+@@ -1941,38 +1945,42 @@ void decompile(unsigned char *data, unsi
+           }
+         }
+         if(s) {
+-          sprintf(buf, "%s", s);
++          asprintf(&buf, "%s", s);
+         }
+         else {
+-          sprintf(buf, "prim_<%d>", val);
++          asprintf(&buf, "prim_<%d>", val);
+         }
+         s = add_to_line(buf);
++        free(buf);
+         printf("%s\n", s);
+         add_to_line("");
+         break;
+ 
+       case t_bool:
+-        sprintf(buf, "%s", val ? "true" : "false");
++        asprintf(&buf, "%s", val ? "true" : "false");
+         s = add_to_line(buf);
++        free(buf);
+         printf("%s\n", s);
+         add_to_line("");
+         break;
+ 
+       case t_none:
+-        sprintf(buf, ".undef");
++        asprintf(&buf, ".undef");
+         s = add_to_line(buf);
++        free(buf);
+         printf("%s\n", s);
+         add_to_line("");
+         break;
+ 
+       case t_dict_idx:
+         if(val < dict_size && dict[val].name) {
+-          sprintf(buf, "/%s", dict[val].name);
++          asprintf(&buf, "/%s", dict[val].name);
+         }
+         else {
+-          sprintf(buf, "/name_%d", val);
++          asprintf(&buf, "/name_%d", val);
+         }
+         add_to_line(buf);
++        free(buf);
+         break;
+ 
+       default:
diff --git a/debian/patches/0002-ctype.patch b/debian/patches/0002-ctype.patch
new file mode 100644
index 0000000..aa8f231
--- /dev/null
+++ b/debian/patches/0002-ctype.patch
@@ -0,0 +1,26 @@
+Author: Colin Watson <cjwatson@debian.org>
+Description:
+ Make sure to pass unsigned chars to isspace(), per the C standard; not doing so
+ can cause problems on powerpc and other architectures.
+
+diff -Naurp gfxboot.orig/gfxboot-compile.c gfxboot/gfxboot-compile.c
+--- gfxboot.orig/gfxboot-compile.c
++++ gfxboot/gfxboot-compile.c
+@@ -658,7 +658,7 @@ char *next_word(char **ptr)
+ 
+   *word = 0;
+ 
+-  while(isspace(*s)) if(*s++ == '\n') line++;
++  while(isspace((unsigned char) *s)) if(*s++ == '\n') line++;
+ 
+   if(!*s) {
+     *ptr = s;
+@@ -757,7 +757,7 @@ char *next_word(char **ptr)
+     word[n] = 0;
+   }
+   else {
+-    while(!isspace(*s)) s++;
++    while(!isspace((unsigned char) *s)) s++;
+   }
+ 
+   if(!is_str) {
diff --git a/debian/patches/0003-bdf.patch b/debian/patches/0003-bdf.patch
new file mode 100644
index 0000000..428e153
--- /dev/null
+++ b/debian/patches/0003-bdf.patch
@@ -0,0 +1,15 @@
+Author: Colin Watson <cjwatson@ubuntu.com>
+Description: Try .bdf files in gfxboot-font.
+
+diff -Naurp gfxboot.orig/gfxboot-font.c gfxboot/gfxboot-font.c
+--- gfxboot.orig/gfxboot-font.c
++++ gfxboot/gfxboot-font.c
+@@ -845,7 +845,7 @@ char *search_font(char *font_path, char 
+   char *font_name = NULL;
+   char *cur_path, *sep;
+   struct stat sbuf;
+-  static char *suffix[] = { "", ".ttf", ".pfa", ".pfb", ".pcf.gz" };
++  static char *suffix[] = { "", ".ttf", ".pfa", ".pfb", ".pcf.gz", ".bdf" };
+ 
+   if(!font_path || !name) return NULL;
+ 
diff --git a/debian/patches/0004-link-order.patch b/debian/patches/0004-link-order.patch
new file mode 100644
index 0000000..9bb7504
--- /dev/null
+++ b/debian/patches/0004-link-order.patch
@@ -0,0 +1,15 @@
+Author: Colin Watson <cjwatson@ubuntu.com>
+Description: Fix link order with 'ld --as-needed' (Closes: #605771).
+
+diff -Naurp gfxboot.orig/Makefile gfxboot/Makefile
+--- gfxboot.orig/Makefile
++++ gfxboot/Makefile
+@@ -17,7 +17,7 @@ changelog: $(GITDEPS)
+ 	$(GIT2LOG) --changelog changelog
+ 
+ gfxboot-font: gfxboot-font.c
+-	$(CC) $(CFLAGS) -I /usr/include/freetype2 -lfreetype $< -o $@
++	$(CC) $(CFLAGS) -I /usr/include/freetype2 $< -lfreetype -o $@
+ 
+ gfxboot-compile: gfxboot-compile.c vocabulary.h bincode.h
+ 	$(CC) $(CFLAGS) $< -o $@
diff --git a/debian/patches/0005-buildflags.patch b/debian/patches/0005-buildflags.patch
new file mode 100644
index 0000000..e06391c
--- /dev/null
+++ b/debian/patches/0005-buildflags.patch
@@ -0,0 +1,13 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Avoid overwriting buildflags.
+
+diff -Naurp gfxboot.orig/Makefile gfxboot/Makefile
+--- gfxboot.orig/Makefile
++++ gfxboot/Makefile
+@@ -1,5 +1,5 @@
+ CC	 = gcc
+-CFLAGS	 = -g -Wall -Wno-pointer-sign -O2 -fomit-frame-pointer
++#CFLAGS	 = -g -Wall -Wno-pointer-sign -O2 -fomit-frame-pointer
+ 
+ GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi)
+ GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags)
diff --git a/debian/patches/0006-syslinux-path.patch b/debian/patches/0006-syslinux-path.patch
new file mode 100644
index 0000000..5cd0e68
--- /dev/null
+++ b/debian/patches/0006-syslinux-path.patch
@@ -0,0 +1,69 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Updating syslinux paths (Closes: #682974).
+
+diff -Naurp gfxboot.orig/gfxboot gfxboot/gfxboot
+--- gfxboot.orig/gfxboot
++++ gfxboot/gfxboot
+@@ -989,9 +989,9 @@ my @vm_order = qw ( qemu64 qemu32 qemu q
+ my %bl_list = (
+   grub     => '/usr/sbin/grub',
+   lilo     => '/sbin/lilo',
+-  isolinux => '/usr/share/syslinux/isolinux.bin',
++  isolinux => '/usr/lib/syslinux/isolinux.bin',
+   syslinux => '/usr/bin/syslinux',
+-  pxelinux => '/usr/share/syslinux/pxelinux.0',
++  pxelinux => '/usr/lib/syslinux/pxelinux.0',
+   bd       => '/usr/bin/bd',
+   bochs    => '/usr/bin/bochs',
+ );
+@@ -1793,8 +1793,8 @@ sub prepare_isolinux
+   $arch_dir = 'i386';
+   $arch_dir = 'x86_64' if $opt_64 && !$opt_32;
+ 
+-  $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32";
+-  $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot;
++  $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32";
++  $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot;
+   $comboot = 0 unless -f $comboot;
+ 
+   my $menu = fake_menu 'install';
+@@ -1864,7 +1864,7 @@ sub prepare_isolinux
+     close F;
+   }
+ 
+-  system "cp $opt_syslinux/usr/share/syslinux/isolinux.bin $dst/$loader" and die "error: no isolinux\n";
++  system "cp $opt_syslinux/usr/lib/syslinux/isolinux.bin $dst/$loader" and die "error: no isolinux\n";
+   system "cp $comboot $dst/$loader" if $comboot;
+ 
+   for (@opt_test_addfiles) {
+@@ -1908,8 +1908,8 @@ sub prepare_syslinux
+ 
+   die "error: syslinux not found\n" unless -f "$opt_syslinux/$bl_list{syslinux}";
+ 
+-  $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32";
+-  $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot;
++  $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32";
++  $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot;
+   $comboot = 0 unless -f $comboot;
+ 
+   my $menu = fake_menu 'install';
+@@ -2022,8 +2022,8 @@ sub prepare_pxelinux
+   $arch_dir = 'i386';
+   $arch_dir = 'x86_64' if $opt_64 && !$opt_32;
+ 
+-  $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32";
+-  $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot;
++  $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32";
++  $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot;
+   $comboot = 0 unless -f $comboot;
+ 
+   my $menu = fake_menu 'install';
+@@ -2093,7 +2093,7 @@ sub prepare_pxelinux
+     close F;
+   }
+ 
+-  system "cp $opt_syslinux/usr/share/syslinux/pxelinux.0 $dst/$loader" and die "error: no pxelinux\n";
++  system "cp $opt_syslinux/usr/lib/syslinux/pxelinux.0 $dst/$loader" and die "error: no pxelinux\n";
+   system "cp $comboot $dst/$loader" if $comboot;
+ 
+   for (@opt_test_addfiles) {
diff --git a/debian/patches/0007-ttf-dejavu.patch b/debian/patches/0007-ttf-dejavu.patch
new file mode 100644
index 0000000..0a6d9a0
--- /dev/null
+++ b/debian/patches/0007-ttf-dejavu.patch
@@ -0,0 +1,80 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description:
+ gfxboot expects fonts to be in /usr/share/fonts/truetype et al,
+ not in subdirectories within like debian based systems do.
+ .
+ The proper fix is to make search_font() in gfxboot-font recursive,
+ however, for the time being we add the paths manually here.
+
+diff -Naurp gfxboot.orig/themes/example_02/Makefile gfxboot/themes/example_02/Makefile
+--- gfxboot.orig/themes/example_02/Makefile
++++ gfxboot/themes/example_02/Makefile
+@@ -16,7 +16,7 @@ bootlogo: example_*.bc font
+ 	$(GFXBOOT) --archive $@.dir --pack-archive $@
+ 
+ font:
+-	$(GFXBOOT_FONT) -v -f DejaVuSans:size=20 font.fnt >font.log
++	$(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=20 font.fnt >font.log
+ 
+ clean:
+ 	rm -rf *~ *.log *.dir bootlogo *.fnt
+diff -Naurp gfxboot.orig/themes/example_03/Makefile gfxboot/themes/example_03/Makefile
+--- gfxboot.orig/themes/example_03/Makefile
++++ gfxboot/themes/example_03/Makefile
+@@ -16,7 +16,7 @@ bootlogo: example_*.bc font
+ 	$(GFXBOOT) --archive $@.dir --pack-archive $@
+ 
+ font:
+-	$(GFXBOOT_FONT) -v -f DejaVuSans:size=20 font.fnt >font.log
++	$(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=20 font.fnt >font.log
+ 
+ clean:
+ 	rm -rf *~ *.log *.dir bootlogo *.fnt
+diff -Naurp gfxboot.orig/themes/example_04/Makefile gfxboot/themes/example_04/Makefile
+--- gfxboot.orig/themes/example_04/Makefile
++++ gfxboot/themes/example_04/Makefile
+@@ -16,7 +16,7 @@ bootlogo: example_*.bc font
+ 	$(GFXBOOT) --archive $@.dir --pack-archive $@
+ 
+ font:
+-	$(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log
++	$(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log
+ 
+ clean:
+ 	rm -rf *~ *.log *.dir bootlogo *.fnt
+diff -Naurp gfxboot.orig/themes/example_05/Makefile gfxboot/themes/example_05/Makefile
+--- gfxboot.orig/themes/example_05/Makefile
++++ gfxboot/themes/example_05/Makefile
+@@ -16,7 +16,7 @@ bootlogo: example_*.bc font
+ 	$(GFXBOOT) --archive $@.dir --pack-archive $@
+ 
+ font:
+-	$(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log
++	$(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log
+ 
+ clean:
+ 	rm -rf *~ *.log *.dir bootlogo *.fnt
+diff -Naurp gfxboot.orig/themes/example_06/Makefile gfxboot/themes/example_06/Makefile
+--- gfxboot.orig/themes/example_06/Makefile
++++ gfxboot/themes/example_06/Makefile
+@@ -20,7 +20,7 @@ bootlogo: example_*.bc font
+ 	@ln -snf bootlogo message
+ 
+ font:
+-	$(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log
++	$(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log
+ 
+ clean:
+ 	rm -rf *~ *.log *.dir bootlogo message *.fnt
+diff -Naurp gfxboot.orig/themes/example_07/Makefile gfxboot/themes/example_07/Makefile
+--- gfxboot.orig/themes/example_07/Makefile
++++ gfxboot/themes/example_07/Makefile
+@@ -20,7 +20,7 @@ bootlogo: example_*.bc font
+ 	@ln -snf bootlogo message
+ 
+ font:
+-	$(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log
++	$(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log
+ 
+ clean:
+ 	rm -rf *~ *.log *.dir bootlogo message *.fnt
diff --git a/debian/patches/0008-adddir.patch b/debian/patches/0008-adddir.patch
new file mode 100644
index 0000000..ee6b4a1
--- /dev/null
+++ b/debian/patches/0008-adddir.patch
@@ -0,0 +1,17 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description:
+ Replacing adddir location with absolute name in order to allow to compile the
+ themes from any location, not just /usr/share/gfxboot/themes/foo.
+
+diff -Naurp gfxboot.orig/themes/openSUSE/Makefile gfxboot/themes/openSUSE/Makefile
+--- gfxboot.orig/themes/openSUSE/Makefile
++++ gfxboot/themes/openSUSE/Makefile
+@@ -8,7 +8,7 @@ else
+ PREPARED     = $(shell [ -f .prepared ] && echo 1)
+ endif
+ 
+-ADDDIR       = ../../bin/adddir
++ADDDIR       ?= /usr/share/gfxboot/bin/adddir
+ BFLAGS       = -O -v -L ../..
+ 
+ SUBDIRS      = fonts help-boot help-install po src
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6472786
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+0001-asprintf.patch
+0002-ctype.patch
+0003-bdf.patch
+0004-link-order.patch
+0005-buildflags.patch
+0006-syslinux-path.patch
+0007-ttf-dejavu.patch
+0008-adddir.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..70fa8d1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,96 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+SHELL := sh -e
+
+GFXBOOT_PATH = $(CURDIR)
+
+%:
+	dh ${@} --parallel
+
+override_dh_auto_build:
+	dh_auto_build -- CFLAGS="$(CFLAGS) $(CPPFLAGS)"
+
+	$(MAKE) -C doc doc
+
+	# gfxboot-dev
+	mkdir -p build/examples
+	cp -aL themes/example* build/examples
+
+	for _THEME in $$(cd build/examples && ls); \
+	do \
+		PATH=$(GFXBOOT_PATH):$${PATH} ADDDIR=$(GFXBOOT_PATH)/bin/adddir $(MAKE) -C build/examples/$${_THEME}; \
+	done
+
+	# gfxboot-themes
+	mkdir -p build
+	cp -aL themes build/themes
+	rm -rf build/themes/example*
+
+	PATH=$(GFXBOOT_PATH):$${PATH} ADDDIR=$(GFXBOOT_PATH)/bin/adddir $(MAKE) -C build/themes/openSUSE/help-install
+	PATH=$(GFXBOOT_PATH):$${PATH} ADDDIR=$(GFXBOOT_PATH)/bin/adddir $(MAKE) -C build/themes/openSUSE
+
+	for _THEME in $$(cd build/themes && ls); \
+	do \
+		if [ "$${_THEME}" != "openSUSE" ]; \
+		then \
+			PATH=$(GFXBOOT_PATH):$${PATH} ADDDIR=$(GFXBOOT_PATH)/bin/adddir $(MAKE) -C build/themes/$${_THEME}; \
+		fi; \
+	done
+
+override_dh_auto_clean:
+	dh_auto_clean
+
+	$(MAKE) -C doc clean
+
+	rm -rf build
+
+override_dh_auto_install:
+	dh_auto_install
+
+	install -D -m 0644 doc/gfxboot.8 debian/gfxboot/usr/share/man/man1/gfxboot.1
+
+	# Correcting program location
+	mv debian/tmp/usr/sbin debian/tmp/usr/bin
+	sed -i -e 's|^.TH GFXBOOT 8|.TH GFXBOOT 1|' debian/gfxboot/usr/share/man/man1/gfxboot.1
+
+	# Removing useless files
+	rm -rf debian/tmp/etc
+
+	# gfxboot-dev
+	for _THEME in $$(cd build/examples && ls); \
+	do \
+		install -D -m 0644 build/examples/$${_THEME}/bootlogo debian/gfxboot-dev/etc/bootsplash/$${_THEME}/cdrom/bootlogo; \
+		$(GFXBOOT_PATH)/bin/unpack_bootlogo debian/gfxboot-dev/etc/bootsplash/$${_THEME}/cdrom; \
+		mkdir -p debian/gfxboot-dev/usr/share/gfxboot/themes/$${_THEME}; \
+		cp -aL themes/$${_THEME}/* debian/gfxboot-dev/usr/share/gfxboot/themes/$${_THEME}; \
+	done
+
+	# gfxboot-themes
+	mkdir -p debian/gfxboot-themes/usr/share/gfxboot/themes
+
+	for _THEME in $$(cd build/themes && ls); \
+	do \
+		cp -aL build/themes/$${_THEME} debian/gfxboot-themes/usr/share/gfxboot/themes; \
+		cp -aL themes/openSUSE/Makefile debian/gfxboot-themes/usr/share/gfxboot/themes/$${_THEME}/Makefile; \
+		rm -f debian/gfxboot-themes/usr/share/gfxboot/themes/$${_THEME}/Makefile; \
+		install -D -m 0644 build/themes/$${_THEME}/bootlogo debian/gfxboot-themes/etc/bootsplash/themes/$${_THEME}/cdrom/bootlogo; \
+		$(GFXBOOT_PATH)/bin/unpack_bootlogo debian/gfxboot-themes/etc/bootsplash/themes/$${_THEME}/cdrom; \
+		mkdir -p debian/gfxboot-themes/etc/bootsplash/themes/$${_THEME}/bootloader; \
+		cp -aL build/themes/$${_THEME}/message build/themes/$${_THEME}/help-boot/*.hlp build/themes/$${_THEME}/po/*.tr debian/gfxboot-themes/etc/bootsplash/themes/$${_THEME}/bootloader; \
+	done
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
+override_dh_fixperms:
+	dh_fixperms
+
+	find . debian -name "*.xcf" | xargs chmod 0644
+
+override_dh_install:
+	dh_install --fail-missing
+
+override_dh_strip:
+	dh_strip --dbgsym-migration='gfxboot-dbg (<< 4.5.2-1.1-6~)'
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..5bd47b7
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+compression = xz
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b12b9bd
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/gfxboot-$1\.tar\.gz/ \
+  https://github.com/OpenSUSE/gfxboot/tags .*/v?(\d\S+)\.tar\.gz