diff -Nru simple-ccsm-0.8.2/debian/changelog simple-ccsm-0.8.2/debian/changelog
--- simple-ccsm-0.8.2/debian/changelog	2011-08-30 15:56:53.000000000 +0200
+++ simple-ccsm-0.8.2/debian/changelog	2011-08-30 15:18:45.000000000 +0200
@@ -1,3 +1,12 @@
+simple-ccsm (0.8.2-0ubuntu2) oneiric; urgency=low
+
+  * Converted package to "3.0 (quilt)" format
+  * Dropped use of langpack.mk from cdbs - LP: #835743
+  * Dropped use of "Compiz" category from .desktop file
+  * Added build dependency on Python (lintian complained)
+
+ -- Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>  Tue, 30 Aug 2011 13:59:43 +0200
+
 simple-ccsm (0.8.2-0ubuntu1) jaunty; urgency=low
 
   * New upstream reeleas 
diff -Nru simple-ccsm-0.8.2/debian/control simple-ccsm-0.8.2/debian/control
--- simple-ccsm-0.8.2/debian/control	2011-08-30 15:56:53.000000000 +0200
+++ simple-ccsm-0.8.2/debian/control	2011-08-30 14:22:02.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Michael Vogt <mvo@ubuntu.com>
 XS-Python-Version: all
-Build-Depends: cdbs, debhelper (>= 5.0.51), pkg-config, python-central, intltool, python-compizconfig 
+Build-Depends: cdbs, debhelper (>= 5.0.51), pkg-config, python-central, intltool, python-compizconfig, python
 Standards-Version: 3.8.0
 Vcs-Bzr: http://code.launchpad.net/~compiz/simple-ccsm/ubuntu/
 
diff -Nru simple-ccsm-0.8.2/debian/patches/02_drop_compiz_category_from_desktop_file.patch simple-ccsm-0.8.2/debian/patches/02_drop_compiz_category_from_desktop_file.patch
--- simple-ccsm-0.8.2/debian/patches/02_drop_compiz_category_from_desktop_file.patch	1970-01-01 01:00:00.000000000 +0100
+++ simple-ccsm-0.8.2/debian/patches/02_drop_compiz_category_from_desktop_file.patch	2011-08-30 14:19:44.000000000 +0200
@@ -0,0 +1,12 @@
+Description: Drop Compiz category from .desktop file
+
+--- simple-ccsm-0.8.2.orig/simple-ccsm.desktop.in
++++ simple-ccsm-0.8.2/simple-ccsm.desktop.in
+@@ -6,6 +6,6 @@ Icon=simple-ccsm
+ Exec=simple-ccsm
+ Terminal=false
+ Type=Application
+-Categories=Compiz;Settings;DesktopSettings;
++Categories=Settings;DesktopSettings;
+ StartupNotify=true
+ NotShowIn=KDE;
diff -Nru simple-ccsm-0.8.2/debian/patches/series simple-ccsm-0.8.2/debian/patches/series
--- simple-ccsm-0.8.2/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ simple-ccsm-0.8.2/debian/patches/series	2011-08-30 15:15:52.000000000 +0200
@@ -0,0 +1,2 @@
+01_remove_prefix_mangling.patch
+02_drop_compiz_category_from_desktop_file.patch
diff -Nru simple-ccsm-0.8.2/debian/rules simple-ccsm-0.8.2/debian/rules
--- simple-ccsm-0.8.2/debian/rules	2011-08-30 15:56:53.000000000 +0200
+++ simple-ccsm-0.8.2/debian/rules	2011-08-30 15:16:37.000000000 +0200
@@ -4,9 +4,10 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/langpack.mk
 
 binary-install/simple-ccsm::
-	dh_pycentral
 	dh_icons
+
+clean::
+	rm -rf build
+	rm -f simple-ccsm.desktop installed_files
diff -Nru simple-ccsm-0.8.2/debian/source/format simple-ccsm-0.8.2/debian/source/format
--- simple-ccsm-0.8.2/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ simple-ccsm-0.8.2/debian/source/format	2011-08-30 14:05:27.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru simple-ccsm-0.8.2/simple-ccsm.desktop simple-ccsm-0.8.2/simple-ccsm.desktop
--- simple-ccsm-0.8.2/simple-ccsm.desktop	2011-08-30 15:56:53.000000000 +0200
+++ simple-ccsm-0.8.2/simple-ccsm.desktop	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Simple CompizConfig Settings Manager
-Name[de]=Einfacher CompizConfig Einstellungs-Manager
-Name[fi]=Yksinkertainen Compiz-asetusten hallinta
-Name[gl]=Xestor de Configuración Sinxelo de Compiz
-Name[hu]=Egyszerűsített Compiz beállításkezelő
-Name[it]=Gestore configurazione CompizConfig semplice
-Name[ja]=簡易版 CompizConfig 設定マネージャ
-Name[pt]=Gestor Simples de Configuração do Compiz
-Name[ru]=Простой менеджер настройки CompizConfig
-Comment=Configure Compiz with CompizConfig
-Comment[de]=Konfiguriere Compiz mit CompizConfig
-Comment[es]=Configurar Compiz con CompizConfig
-Comment[fi]=Compiz-asetusten hallinta CompizConfigilla
-Comment[gl]=Configurar Compiz con CompizConfig
-Comment[hu]=A Compiz beállítása a CompizConfiggal
-Comment[it]=Configura Compiz attraverso CompizConfig
-Comment[ja]=CompizConfig で Compiz の設定
-Comment[pt]=Configurar Compiz com CompizConfig
-Comment[ru]=Настроить Compiz с помощью CompizConfig
-Comment[zh_CN]=用 CompizConfig 配置 Compiz
-Icon=simple-ccsm
-Exec=simple-ccsm
-Terminal=false
-Type=Application
-Categories=Compiz;Settings;DesktopSettings;
-StartupNotify=true
-NotShowIn=KDE;