NEWS | 16 VERSION | 2 ccm/Conflicts.py | 11 ccm/Constants.py.in | 9 ccm/Pages.py | 81 ccm/Settings.py | 75 ccm/Utils.py | 29 ccm/Widgets.py | 44 ccm/Window.py | 2 ccsm | 20 debian/changelog | 25 debian/compat | 2 debian/control | 12 debian/docs | 1 debian/install | 7 debian/patches/01-fix-extension-dir.patch | 18 debian/patches/desktop-file-category | 9 debian/patches/invalid_desktop_category.patch | 9 debian/patches/pygtk-breakage-workaround.patch | 9 debian/patches/remove-python-shebangs | 49 debian/patches/series | 5 debian/pyversions | 1 debian/rules | 82 debian/source/format | 1 debian/source/local-options | 2 debian/watch | 4 images/22x22/apps/ccsm.png |binary images/22x22/apps/ccsm.svg | 457 -- images/22x22/categories/plugins-accessibility.png |binary images/22x22/categories/plugins-all.png |binary images/22x22/categories/plugins-desktop.png |binary images/22x22/categories/plugins-effects.png |binary images/22x22/categories/plugins-extras.png |binary images/22x22/categories/plugins-image_loading.png |binary images/22x22/categories/plugins-profiles.png |binary images/22x22/categories/plugins-search.png |binary images/22x22/categories/plugins-uncategorized.png |binary images/22x22/categories/plugins-utility.png |binary images/22x22/categories/plugins-window_management.png |binary images/scalable/apps/ccsm.svg | 516 -- images/scalable/apps/plugin-3d.svg | 1258 ++++- images/scalable/apps/plugin-addhelper.svg | 815 ++- images/scalable/apps/plugin-anaglyph.svg | 2693 ++++++++++++ images/scalable/apps/plugin-animation.svg | 149 images/scalable/apps/plugin-animationaddon.svg | 126 images/scalable/apps/plugin-animationjc.svg | 341 + images/scalable/apps/plugin-animationplus.svg | 95 images/scalable/apps/plugin-animationsim.svg | 271 + images/scalable/apps/plugin-annotate.svg | 232 - images/scalable/apps/plugin-atlantis.svg | 382 - images/scalable/apps/plugin-autumn.svg | 154 images/scalable/apps/plugin-bench.svg | 403 - images/scalable/apps/plugin-bicubic.svg | 131 images/scalable/apps/plugin-blur.svg | 317 - images/scalable/apps/plugin-bubbles.svg | 1946 ++++++++ images/scalable/apps/plugin-clone.svg | 1343 ++++-- images/scalable/apps/plugin-colorfilter.svg | 840 ++- images/scalable/apps/plugin-commands.svg | 1953 ++------ images/scalable/apps/plugin-compiztoolbox.svg | 1533 +++++++ images/scalable/apps/plugin-composite.svg | 1326 ++++++ images/scalable/apps/plugin-copytex.svg | 952 ++++ images/scalable/apps/plugin-core.svg | 612 ++ images/scalable/apps/plugin-crashhandler.svg | 330 + images/scalable/apps/plugin-cube.svg | 378 + images/scalable/apps/plugin-cubeaddon.svg | 442 -- images/scalable/apps/plugin-cubemodel.svg | 436 ++ images/scalable/apps/plugin-dbus.svg | 189 images/scalable/apps/plugin-debug.svg | 956 +--- images/scalable/apps/plugin-decor.svg | 230 + images/scalable/apps/plugin-decoration.svg | 248 - images/scalable/apps/plugin-dialog.svg | 297 + images/scalable/apps/plugin-elements.svg | 479 ++ images/scalable/apps/plugin-expo.svg | 1665 +++---- images/scalable/apps/plugin-extrawm.svg | 1429 +++--- images/scalable/apps/plugin-ezoom.svg | 1203 ----- images/scalable/apps/plugin-fade.svg | 1228 ++--- images/scalable/apps/plugin-fadedesktop.svg | 1310 +----- images/scalable/apps/plugin-fakeargb.svg | 616 +- images/scalable/apps/plugin-fireflies.svg | 1252 +++++ images/scalable/apps/plugin-firepaint.svg | 115 images/scalable/apps/plugin-flash.svg | 182 images/scalable/apps/plugin-freewins.svg | 474 ++ images/scalable/apps/plugin-fs.svg | 767 +-- images/scalable/apps/plugin-gears.svg | 222 - images/scalable/apps/plugin-ghost.svg | 383 + images/scalable/apps/plugin-glib.svg | 369 - images/scalable/apps/plugin-gnomecompat.svg | 354 - images/scalable/apps/plugin-grid.svg | 584 ++ images/scalable/apps/plugin-group.svg | 755 ++- images/scalable/apps/plugin-imgjpeg.svg | 920 +++- images/scalable/apps/plugin-imgpng.svg | 861 +++ images/scalable/apps/plugin-imgsvg.svg | 165 images/scalable/apps/plugin-inotify.svg | 544 +- images/scalable/apps/plugin-kde.svg | 102 images/scalable/apps/plugin-kdecompat.svg | 389 + images/scalable/apps/plugin-loginout.svg | 664 +-- images/scalable/apps/plugin-mag.svg | 980 +--- images/scalable/apps/plugin-maximumize.svg | 911 ++-- images/scalable/apps/plugin-mblur.svg | 138 images/scalable/apps/plugin-minimize.svg | 769 +-- images/scalable/apps/plugin-mousegestures.svg | 292 + images/scalable/apps/plugin-mousepoll.svg | 190 images/scalable/apps/plugin-move.svg | 620 +- images/scalable/apps/plugin-mswitch.svg | 186 images/scalable/apps/plugin-neg.svg | 110 images/scalable/apps/plugin-notification.svg | 148 images/scalable/apps/plugin-obs.svg | 369 - images/scalable/apps/plugin-opacify.svg | 731 +-- images/scalable/apps/plugin-opengl.svg | 415 + images/scalable/apps/plugin-photo.svg | 378 + images/scalable/apps/plugin-photowheel.svg | 378 + images/scalable/apps/plugin-place.svg | 423 + images/scalable/apps/plugin-png.svg | 435 -- images/scalable/apps/plugin-put.svg | 746 +-- images/scalable/apps/plugin-putplus.svg | 680 +++ images/scalable/apps/plugin-reflex.svg | 273 - images/scalable/apps/plugin-regex.svg | 360 - images/scalable/apps/plugin-resize.svg | 674 +-- images/scalable/apps/plugin-resizeinfo.svg | 484 +- images/scalable/apps/plugin-ring.svg | 1240 ++--- images/scalable/apps/plugin-rotate.svg | 624 ++ images/scalable/apps/plugin-scale.svg | 1843 ++++---- images/scalable/apps/plugin-scaleaddon.svg | 2424 +++++------ images/scalable/apps/plugin-scalefilter.svg | 576 +- images/scalable/apps/plugin-schemep.svg | 921 ---- images/scalable/apps/plugin-screensaver.svg | 407 + images/scalable/apps/plugin-screenshot.svg | 188 images/scalable/apps/plugin-session.svg | 712 +-- images/scalable/apps/plugin-shelf.svg | 565 +- images/scalable/apps/plugin-shift.svg | 1394 +++--- images/scalable/apps/plugin-showdesktop.svg | 896 +--- images/scalable/apps/plugin-showmouse.svg | 312 + images/scalable/apps/plugin-showrepaint.svg | 298 + images/scalable/apps/plugin-smartput.svg | 699 +++ images/scalable/apps/plugin-snap.svg | 893 +--- images/scalable/apps/plugin-snow.svg | 28 images/scalable/apps/plugin-snowglobe.svg | 572 ++ images/scalable/apps/plugin-sound.svg | 576 ++ images/scalable/apps/plugin-splash.svg | 208 images/scalable/apps/plugin-stackswitch.svg | 1323 ++---- images/scalable/apps/plugin-stars.svg | 631 ++ images/scalable/apps/plugin-startup.svg | 535 ++ images/scalable/apps/plugin-static.svg | 1196 +++++ images/scalable/apps/plugin-staticswitcher.svg | 736 +-- images/scalable/apps/plugin-svg.svg | 158 images/scalable/apps/plugin-swap.svg | 3258 +++++++++++++++ images/scalable/apps/plugin-swapper.svg | 3258 +++++++++++++++ images/scalable/apps/plugin-switcher.svg | 1114 +---- images/scalable/apps/plugin-td.svg | 546 ++ images/scalable/apps/plugin-text.svg | 711 --- images/scalable/apps/plugin-thumbnail.svg | 814 ++- images/scalable/apps/plugin-tile.svg | 644 +- images/scalable/apps/plugin-titleinfo.svg | 155 images/scalable/apps/plugin-toggledeco.svg | 341 + images/scalable/apps/plugin-trailfocus.svg | 936 ++-- images/scalable/apps/plugin-trip.svg | 274 + images/scalable/apps/plugin-unknown.svg | 588 +- images/scalable/apps/plugin-vidcap.svg | 497 ++ images/scalable/apps/plugin-video.svg | 743 +-- images/scalable/apps/plugin-vpswitch.svg | 2330 ++-------- images/scalable/apps/plugin-wall.svg | 197 images/scalable/apps/plugin-wallpaper.svg | 1106 ----- images/scalable/apps/plugin-water.svg | 65 images/scalable/apps/plugin-widget.svg | 549 +- images/scalable/apps/plugin-winreflect.svg | 189 images/scalable/apps/plugin-winrules.svg | 802 +-- images/scalable/apps/plugin-wizard.svg | 297 + images/scalable/apps/plugin-wobbly.svg | 119 images/scalable/apps/plugin-workarounds.svg | 1226 ++--- images/scalable/apps/plugin-workspacenames.svg | 277 + images/scalable/apps/plugin-zoom.svg | 1216 ----- images/scalable/categories/plugins-accessibility.svg | 428 - images/scalable/categories/plugins-all.svg | 1119 +---- images/scalable/categories/plugins-desktop.svg | 865 +-- images/scalable/categories/plugins-effects.svg | 1206 ++--- images/scalable/categories/plugins-extras.svg | 207 images/scalable/categories/plugins-general.svg | 331 - images/scalable/categories/plugins-image_loading.svg | 939 +--- images/scalable/categories/plugins-profiles.svg | 579 +- images/scalable/categories/plugins-search.svg | 1874 ++------ images/scalable/categories/plugins-uncategorized.svg | 43 images/scalable/categories/plugins-utility.svg | 537 -- images/scalable/categories/plugins-window_management.svg | 944 +--- setup.py | 2 184 files changed, 61856 insertions(+), 40023 deletions(-)
New commits: commit a3b76ae75c191a07c531ac1e5a9315df7995f9cc Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:40:20 2011 +0000 Prepare changelog diff --git a/debian/changelog b/debian/changelog index d4e55e8..c68afc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,5 @@ -ccsm (0.9.2.1-1.1) unstable; urgency=low +ccsm (0.9.2.1+git20110224.cb1268cb-1) experimental; urgency=low + [ Janos Guljas ] * New upstream release. @@ -12,7 +13,15 @@ ccsm (0.9.2.1-1.1) unstable; urgency=low * 01-fix-extension-dir.patch - Remove Makefile so dh_python2 can install extension in a right place - -- Janos Guljas <[email protected]> Mon, 15 Nov 2010 20:42:24 +0100 + [ Sean Finney ] + * Add common 3.0 source format options + * Remove "local changes" snuck into packaging by dpkg-source 3.0 + * Explicitly remove ccsm.desktop during clean + * New patch to remove invalid "Compiz" category from ccsm.desktop + * Fix mis-named md.po -> mnk.po + * Remove leftover "installed_files" file during clean + + -- Sean Finney <[email protected]> Sun, 06 Mar 2011 00:36:36 +0000 ccsm (0.8.4-2) unstable; urgency=high commit 2f15e2e0d7974bc020de0df821e28e3e1bd2bed3 Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:35:19 2011 +0000 Remove leftover "installed_files" file during clean diff --git a/debian/rules b/debian/rules index 937f6c8..85a9b6f 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,8 @@ clean: rm -f ccsm.desktop # misnamed translation if [ -f po/mnk.po ]; then mv po/mnk.po po/md.po; fi + # other misc junk + rm -f installed_files override_dh_auto_install: # misnamed translation commit e366aac0ebdcfe73d2666c243c77e6b9fb74cd44 Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:33:05 2011 +0000 Fix mis-named md.po -> mnk.po diff --git a/debian/rules b/debian/rules index 85ddc57..937f6c8 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,10 @@ clean: dh $@ # setup.py seems to unconditionally generate this guy, even on clean rm -f ccsm.desktop + # misnamed translation + if [ -f po/mnk.po ]; then mv po/mnk.po po/md.po; fi override_dh_auto_install: + # misnamed translation + if [ -f po/md.po ]; then mv po/md.po po/mnk.po; fi python setup.py install --root=$(CURDIR)/debian/compizconfig-settings-manager --prefix=/usr --install-layout=deb commit abe6714327ef45e7d845d4dc451de98bc22c4d24 Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:11:52 2011 +0000 New patch to remove invalid "Compiz" category from ccsm.desktop diff --git a/debian/patches/invalid_desktop_category.patch b/debian/patches/invalid_desktop_category.patch new file mode 100644 index 0000000..5493a57 --- /dev/null +++ b/debian/patches/invalid_desktop_category.patch @@ -0,0 +1,9 @@ +--- ccsm.orig/ccsm.desktop.in ++++ ccsm/ccsm.desktop.in +@@ -6,5 +6,5 @@ Icon=ccsm + Exec=ccsm + Terminal=false + Type=Application +-Categories=Compiz;Settings;DesktopSettings; ++Categories=Settings;DesktopSettings; + StartupNotify=true diff --git a/debian/patches/series b/debian/patches/series index 3c5dfdd..5cd8722 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +invalid_desktop_category.patch 01-fix-extension-dir.patch commit af4105ef8f0f33596e77ae3a558c1c083ba09576 Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:07:13 2011 +0000 Explicitly remove ccsm.desktop since setup.py unconditionally creates it diff --git a/debian/rules b/debian/rules index f88a3da..85ddc57 100755 --- a/debian/rules +++ b/debian/rules @@ -3,5 +3,10 @@ %: dh $@ --with python2 +clean: + dh $@ + # setup.py seems to unconditionally generate this guy, even on clean + rm -f ccsm.desktop + override_dh_auto_install: python setup.py install --root=$(CURDIR)/debian/compizconfig-settings-manager --prefix=/usr --install-layout=deb commit 0aee72b3a81cb899da5b003898cf5df42dec92b3 Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:06:56 2011 +0000 Remove "local changes" snuck into packaging by dpkg-source 3.0 diff --git a/debian/patches/debian-changes-0.9.2.1-1.1 b/debian/patches/debian-changes-0.9.2.1-1.1 deleted file mode 100644 index de062cd..0000000 --- a/debian/patches/debian-changes-0.9.2.1-1.1 +++ /dev/null @@ -1,106 +0,0 @@ -Description: Upstream changes introduced in version 0.9.2.1-1.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - ccsm (0.9.2.1-1.1) unstable; urgency=low - . - [ Janos Guljas ] - * New upstream release. - * Bump standards to 3.9.1. - * Switch to dpkg format 3.0 (quilt) - * Changed compizconfig-settings-manager architecture to "all". - * Rewrite debian/rules to use debhelper 7. - * Removed debian/install file. - * Updated debian/watch file. - * Add patch - * 01-fix-extension-dir.patch - - Remove Makefile so dh_python2 can install extension in a right place - . - The person named in the Author field signed this changelog entry. -Author: Janos Guljas <[email protected]> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- /dev/null -+++ ccsm-0.9.2.1/ccsm.desktop -@@ -0,0 +1,68 @@ -+[Desktop Entry] -+Encoding=UTF-8 -+Name=CompizConfig Settings Manager -+Name[ar]=مدير إعدادات CompizConfig -+Name[bn]=কমপিজ কনফিগ ব্যবস্থাপক -+Name[bn_IN]=কমপিজ কনফিগ ব্যবস্থাপক -+Name[ca]=Editor de la configuració de Compiz -+Name[cs]=Manažer nastavení Compizu -+Name[de]=CompizConfig Einstellungs-Manager -+Name[el]=Διαχειριστής Ρυθμίσεων του Compiz -+Name[en_GB]=CompizConfig Settings Manager -+Name[es]=Administrador de Opciones CompizConfig -+Name[fi]=Compiz-asetusten hallinta -+Name[fr]=Gestionnaire de Configuration CompizConfig -+Name[gl]=Administrador de Configuracións CompizConfig -+Name[gu]=CompizConfig સુયોજનો વ્યવસ્થાપક -+Name[he]=מנהל הגדרות CompizConfig -+Name[hi]=CompizConfig जमावट प्रबंधक -+Name[hu]=CompizConfig beállításkezelő -+Name[id]=CompizConfig Settings Manager -+Name[it]=Gestore configurazione CompizConfig -+Name[ja]=CompizConfig 設定マネージャ -+Name[ko]=컴피즈 설정 관리자 -+Name[md]=CompizConfig compiz -la tillĩdirão leti -+Name[nb]=CompizConfig Innstillingshåndterer -+Name[nl]=CompizConfig Instellingen Beheerder -+Name[or]=କମ୍ପିଜକନଫିଗ ସେଟିଙ୍ଗ ପ୍ରବନ୍ଧକ -+Name[pa]=CompizConfig ਸੈਟਿੰਗ ਮੈਨੇਜਰ -+Name[pl]=Menedżer ustawień CompizConfig -+Name[pt]=Sistema de Configuração do Compiz -+Name[pt_BR]=Gerenciador de configurações do CompizConfig -+Name[ru]=Менеджер настройки CompizConfig -+Name[sk]=Správca nastavení CompizConfig -+Name[sv]=Inställningshanteraren CompizConfig -+Name[tr]=CompizConfig Ayar Yöneticisi -+Name[wo]=Tannay u CompizConfig -+Name[zh_CN]=CompizConfig设置管理器 -+Comment=Configure Compiz with CompizConfig -+Comment[ar]=شكّل Compiz بواسطة CompizConfig -+Comment[ca]=Configura Compiz amb CompizConfig -+Comment[de]=Konfiguration von Compiz mit CompizConfig -+Comment[el]=Ρύθμιση του Compiz με το CompizConfig -+Comment[en_GB]=Configure Compiz with CompizConfig -+Comment[es]=Configurar Compiz con CompizConfig -+Comment[fi]=Compiz-asetusten tekeminen CompizConfigilla -+Comment[fr]=Configurer Compiz avec CompizConfig -+Comment[gl]=Configurar Compiz con CompizConfig -+Comment[he]=ערוך את תצורת קומפיז בעזרת CompizConfig -+Comment[hu]=Compiz beállítása a CompizCOnfig programmal -+Comment[id]=Atur Compiz dengan CompizConfig -+Comment[it]=Configura Compiz attraverso CompizConfig -+Comment[ja]=CompizConfig で Compiz を設定します -+Comment[ko]=CompizConfig으로 Compiz 설정 -+Comment[nl]=Beheer Compiz in met CompizConfig -+Comment[pl]=Konfiguruj Compiz przy pomocy Menadżera Ustawień CompizConfig -+Comment[pt]=Configurar Compiz com CompizConfig -+Comment[pt_BR]=Configurar o Compiz com o CompizConfig -+Comment[ru]=Настройка Compiz с помощью CompizConfig -+Comment[sk]=Nastav Compiz s pomocou CompizConfig -+Comment[sv]=Konfigurera Compiz med CompizConfig -+Comment[tr]=Compiz'i, CompizConfig ile yapılandır -+Comment[zh_CN]=使用CompizConfig对Compiz进行配置 -+Icon=ccsm -+Exec=ccsm -+Terminal=false -+Type=Application -+Categories=Compiz;Settings;DesktopSettings; -+StartupNotify=true diff --git a/debian/patches/series b/debian/patches/series index 482aa60..3c5dfdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01-fix-extension-dir.patch -debian-changes-0.9.2.1-1.1 commit 6fb31405e7bb4432d2a705d26ff2bfcb3fcdc208 Author: Sean Finney <[email protected]> Date: Sat Mar 5 23:48:22 2011 +0000 Add common 3.0 source format options diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..9cdfca9 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes commit b85014945230828577d97039c965f5f0c3a8902f Author: Sean Finney <[email protected]> Date: Sat Mar 5 23:47:42 2011 +0000 Import Janos' Packaging work diff --git a/debian/changelog b/debian/changelog index b59a5e9..d4e55e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +ccsm (0.9.2.1-1.1) unstable; urgency=low + + [ Janos Guljas ] + * New upstream release. + * Bump standards to 3.9.1. + * Switch to dpkg format 3.0 (quilt) + * Changed compizconfig-settings-manager architecture to "all". + * Rewrite debian/rules to use debhelper 7. + * Removed debian/install file. + * Updated debian/watch file. + * Add patch + * 01-fix-extension-dir.patch + - Remove Makefile so dh_python2 can install extension in a right place + + -- Janos Guljas <[email protected]> Mon, 15 Nov 2010 20:42:24 +0100 + ccsm (0.8.4-2) unstable; urgency=high * Fix FTBFS with python 2.6 and up, thanks to Jonathan Wiltshire and diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index d230113..3043286 100644 --- a/debian/control +++ b/debian/control @@ -2,22 +2,24 @@ Source: ccsm Priority: extra Maintainer: Debian X Strike Force <[email protected]> Uploaders: Sean Finney <[email protected]> -Build-Depends: debhelper (>= 5), python (>= 2.5.4-1~), python-support (>= 0.90), quilt, intltool -Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 7.0.50~), intltool, python (>= 2.6) +Standards-Version: 3.9.1 +XS-Python-Version: >= 2.6 Section: x11 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/ccsm.git Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/ccsm.git Homepage: http://wiki.compiz.org/CCSM Package: compizconfig-settings-manager -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, librsvg2-common, python-compizconfig (>= 0.8.4-2), python-gtk2 +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, librsvg2-common, python-compizconfig (>= 0.9.0), python-gtk2 +XB-Python-Version: ${python:Versions} Description: Compizconfig Settings Manager Compiz Fusion is the result of the re-unification of the Beryl-project and the community around the Compiz Window Manager. It seeks to provide an easy and fun-to-use windowing environment, allowing use of the graphics hardware to provide impressive effects, amazing speed and - unrivalled usefulness + unrivalled usefulness. . This package provides python-based "settings manager", a graphical interface used to administer the various options for the compiz-fusion system. diff --git a/debian/docs b/debian/docs index 9b76145..a3d08bc 100644 --- a/debian/docs +++ b/debian/docs @@ -1,4 +1,3 @@ NEWS AUTHORS TODO -README diff --git a/debian/install b/debian/install deleted file mode 100644 index 1e0bd87..0000000 --- a/debian/install +++ /dev/null @@ -1,7 +0,0 @@ -usr/bin/ccsm -usr/lib/python*/*-packages/ccm/*.py -usr/share/applications/ccsm.desktop -usr/share/ccsm/images/*.png -usr/share/locale/*/LC_MESSAGES -usr/share/icons/hicolor/*/apps/*.{svg,png} -usr/share/ccsm/icons/hicolor/*/*/*.{svg,png} diff --git a/debian/patches/01-fix-extension-dir.patch b/debian/patches/01-fix-extension-dir.patch new file mode 100644 index 0000000..2f10023 --- /dev/null +++ b/debian/patches/01-fix-extension-dir.patch @@ -0,0 +1,18 @@ +Description: Remove Makefile so dh_python2 can install extension in a right place +Author: Janos Guljas <[email protected]> +Last-Update: 2010-11-15 + +--- a/Makefile ++++ /dev/null +@@ -1,11 +0,0 @@ +-all: +- @python setup.py build --prefix=${PREFIX} +- +-install: all +- @python setup.py install --prefix=${PREFIX} +- +-uninstall: +- @python setup.py uninstall --prefix=${PREFIX} +- +-clean: +- rm -rf build/ diff --git a/debian/patches/debian-changes-0.9.2.1-1.1 b/debian/patches/debian-changes-0.9.2.1-1.1 new file mode 100644 index 0000000..de062cd --- /dev/null +++ b/debian/patches/debian-changes-0.9.2.1-1.1 @@ -0,0 +1,106 @@ +Description: Upstream changes introduced in version 0.9.2.1-1.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + ccsm (0.9.2.1-1.1) unstable; urgency=low + . + [ Janos Guljas ] + * New upstream release. + * Bump standards to 3.9.1. + * Switch to dpkg format 3.0 (quilt) + * Changed compizconfig-settings-manager architecture to "all". + * Rewrite debian/rules to use debhelper 7. + * Removed debian/install file. + * Updated debian/watch file. + * Add patch + * 01-fix-extension-dir.patch + - Remove Makefile so dh_python2 can install extension in a right place + . + The person named in the Author field signed this changelog entry. +Author: Janos Guljas <[email protected]> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- /dev/null ++++ ccsm-0.9.2.1/ccsm.desktop +@@ -0,0 +1,68 @@ ++[Desktop Entry] ++Encoding=UTF-8 ++Name=CompizConfig Settings Manager ++Name[ar]=مدير إعدادات CompizConfig ++Name[bn]=কমপিজ কনফিগ ব্যবস্থাপক ++Name[bn_IN]=কমপিজ কনফিগ ব্যবস্থাপক ++Name[ca]=Editor de la configuració de Compiz ++Name[cs]=Manažer nastavení Compizu ++Name[de]=CompizConfig Einstellungs-Manager ++Name[el]=Διαχειριστής Ρυθμίσεων του Compiz ++Name[en_GB]=CompizConfig Settings Manager ++Name[es]=Administrador de Opciones CompizConfig ++Name[fi]=Compiz-asetusten hallinta ++Name[fr]=Gestionnaire de Configuration CompizConfig ++Name[gl]=Administrador de Configuracións CompizConfig ++Name[gu]=CompizConfig સુયોજનો વ્યવસ્થાપક ++Name[he]=מנהל הגדרות CompizConfig ++Name[hi]=CompizConfig जमावट प्रबंधक ++Name[hu]=CompizConfig beállításkezelő ++Name[id]=CompizConfig Settings Manager ++Name[it]=Gestore configurazione CompizConfig ++Name[ja]=CompizConfig 設定マネージャ ++Name[ko]=컴피즈 설정 관리자 ++Name[md]=CompizConfig compiz -la tillĩdirão leti ++Name[nb]=CompizConfig Innstillingshåndterer ++Name[nl]=CompizConfig Instellingen Beheerder ++Name[or]=କମ୍ପିଜକନଫିଗ ସେଟିଙ୍ଗ ପ୍ରବନ୍ଧକ ++Name[pa]=CompizConfig ਸੈਟਿੰਗ ਮੈਨੇਜਰ ++Name[pl]=Menedżer ustawień CompizConfig ++Name[pt]=Sistema de Configuração do Compiz ++Name[pt_BR]=Gerenciador de configurações do CompizConfig ++Name[ru]=Менеджер настройки CompizConfig ++Name[sk]=Správca nastavení CompizConfig ++Name[sv]=Inställningshanteraren CompizConfig ++Name[tr]=CompizConfig Ayar Yöneticisi ++Name[wo]=Tannay u CompizConfig ++Name[zh_CN]=CompizConfig设置管理器 ++Comment=Configure Compiz with CompizConfig ++Comment[ar]=شكّل Compiz بواسطة CompizConfig ++Comment[ca]=Configura Compiz amb CompizConfig ++Comment[de]=Konfiguration von Compiz mit CompizConfig ++Comment[el]=Ρύθμιση του Compiz με το CompizConfig ++Comment[en_GB]=Configure Compiz with CompizConfig ++Comment[es]=Configurar Compiz con CompizConfig ++Comment[fi]=Compiz-asetusten tekeminen CompizConfigilla ++Comment[fr]=Configurer Compiz avec CompizConfig ++Comment[gl]=Configurar Compiz con CompizConfig ++Comment[he]=ערוך את תצורת קומפיז בעזרת CompizConfig ++Comment[hu]=Compiz beállítása a CompizCOnfig programmal ++Comment[id]=Atur Compiz dengan CompizConfig ++Comment[it]=Configura Compiz attraverso CompizConfig ++Comment[ja]=CompizConfig で Compiz を設定します ++Comment[ko]=CompizConfig으로 Compiz 설정 ++Comment[nl]=Beheer Compiz in met CompizConfig ++Comment[pl]=Konfiguruj Compiz przy pomocy Menadżera Ustawień CompizConfig ++Comment[pt]=Configurar Compiz com CompizConfig ++Comment[pt_BR]=Configurar o Compiz com o CompizConfig ++Comment[ru]=Настройка Compiz с помощью CompizConfig ++Comment[sk]=Nastav Compiz s pomocou CompizConfig ++Comment[sv]=Konfigurera Compiz med CompizConfig ++Comment[tr]=Compiz'i, CompizConfig ile yapılandır ++Comment[zh_CN]=使用CompizConfig对Compiz进行配置 ++Icon=ccsm ++Exec=ccsm ++Terminal=false ++Type=Application ++Categories=Compiz;Settings;DesktopSettings; ++StartupNotify=true diff --git a/debian/patches/desktop-file-category b/debian/patches/desktop-file-category deleted file mode 100644 index f2268dd..0000000 --- a/debian/patches/desktop-file-category +++ /dev/null @@ -1,9 +0,0 @@ ---- 9-ccsm.orig/ccsm.desktop.in -+++ 9-ccsm/ccsm.desktop.in -@@ -6,5 +6,5 @@ Icon=ccsm - Exec=ccsm - Terminal=false - Type=Application --Categories=Compiz;Settings;DesktopSettings; -+Categories=Settings;DesktopSettings; - StartupNotify=true diff --git a/debian/patches/pygtk-breakage-workaround.patch b/debian/patches/pygtk-breakage-workaround.patch deleted file mode 100644 index f5a99a3..0000000 --- a/debian/patches/pygtk-breakage-workaround.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- 9-ccsm.orig/ccsm -+++ 9-ccsm/ccsm -@@ -132,4 +132,6 @@ if dbusObj is not None: - idle = ccm.IdleSettingsParser(context, mainWin) - mainWin.show_all() - -+import os -+os.close(0) - gtk.main() diff --git a/debian/patches/remove-python-shebangs b/debian/patches/remove-python-shebangs deleted file mode 100644 index 1a909d6..0000000 --- a/debian/patches/remove-python-shebangs +++ /dev/null @@ -1,49 +0,0 @@ ---- 9-ccsm.orig/ccm/Conflicts.py -+++ 9-ccsm/ccm/Conflicts.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: UTF-8 -*- - - # This program is free software; you can redistribute it and/or ---- 9-ccsm.orig/ccm/Pages.py -+++ 9-ccsm/ccm/Pages.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: UTF-8 -*- - - # This program is free software; you can redistribute it and/or ---- 9-ccsm.orig/ccm/Settings.py -+++ 9-ccsm/ccm/Settings.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: UTF-8 -*- - - # This program is free software; you can redistribute it and/or ---- 9-ccsm.orig/ccm/Utils.py -+++ 9-ccsm/ccm/Utils.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: UTF-8 -*- - - # This program is free software; you can redistribute it and/or ---- 9-ccsm.orig/ccm/Widgets.py -+++ 9-ccsm/ccm/Widgets.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: UTF-8 -*- - - # This program is free software; you can redistribute it and/or ---- 9-ccsm.orig/ccm/Window.py -+++ 9-ccsm/ccm/Window.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: UTF-8 -*- - - # This program is free software; you can redistribute it and/or ---- 9-ccsm.orig/ccm/Constants.py.in -+++ 9-ccsm/ccm/Constants.py.in -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: UTF-8 -*- - - # This program is free software; you can redistribute it and/or diff --git a/debian/patches/series b/debian/patches/series index 4acc35d..482aa60 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -desktop-file-category -remove-python-shebangs -pygtk-breakage-workaround.patch +01-fix-extension-dir.patch +debian-changes-0.9.2.1-1.1 diff --git a/debian/pyversions b/debian/pyversions deleted file mode 100644 index 8b253bc..0000000 --- a/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.4- diff --git a/debian/rules b/debian/rules index 1f1aca2..f88a3da 100755 --- a/debian/rules +++ b/debian/rules @@ -1,68 +1,7 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ --with python2 -# the following files are modified in the build process, but shouldn't be. -#UPSTREAM_PRESERVE:=po/Makefile.in.in - -include /usr/share/quilt/quilt.make -include /usr/share/python/python.mk - -build: build-stamp -build-stamp: $(QUILT_STAMPFN) - dh_testdir - for f in $(UPSTREAM_PRESERVE); do \ - cp -a $$f $$f.preserve; \ - done - python ./setup.py build --prefix=/usr - touch $@ - -clean: unpatch - dh_testdir - dh_testroot - python ./setup.py clean - rm -rf build-stamp build installed_files ccsm.desktop - for f in $(UPSTREAM_PRESERVE); do \ - if [ -f $$f.preserve ]; then \ - cp -a $$f.preserve $$f; rm -f $$f.preserve; \ - fi; \ - done - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - python setup.py install --root=debian/tmp --prefix=/usr $(py_setup_install_args) - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# uncomment when upstream starts putting stuff in it -# dh_installchangelogs ChangeLog - dh_installchangelogs - dh_installdocs - dh_installexamples - find debian/tmp -type f -name '*.pyc' -o -name '*.egg-info' | xargs rm -f - dh_install --sourcedir=debian/tmp --fail-missing - dh_pysupport - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_install: + python setup.py install --root=$(CURDIR)/debian/compizconfig-settings-manager --prefix=/usr --install-layout=deb diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch index 09ec3cf..32a26b4 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,4 @@ version=3 -http://releases.compiz-fusion.org/ ([0-9][0-9.]+)/ ccsm-([0-9.]+)\.tar\.gz +http://releases.compiz.org/([\d\.]+)[\d]/ ccsm-([\d\.]+)\.tar\.gz + + commit cb1268cb2a6728d2f0dcc21d417b3b2c13d729e6 Author: Silvia Dobrota <[email protected]> Date: Thu Feb 24 12:24:46 2011 +0800 [PATCH] Focus filter entry on return to main page diff --git a/ccm/Window.py b/ccm/Window.py index 9478f34..1b57fcf 100644 --- a/ccm/Window.py +++ b/ccm/Window.py @@ -96,6 +96,7 @@ class MainWin(gtk.Window): def BackToMain(self, widget): self.SetPage(self.MainPage) + self.MainPage.filterEntry.grab_focus() def RefreshPage(self, updatedPlugin): currentPage = self.CurrentPage commit 407bc8674877adf4042691a0408779fe84aad268 Author: Sam Spilsbury <[email protected]> Date: Wed Feb 23 01:18:16 2011 +0800 Explcitly convert list items to str for now diff --git a/ccm/Settings.py b/ccm/Settings.py index 787461f..6dfcdb9 100644 --- a/ccm/Settings.py +++ b/ccm/Settings.py @@ -755,8 +755,13 @@ class BaseListSetting(Setting): def _Read(self): self.Store.clear() + # FIXME: The list types are being defined as all str + # in self.Widgets (which goes to self.Store) - this + # is a problem since values can be of other types, + # however explicitly converting to a string seems to + # work here for values in zip(*[w.GetForRenderer() for w in self.Widgets]): - self.Store.append(values) + self.Store.append([str (x) for x in values]) def OnDestroy(self, widget): for w in self.Widgets: @@ -1452,6 +1457,7 @@ def MakeSetting(setting, List=False): t = setting.Type stype = SettingTypeDict.get(t, None) + if not stype: return commit 821087d360e4525a70dce778502fa22034ddaae4 Author: Joe Rusbasan <[email protected]> Date: Tue Feb 22 01:42:40 2011 -0500 Fix typo diff --git a/ccm/Pages.py b/ccm/Pages.py index 2349dfe..0bbf30a 100644 --- a/ccm/Pages.py +++ b/ccm/Pages.py @@ -716,7 +716,7 @@ class ProfileBackendPage(object): for i, name in enumerate(self.Context.Backends): backend = self.Context.Backends[name] backendBox.append_text(backend.ShortDesc) - if name == self.CurrentBackend.Name: + if name == self.Context.CurrentBackend.Name: active = i backendBox.set_active(active) backendBox.connect("changed", self.BackendChangedAddTimeout) commit 632c982318d74f9db693ebdcc3154e83f41ce83c Author: Patrick Niklaus <[email protected]> Date: Sat Feb 12 19:24:14 2011 +0100 Replaced libsexy code with gtk entry diff --git a/ccm/Pages.py b/ccm/Pages.py index ff7ef54..2349dfe 100644 --- a/ccm/Pages.py +++ b/ccm/Pages.py @@ -76,7 +76,7 @@ class PluginPage(GenericPage): filterLabel = Label() filterLabel.set_markup(HeaderMarkup % (_("Filter"))) filterLabel.connect("style-set", self.HeaderStyleSet) - self.FilterEntry = gtk.Entry() + self.FilterEntry = ClearEntry() self.FilterEntry.connect("changed", self.FilterChanged) self.LeftWidget.pack_start(pluginImg, False, False) @@ -256,15 +256,10 @@ class FilterPage(GenericPage): self.LeftWidget.pack_start(filterLabel, False, False) # Entry FIXME find a solution with std gtk - """ - self.FilterEntry = sexy.IconEntry() - self.FilterEntry.add_clear_button() - keyboardImage = Image("input-keyboard", ImageThemed, 16) - self.FilterEntry.set_icon(sexy.ICON_ENTRY_PRIMARY, keyboardImage) - self.FilterEntry.set_icon_highlight(sexy.ICON_ENTRY_PRIMARY, True) - self.FilterEntry.connect('icon-pressed', self.GrabKey) - """ - self.FilterEntry = gtk.Entry() + self.FilterEntry = ClearEntry() + self.FilterEntry.set_icon_from_icon_name(gtk.ENTRY_ICON_PRIMARY, "input-keyboard") + self.FilterEntry.set_icon_tooltip_text(gtk.ENTRY_ICON_PRIMARY, _("Grab Keys")) + self.FilterEntry.connect('icon-press', self.GrabKey) self.FilterEntry.set_tooltip_text(_("Enter a filter.\nClick the keyboard image to grab a key for which to search.")) self.FilterEntry.connect("changed", self.FilterChanged) @@ -434,16 +429,15 @@ class FilterPage(GenericPage): self.FilterValueCheck.set_active(True) self.FilterEntry.set_text(new) - # FIXME find a way to reuse this function - """ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
