Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
please unblock version 1.11.0-3 of package wimlib. It fixes an RC bug,
#863397, which prevented mkwinpeimg from creating bootable WinPE images.
The debdiff between 1.11.0-1 and 1.11.0-3 is attached.
Cheers,
-Hilko
diff -Nru wimlib-1.11.0/debian/changelog wimlib-1.11.0/debian/changelog
--- wimlib-1.11.0/debian/changelog 2017-01-23 20:43:59.000000000 +0100
+++ wimlib-1.11.0/debian/changelog 2017-05-26 20:02:14.000000000 +0200
@@ -1,3 +1,16 @@
+wimlib (1.11.0-3) unstable; urgency=medium
+
+ * Remove x32 FTBFS patch (#814138), it is no longer needed.
+
+ -- Hilko Bengen <ben...@debian.org> Fri, 26 May 2017 20:02:14 +0200
+
+wimlib (1.11.0-2) unstable; urgency=medium
+
+ * Add patch to fix syslinux module directory (Closes: #863397)
+ * Add ifdef fix to enable building on x32 (Closes: #814138)
+
+ -- Hilko Bengen <ben...@debian.org> Fri, 26 May 2017 19:34:25 +0200
+
wimlib (1.11.0-1) unstable; urgency=medium
* New upstream version 1.11.0
diff -Nru wimlib-1.11.0/debian/patches/0002-Disable-FUSE-related-tests.patch wimlib-1.11.0/debian/patches/0002-Disable-FUSE-related-tests.patch
--- wimlib-1.11.0/debian/patches/0002-Disable-FUSE-related-tests.patch 2017-01-23 20:43:53.000000000 +0100
+++ wimlib-1.11.0/debian/patches/0002-Disable-FUSE-related-tests.patch 2017-05-26 19:33:27.000000000 +0200
@@ -7,10 +7,10 @@
1 file changed, 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index f630cf7..82af948 100644
+index 8d0b6cf..a09bd43 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -325,14 +325,6 @@ dist_check_SCRIPTS = tests/test-imagex \
+@@ -326,14 +326,6 @@ dist_check_SCRIPTS = tests/test-imagex \
tests/test-imagex-capture_and_apply \
tests/test-imagex-update_and_extract
diff -Nru wimlib-1.11.0/debian/patches/0003-mkwinpeimg-Fix-syslinux-modules-directory.patch wimlib-1.11.0/debian/patches/0003-mkwinpeimg-Fix-syslinux-modules-directory.patch
--- wimlib-1.11.0/debian/patches/0003-mkwinpeimg-Fix-syslinux-modules-directory.patch 1970-01-01 01:00:00.000000000 +0100
+++ wimlib-1.11.0/debian/patches/0003-mkwinpeimg-Fix-syslinux-modules-directory.patch 2017-05-26 19:33:27.000000000 +0200
@@ -0,0 +1,21 @@
+From: Hilko Bengen <ben...@debian.org>
+Date: Fri, 26 May 2017 19:21:01 +0200
+Subject: mkwinpeimg: Fix syslinux modules directory
+
+---
+ programs/mkwinpeimg.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/programs/mkwinpeimg.in b/programs/mkwinpeimg.in
+index 42b4779..4d7eee6 100755
+--- a/programs/mkwinpeimg.in
++++ b/programs/mkwinpeimg.in
+@@ -485,7 +485,7 @@ make_disk_img() {
+
+ syslinux --install "$image"
+
+- syslinuxdir="/usr/lib/syslinux"
++ syslinuxdir="/usr/lib/syslinux/modules"
+
+ if [ -d "$syslinuxdir/bios" ]; then
+ biosdir="$syslinuxdir/bios"
diff -Nru wimlib-1.11.0/debian/patches/series wimlib-1.11.0/debian/patches/series
--- wimlib-1.11.0/debian/patches/series 2017-01-23 20:43:46.000000000 +0100
+++ wimlib-1.11.0/debian/patches/series 2017-05-26 20:01:02.000000000 +0200
@@ -1,2 +1,3 @@
0001-Fix-mkntfs-path.patch
0002-Disable-FUSE-related-tests.patch
+0003-mkwinpeimg-Fix-syslinux-modules-directory.patch
