diff -Nru cpm-0.32/debian/changelog cpm-0.32/debian/changelog
--- cpm-0.32/debian/changelog	2014-10-06 18:17:26.000000000 +0800
+++ cpm-0.32/debian/changelog	2015-10-18 23:15:36.000000000 +0800
@@ -1,3 +1,11 @@
+cpm (0.32-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs due to cdk.h moved from /usr/include/cdk to /usr/include
+    (Closes: #802221) 
+
+ -- YunQiang Su <syq@debian.org>  Sun, 18 Oct 2015 23:14:34 +0800
+
 cpm (0.32-1) unstable; urgency=medium
 
   * Imported upstream release 0.32
diff -Nru cpm-0.32/debian/patches/cdk_h.diff cpm-0.32/debian/patches/cdk_h.diff
--- cpm-0.32/debian/patches/cdk_h.diff	2015-10-18 22:17:57.000000000 +0800
+++ cpm-0.32/debian/patches/cdk_h.diff	2015-10-18 22:33:28.000000000 +0800
@@ -2,11 +2,7 @@
 ===================================================================
 --- a/configure.in
 +++ b/configure.in
-@@ -287,10 +287,11 @@ fi
- # ------------------------------------------------------------------------------
- # we check if we can use this CDK version
- CDK_H=`${CC} ${CFLAGS} ${CPPFLAGS} -D_FILE_OFFSET_BITS=64 -M -MG interface_gui.c | perl -e 'while (<>) { $_ =~ s/^.*://; $_ =~ s/^\\s+//; $_ =~ s/\\\\//; $_ =~ s/\\s+$//; @tmp = split(/ /, $_); while (@tmp) { $file = shift(@tmp); if ($file =~ m:/cdk\\.h$:) { print "$file\\n"; } } }' | sort | uniq`
-+echo "${CC} ${CFLAGS} ${CPPFLAGS} -D_FILE_OFFSET_BITS=64 -M -MG interface_gui.c | perl -e 'while (<>) { $_ =~ s/^.*://; $_ =~ s/^\\s+//; $_ =~ s/\\\\//; $_ =~ s/\\s+$//; @tmp = split(/ /, $_); while (@tmp) { $file = shift(@tmp); if ($file =~ m:/cdk\\.h$:) { print "$file\\n"; } } }' | sort | uniq"
+@@ -290,7 +290,7 @@ CDK_H=`${CC} ${CFLAGS} ${CPPFLAGS} -D_FI
  # recent cdk.h are in /usr/include/cdk.h not /usr/include/cdk/cdk.h
  if ! ( test -n "$CDK_H" &&  -f ${CDK_H} )
  then