diff -u cdrkit-1.1.11/debian/changelog cdrkit-1.1.11/debian/changelog
--- cdrkit-1.1.11/debian/changelog
+++ cdrkit-1.1.11/debian/changelog
@@ -1,3 +1,41 @@
+cdrkit (9:1.1.11-3ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - debian/wodim.links: Add symlink to /usr/bin/cdrecord.
+    - debian/genisoimage.links: Add symlink to /usr/bin/mkisofs.
+    - debian/icedax.links: Add symlink to /usr/bin/cdda2wav.
+    - debian/control:
+      - Add Provides: cdrecord to binary package wodim.
+      - Add Provides: mkisofs to binary package genisoimage.
+      - Add Provides: cdda2wav to binary package icedax.
+      - Remove all version strings from conflicts/replaces in wodim,
+        genisoimage and icedax for the respective cdrtools binary package
+        names.
+    - debian/wodim.preinst: Add "7a4383a7c0995736dee9d646b0724d08" to the
+      md5sums of unchanged config files (that is the dapper one).
+    - Introduce alternatives system for the scripts and manpages "cdda2mp3"
+      and "cdda2ogg".
+    - Apply Fedora patch by Peter Jones to add EFI boot support.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 24 Nov 2014 13:49:10 +0000
+
+cdrkit (9:1.1.11-3) unstable; urgency=medium
+
+  * Fix FTBFS on kfreebsd-*. Closes: #754642. kfreebsd-* now includes a
+    <sys/capability.h> which is not compatible with the same file on
+    linux, and nor does it imply -lcap will work. Fix the detection code
+    to cope with this.
+
+ -- Steve McIntyre <93sam@debian.org>  Tue, 22 Jul 2014 00:56:34 +0100
+
+cdrkit (9:1.1.11-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * geteltorito.pl: update to version 0.5, fixing the bug that prevent it
+    to work with hdd images (Closes: #648935, #611784)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 18 Jun 2014 12:02:31 +0200
+
 cdrkit (9:1.1.11-2ubuntu3) quantal; urgency=low
 
   * Rebuild for new armel compiler default of ARMv5t.
only in patch2:
unchanged:
--- cdrkit-1.1.11.orig/wodim/CMakeLists.txt
+++ cdrkit-1.1.11/wodim/CMakeLists.txt
@@ -10,14 +10,14 @@
 INCLUDE(CheckIncludeFiles)
 
 #force libcap usage on Linux
-CHECK_INCLUDE_FILES("sys/capability.h" HAVE_SYS_CAPABILITY_H)
-IF(HAVE_SYS_CAPABILITY_H)
-	LIST(APPEND EXTRA_LIBS cap)
-ELSE(HAVE_SYS_CAPABILITY_H)
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-      MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
-   ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-ENDIF(HAVE_SYS_CAPABILITY_H)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    CHECK_INCLUDE_FILES("sys/capability.h" HAVE_SYS_CAPABILITY_H)
+    IF(HAVE_SYS_CAPABILITY_H)
+        LIST(APPEND EXTRA_LIBS cap)
+    ELSE(HAVE_SYS_CAPABILITY_H)
+        MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
+    ENDIF(HAVE_SYS_CAPABILITY_H)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 LINK_DIRECTORIES(../librols ../libusal  ../libedc)