diff -Nru pcl-1.1-1.1.1/debian/changelog pcl-1.1-1.1.1/debian/changelog
--- pcl-1.1-1.1.1/debian/changelog	2011-08-31 21:24:55.000000000 +0000
+++ pcl-1.1-1.1.1/debian/changelog	2011-10-01 22:07:48.000000000 +0000
@@ -1,3 +1,9 @@
+pcl-1.1 (1.1.1-1+natty2) natty; urgency=low
+
+  * Adapted conflicts to new pcl-1.0 package.
+
+ -- Jochen Sprickerhof <launchpad@jochen.sprickerhof.de>  Sat, 01 Oct 2011 23:56:10 +0200
+
 pcl-1.1 (1.1.1-1+natty1) natty; urgency=low
 
   * New upstream release.
diff -Nru pcl-1.1-1.1.1/debian/control pcl-1.1-1.1.1/debian/control
--- pcl-1.1-1.1.1/debian/control	2011-08-31 21:19:51.000000000 +0000
+++ pcl-1.1-1.1.1/debian/control	2011-10-01 21:56:03.000000000 +0000
@@ -12,7 +12,7 @@
 Section: libdevel
 Architecture: any
 Depends: libpcl-1.1 (= ${binary:Version}), cmake, libeigen3-dev, libflann-dev, libcminpack-dev, libvtk5-dev, libqhull-dev, openni-dev, libusb-1.0-0-dev, libboost1.42-all-dev, libwxgtk2.8-dev
-Conflicts: libpcl-dev
+Conflicts: libpcl-1.0-dev
 Description: The Point Cloud Library (or PCL) for point cloud processing - development
  The PCL framework contains numerous state-of-the art algorithms including
  filtering, feature estimation, surface reconstruction, registration, model
@@ -24,7 +24,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libpcl-bin
+Conflicts: libpcl-1.0-bin
 Description: The Point Cloud Library (or PCL) for point cloud processing - runtime
  The PCL framework contains numerous state-of-the art algorithms including
  filtering, feature estimation, surface reconstruction, registration, model
diff -Nru pcl-1.1-1.1.1/debian/libpcl-1.1-bin.dirs pcl-1.1-1.1.1/debian/libpcl-1.1-bin.dirs
--- pcl-1.1-1.1.1/debian/libpcl-1.1-bin.dirs	2011-07-19 09:49:52.000000000 +0000
+++ pcl-1.1-1.1.1/debian/libpcl-1.1-bin.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/bin
diff -Nru pcl-1.1-1.1.1/debian/libpcl-1.1-dev.dirs pcl-1.1-1.1.1/debian/libpcl-1.1-dev.dirs
--- pcl-1.1-1.1.1/debian/libpcl-1.1-dev.dirs	2011-07-19 10:31:41.000000000 +0000
+++ pcl-1.1-1.1.1/debian/libpcl-1.1-dev.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share
diff -Nru pcl-1.1-1.1.1/debian/libpcl-1.1.dirs pcl-1.1-1.1.1/debian/libpcl-1.1.dirs
--- pcl-1.1-1.1.1/debian/libpcl-1.1.dirs	2011-07-19 09:49:52.000000000 +0000
+++ pcl-1.1-1.1.1/debian/libpcl-1.1.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib