mesa: Changes to 'ubuntu'

2011-08-03 Thread Christopher Halse Rogers
 debian/changelog|5 -
 debian/patches/119_r600g_gnome_shell_rendering_fix.diff |   69 
 debian/patches/series   |1 
 3 files changed, 74 insertions(+), 1 deletion(-)

New commits:
commit 0b1af3ec5bf176931fc4f6d7f9dca8301bc35e96
Author: Christopher James Halse Rogers 
Date:   Thu Aug 4 16:25:43 2011 +1000

Cherry-pick gnome-shell rendering-corruption fix for r600g

diff --git a/debian/changelog b/debian/changelog
index b9d7085..49e7a70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,8 +68,11 @@ mesa (7.11-0ubuntu1) UNRELEASED; urgency=low
   * debian/clean:
 - Generate xmlpool pot file and clean up other po files for
   pkgbinarymangler's benefit (LP: #410264).
+  * debian/patches/119_r600g_gnome_shell_rendering_fix.diff:
+- Cherry pick upstream commit fixing rendering corruption in gnome-shell
+  (and therefore likely Unity as well).
 
- -- Christopher James Halse Rogers   Tue, 19 Jul 2011 
09:15:22 +1000
+ -- Christopher James Halse Rogers   Thu, 04 Aug 2011 
16:25:08 +1000
 
 mesa (7.11-1) UNRELEASED; urgency=low
 
diff --git a/debian/patches/119_r600g_gnome_shell_rendering_fix.diff 
b/debian/patches/119_r600g_gnome_shell_rendering_fix.diff
new file mode 100644
index 000..7e404e7
--- /dev/null
+++ b/debian/patches/119_r600g_gnome_shell_rendering_fix.diff
@@ -0,0 +1,69 @@
+commit 2bde0cc95d8db10b6d2c6689ca39c196a81248b0
+Author: Vadim Girlin 
+Date:   Wed Aug 3 15:35:02 2011 +0400
+
+r600g: take into account force_add_cf in pops
+
+When we have two ENDIFs in a row, we shouldn't modify the pop_count
+for the same alu clause twice.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38163
+
+Note: this is a candidate for the 7.11 branch.
+
+Signed-off-by: Alex Deucher 
+
+diff --git a/src/gallium/drivers/r600/r600_shader.c 
b/src/gallium/drivers/r600/r600_shader.c
+index fc56656..c55cdd7 100644
+--- a/src/gallium/drivers/r600/r600_shader.c
 b/src/gallium/drivers/r600/r600_shader.c
+@@ -2932,25 +2932,34 @@ static int emit_logic_pred(struct r600_shader_ctx 
*ctx, int opcode)
+ 
+ static int pops(struct r600_shader_ctx *ctx, int pops)
+ {
+-  int alu_pop = 3;
+-  if (ctx->bc->cf_last) {
+-  if (ctx->bc->cf_last->inst == 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU) << 3)
+-  alu_pop = 0;
+-  else if (ctx->bc->cf_last->inst == 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_POP_AFTER) << 3)
+-  alu_pop = 1;
+-  }
+-  alu_pop += pops;
+-  if (alu_pop == 1) {
+-  ctx->bc->cf_last->inst = 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_POP_AFTER) << 3;
+-  ctx->bc->force_add_cf = 1;
+-  } else if (alu_pop == 2) {
+-  ctx->bc->cf_last->inst = 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_POP2_AFTER) << 3;
+-  ctx->bc->force_add_cf = 1;
+-  } else {
++  unsigned force_pop = ctx->bc->force_add_cf;
++
++  if (!force_pop) {
++  int alu_pop = 3;
++  if (ctx->bc->cf_last) {
++  if (ctx->bc->cf_last->inst == 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU) << 3)
++  alu_pop = 0;
++  else if (ctx->bc->cf_last->inst == 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_POP_AFTER) << 3)
++  alu_pop = 1;
++  }
++  alu_pop += pops;
++  if (alu_pop == 1) {
++  ctx->bc->cf_last->inst = 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_POP_AFTER) << 3;
++  ctx->bc->force_add_cf = 1;
++  } else if (alu_pop == 2) {
++  ctx->bc->cf_last->inst = 
CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_POP2_AFTER) << 3;
++  ctx->bc->force_add_cf = 1;
++  } else {
++  force_pop = 1;
++  }
++  }
++
++  if (force_pop) {
+   r600_bc_add_cfinst(ctx->bc, 
CTX_INST(V_SQ_CF_WORD1_SQ_CF_INST_POP));
+   ctx->bc->cf_last->pop_count = pops;
+   ctx->bc->cf_last->cf_addr = ctx->bc->cf_last->id + 2;
+   }
++
+   return 0;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b7fe03d..ec47260 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 116_use_shared_galliumcore.diff
 117_handle_dri2connect_errors_when_indirect.diff
 118_fix_24bpp_software_renering.diff
+119_r600g_gnome_shell_rendering_fix.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qorns-0004rn...@vasks.debian.org



mesa: Changes to 'ubuntu'

2011-08-03 Thread Christopher Halse Rogers
 debian/changelog |6 +-
 debian/clean |3 +++
 debian/rules |9 +
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 523d4960ff3594b07f498c47543e12b73f3bee5a
Author: Christopher James Halse Rogers 
Date:   Thu Aug 4 16:07:38 2011 +1000

Mark as UNRELEASED, to placate those who like the series to mean something ☺

diff --git a/debian/changelog b/debian/changelog
index 78e1ab2..b9d7085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.11-0ubuntu1) oneiric; urgency=low
+mesa (7.11-0ubuntu1) UNRELEASED; urgency=low
 
   * Fake merge from Debian experimental, updating previous changelog entries.
 New upstream release fixes infrequent X crash (LP: #800778).

commit e83bac95312fc178baf80758d90b2e7adf1438ee
Author: Christopher James Halse Rogers 
Date:   Thu Aug 4 12:57:09 2011 +1000

Appease the great and powerful pkgbinarymangler translation-stripping gods

diff --git a/debian/changelog b/debian/changelog
index 45bc3f1..78e1ab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,10 @@ mesa (7.11-0ubuntu1) oneiric; urgency=low
   * debian/patches/118_fix_24bpp_software_rendering.diff:
 - Cherry pick upstream patch from master fixing graphical corruption when
   using a 24bpp framebuffer and software rendering. (LP: #810339)
+  * debian/rules:
+  * debian/clean:
+- Generate xmlpool pot file and clean up other po files for
+  pkgbinarymangler's benefit (LP: #410264).
 
  -- Christopher James Halse Rogers   Tue, 19 Jul 2011 
09:15:22 +1000
 
diff --git a/debian/clean b/debian/clean
index 34193d8..89386ce 100644
--- a/debian/clean
+++ b/debian/clean
@@ -32,3 +32,6 @@ debian/libgl1-mesa-swx11.postinst
 debian/libgl1-mesa-swx11.prerm
 debian/libgbm1.install
 debian/libgbm-dev.install
+
+# And for pkgstriptranslation's benefit…
+src/mesa/drivers/dri/common/xmlpool/xmlpool.pot
diff --git a/debian/rules b/debian/rules
index 098fee4..2516c61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -225,6 +225,10 @@ $(QUILT_STAMPFN): $(STAMP_DIR)/stamp
 build: build-stamp
 
 build-stamp: $(BUILD_STAMPS)
+   # Build pot file for pkgstriptranslations
+   # We do this only once, and outside the build trees, so that
+   # pkgstriptranslations doesn't get confused.
+   $(MAKE) -C src/mesa/drivers/dri/common/xmlpool pot
>$@
 
 $(STAMP)-build-%: configure
@@ -240,6 +244,11 @@ $(STAMP)-build-%: configure
 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 --localstatedir=/var $(confflags) $(confflags-$*)
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
+
+   # Remove extra po files.  These confuse pkgstriptranslations
+   # and aren't shipped anyway.
+   rm $(DEB_BUILD_DIR)/$*/src/mesa/drivers/dri/common/xmlpool/*.po ; \
+
>$@
 
 install: build


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qor5y-0003lb...@vasks.debian.org



libcompizconfig: Changes to 'upstream-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS   |   34 
 CMakeLists.txt|   16 
 ChangeLog | 2200 ++
 NEWS  |   25 
 VERSION   |2 
 backend/CMakeLists.txt|7 
 cmake/LibCompizConfigCommon.cmake |   17 
 7 files changed, 2268 insertions(+), 33 deletions(-)

New commits:
commit f3918b7127cea9575455d4e85705888add40e54b
Author: Janos Guljas 
Date:   Tue Aug 2 04:36:55 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 139597f..68e9d7e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,32 @@
-
-
+Christopher James Halse Rogers 
+Danny Baumann 
+Danny Baumann 
+Danny Baumann 
+Danny Baumann 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Didier Roche 
+Dominique Leuenberger 
+Erkin Bahceci 
+Guillaume Seguin 
+Guillaume Seguin 
+Jigish Gohil 
+Kristian Lyngstol 
+Live session user 
+Lubos Lunak 
+Patrick Niklaus 
+Quinn Storm 
+Roland Baer 
+Roland Bär 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Scott Moreau 
+Travis Watkins 
+Treviño - 3v1n0 
+maniac 
+marex 
+onestone 
+racarr 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0583a53..d2f7f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ project (libcompizconfig)
 
 find_package (Compiz REQUIRED)
 
+set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
+set (LIBCOMPIZCONFIG_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${LIBCOMPIZCONFIGZ_CMAKE_MODULE_PATH})
+
 include (CompizCommon)
 include (CompizPackage)
 include (CheckLibraryExists)
@@ -12,11 +16,10 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_SOURCE_DIR}/cmake)
 # libcompizconfig package version number
 # An odd micro number indicates in-progress development.
 # An even micro number indicates a released version.
-set (LIBCOMPIZCONFIG_VERSION_MAJOR 0)
-set (LIBCOMPIZCONFIG_VERSION_MINOR 9)
-set (LIBCOMPIZCONFIG_VERSION_MICRO 4)
-set (LIBCOMPIZCONFIG_VERSION_MACRO 0)
-set (VERSION 
${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO})
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 
0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
+
+set (VERSION ${COMPIZ_RELEASE_VERSION})
 
 set (_libcompizconfig_package_string "LibCompizConfig ${VERSION}")
 set (_libcompizconfig_package "LibCompizCompiz")
@@ -195,3 +198,6 @@ compiz_ensure_linkage ()
 compiz_package_generation ("CompizConfig Library")
 add_uninstall ()
 compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
diff --git a/ChangeLog b/ChangeLog
index e69de29..b5fe7db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,2200 @@
+Sam Spilsbury 2011-07-13
+
+There is no sane reason to have backends always go in the same path as the
+detected libcompizconfig, so mandate that they go in CMAKE_INSTALL_PREFIX
+for now
+
+Sam Spilsbury 2011-07-07
+
+Support new release commands
+
+Sam Spilsbury 2011-07-07
+
+Bump VERSION
+
+Scott Moreau 2011-06-30
+
+Actually bump version to 0.9.5.
+
+Scott Moreau 2011-05-13
+
+* Bump version to 0.9.5
+
+Sam Spilsbury 2011-03-07
+
+"Bump VERSION to 0.9.4"
+
+Sam Spilsbury 2011-03-07
+
+"Update CMake Version"
+
+Sam Spilsbury 2011-03-07
+
+"Update news for 0.9.4 release"
+
+Sam Spilsbury 2010-11-25
+
+Revert "Add a COMPIZCONFIG_PROFILE env var so that distributions and"
+
+This reverts commit e1438fb552487271ebed9894516c74210eb3de81.
+
+No need for it, we have COMPIZ_CONFIG_PROFILE
+
+Sam Spilsbury 2010-11-25
+
+Ensure that we install the config defaults in SYSCONFDIR and also add a 
custom target for it
+
+Merge: e1438fb 9405fc9
+Sam Spilsbury 2010-11-22
+
+Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/libcompizconfig
+
+Sam Spilsbury 2010-11-22
+
+Add a COMPIZCONFIG_PROFILE env var so that distributions and
+session managers can specify per-session profiles
+
+Didier Roche  2010-11-18
+
+Give a default value to COMPIZ_SYSCONFDIR
+
+That enables SYSCONFDIR to get one and so, reading the Global configuration
+file.
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-11-06
+
+Add a LIBCOMPIZCONFIG_VERSION_MACRO and update to 0.9.2.1
+
+Sam Spilsbury 2010-10-24
+
+Fix warnings when protobuf is disabled
+
+Sam Spilsbury 2010-10-24
+
+Update NEWS for 0.9.2
+
+Sam Spilsbury 2010-09-29
+
+Update INSTALL file
+
+Sam Spilsbury 2010-08-20
+
+Fix backends not linking against libraries specified in PKGDEPS
+
+Sam Spilsbury 2010-07-04
+
+Update NEWS for 0.9.0 release
+
+Sam 

libcompizconfig: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS   |   34 
 CMakeLists.txt|   16 
 ChangeLog | 2200 ++
 NEWS  |   25 
 VERSION   |2 
 backend/CMakeLists.txt|7 
 cmake/LibCompizConfigCommon.cmake |   17 
 debian/changelog  |7 
 debian/control|6 
 debian/watch  |2 
 10 files changed, 2279 insertions(+), 37 deletions(-)

New commits:
commit 3af50d54ff2561056bd59b68369770b4737d8151
Author: Janos Guljas 
Date:   Wed Aug 3 23:13:02 2011 +0200

Prepare changelog and bump Standards-Version.

diff --git a/debian/changelog b/debian/changelog
index 02ebd74..7fa9e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcompizconfig (0.9.5.0-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+ -- Janos Guljas   Tue, 02 Aug 2011 04:36:55 +0200
+
 libcompizconfig (0.9.4-1) experimental; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 68f3771..79658b6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force 
 Uploaders: Sean Finney 
-Build-Depends: debhelper (>= 7.0.50~), cmake, intltool, compiz-dev (>= 
0.9.2.1),
+Build-Depends: debhelper (>= 7.0.50~), cmake, intltool, compiz-dev (>= 
0.9.5.0),
  pkg-config, libxml2-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler,
- libxslt1-dev, xsltproc, libboost1.42-dev, libboost-serialization1.42-dev
-Standards-Version: 3.9.1
+ libxslt1-dev, xsltproc, libboost-dev, libboost-serialization-dev
+Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.compiz.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/libcompizconfig.git

commit f3918b7127cea9575455d4e85705888add40e54b
Author: Janos Guljas 
Date:   Tue Aug 2 04:36:55 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 139597f..68e9d7e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,32 @@
-
-
+Christopher James Halse Rogers 
+Danny Baumann 
+Danny Baumann 
+Danny Baumann 
+Danny Baumann 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Didier Roche 
+Dominique Leuenberger 
+Erkin Bahceci 
+Guillaume Seguin 
+Guillaume Seguin 
+Jigish Gohil 
+Kristian Lyngstol 
+Live session user 
+Lubos Lunak 
+Patrick Niklaus 
+Quinn Storm 
+Roland Baer 
+Roland Bär 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Scott Moreau 
+Travis Watkins 
+Treviño - 3v1n0 
+maniac 
+marex 
+onestone 
+racarr 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0583a53..d2f7f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ project (libcompizconfig)
 
 find_package (Compiz REQUIRED)
 
+set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
+set (LIBCOMPIZCONFIG_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${LIBCOMPIZCONFIGZ_CMAKE_MODULE_PATH})
+
 include (CompizCommon)
 include (CompizPackage)
 include (CheckLibraryExists)
@@ -12,11 +16,10 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_SOURCE_DIR}/cmake)
 # libcompizconfig package version number
 # An odd micro number indicates in-progress development.
 # An even micro number indicates a released version.
-set (LIBCOMPIZCONFIG_VERSION_MAJOR 0)
-set (LIBCOMPIZCONFIG_VERSION_MINOR 9)
-set (LIBCOMPIZCONFIG_VERSION_MICRO 4)
-set (LIBCOMPIZCONFIG_VERSION_MACRO 0)
-set (VERSION 
${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO})
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 
0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
+
+set (VERSION ${COMPIZ_RELEASE_VERSION})
 
 set (_libcompizconfig_package_string "LibCompizConfig ${VERSION}")
 set (_libcompizconfig_package "LibCompizCompiz")
@@ -195,3 +198,6 @@ compiz_ensure_linkage ()
 compiz_package_generation ("CompizConfig Library")
 add_uninstall ()
 compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
diff --git a/ChangeLog b/ChangeLog
index e69de29..b5fe7db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,2200 @@
+Sam Spilsbury 2011-07-13
+
+There is no sane reason to have backends always go in the same path as the
+detected libcompizconfig, so mandate that they go in CMAKE_INSTALL_PREFIX
+for now
+
+Sam Spilsbury 2011-07-07
+
+Support new release commands
+
+Sam Spilsbury 2011-07-07
+
+Bump VERSION
+
+Scott Moreau 2011-06-30
+
+Actually bump version to 0.9.5.
+
+Scott Moreau 2011-05-13
+
+* Bump version to 0.9.5
+
+Sam Spilsbury 2011-03-07
+
+"Bump VERSION to 0.9.4"
+
+Sam Spilsbury 2011-03-07
+
+"Update CMake Version"
+
+Sam Spilsbury 2011-03-07
+
+"Update news for 0.9.4 releas

compiz-fusion-plugins-main: Changes to 'upstream-unstable'

2011-08-03 Thread Janos Guljas
 .gitmodules  |3 
 AUTHORS  |   58 
 CMakeLists.txt   |   13 
 ChangeLog|  875 +++
 NEWS |   19 
 VERSION  |1 
 animation|1 
 animation/CMakeLists.txt |7 
 animation/VERSION|1 
 animation/animation.xml.in   |  757 +++
 animation/compiz-animation.pc.in |   12 
 animation/docs/animation-class-hierarchy.odg |binary
 animation/include/.directory |3 
 animation/include/animation/animation.h  |   77 
 animation/include/animation/animeffect.h |  209 
 animation/include/animation/extensionplugin.h|   71 
 animation/include/animation/fade.h   |   19 
 animation/include/animation/grid.h   |  106 
 animation/include/animation/gridtransform.h  |   22 
 animation/include/animation/multi.h  |  397 +
 animation/include/animation/partialwindow.h  |   25 
 animation/include/animation/persistent.h |   18 
 animation/include/animation/point3d.h|  105 
 animation/include/animation/screen.h |   35 
 animation/include/animation/transform.h  |   34 
 animation/include/animation/window.h |   67 
 animation/include/animation/zoom.h   |   70 
 animation/src/animation.cpp  | 2852 +++
 animation/src/curvedfold.cpp |  254 +
 animation/src/dodge.cpp  |  876 +++
 animation/src/dream.cpp  |  156 
 animation/src/extensionplugin.cpp|  841 +++
 animation/src/fade.cpp   |   61 
 animation/src/focusfade.cpp  |  131 
 animation/src/glide.cpp  |  192 
 animation/src/grid.cpp   |  711 ++
 animation/src/horizontalfold.cpp |  204 
 animation/src/magiclamp.cpp  |  509 ++
 animation/src/options.cpp|  354 +
 animation/src/private.h  |  806 +++
 animation/src/restack.cpp|  405 +
 animation/src/rollup.cpp |  150 
 animation/src/transform.cpp  |  146 
 animation/src/wave.cpp   |  144 
 animation/src/zoomside.cpp   |  451 +
 colorfilter  |1 
 colorfilter/AUTHORS  |5 
 colorfilter/CMakeLists.txt   |5 
 colorfilter/VERSION  |1 
 colorfilter/colorfilter.xml.in   |   66 
 colorfilter/compiz-core-print-fragment-program.patch |   79 
 colorfilter/data/filters/blackandwhite   |   11 
 colorfilter/data/filters/blueish-filter  |   10 
 colorfilter/data/filters/contrast|   21 
 colorfilter/data/filters/deuteranopia|   43 
 colorfilter/data/filters/grayscale   |6 
 colorfilter/data/filters/negative|9 
 colorfilter/data/filters/negative-green  |   10 
 colorfilter/data/filters/protanopia  |   43 
 colorfilter/data/filters/sepia   |9 
 colorfilter/data/filters/swap-green-blue |5 
 colorfilter/data/filters/swap-red-blue   |5 
 colorfilter/data/filters/swap-red-green  |5 
 colorfilter/src/colorfilter.cpp  |  507 ++
 colorfilter/src/colorfilter.h|  181 
 colorfilter/src/parser.cpp   |  537 ++
 colorfilter/src/parser.h |  105 
 expo |1 
 expo/CMakeLists.txt  |7 
 expo/VERSION |1 
 expo/expo.xml.in |  257 +
 expo/src/expo.cpp| 1376 +
 expo/src/expo.h  |  162 
 ezoom|1 
 ezoom/CMakeLists.txt |5 
 ezoom/VERSION|1 
 ezoom/ezoom.xml.in   |  288 +
 ezoom/src/ezoom.cpp  | 1949 
 ezoom/src/ezoom.h|  401 +
 grid/CMakeLists.txt  

compiz-fusion-plugins-main: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 .gitmodules  |3 
 AUTHORS  |   58 
 CMakeLists.txt   |   13 
 ChangeLog|  875 +++
 NEWS |   19 
 VERSION  |1 
 animation|1 
 animation/CMakeLists.txt |7 
 animation/VERSION|1 
 animation/animation.xml.in   |  757 +++
 animation/compiz-animation.pc.in |   12 
 animation/docs/animation-class-hierarchy.odg |binary
 animation/include/.directory |3 
 animation/include/animation/animation.h  |   77 
 animation/include/animation/animeffect.h |  209 
 animation/include/animation/extensionplugin.h|   71 
 animation/include/animation/fade.h   |   19 
 animation/include/animation/grid.h   |  106 
 animation/include/animation/gridtransform.h  |   22 
 animation/include/animation/multi.h  |  397 +
 animation/include/animation/partialwindow.h  |   25 
 animation/include/animation/persistent.h |   18 
 animation/include/animation/point3d.h|  105 
 animation/include/animation/screen.h |   35 
 animation/include/animation/transform.h  |   34 
 animation/include/animation/window.h |   67 
 animation/include/animation/zoom.h   |   70 
 animation/src/animation.cpp  | 2852 +++
 animation/src/curvedfold.cpp |  254 +
 animation/src/dodge.cpp  |  876 +++
 animation/src/dream.cpp  |  156 
 animation/src/extensionplugin.cpp|  841 +++
 animation/src/fade.cpp   |   61 
 animation/src/focusfade.cpp  |  131 
 animation/src/glide.cpp  |  192 
 animation/src/grid.cpp   |  711 ++
 animation/src/horizontalfold.cpp |  204 
 animation/src/magiclamp.cpp  |  509 ++
 animation/src/options.cpp|  354 +
 animation/src/private.h  |  806 +++
 animation/src/restack.cpp|  405 +
 animation/src/rollup.cpp |  150 
 animation/src/transform.cpp  |  146 
 animation/src/wave.cpp   |  144 
 animation/src/zoomside.cpp   |  451 +
 colorfilter  |1 
 colorfilter/AUTHORS  |5 
 colorfilter/CMakeLists.txt   |5 
 colorfilter/VERSION  |1 
 colorfilter/colorfilter.xml.in   |   66 
 colorfilter/compiz-core-print-fragment-program.patch |   79 
 colorfilter/data/filters/blackandwhite   |   11 
 colorfilter/data/filters/blueish-filter  |   10 
 colorfilter/data/filters/contrast|   21 
 colorfilter/data/filters/deuteranopia|   43 
 colorfilter/data/filters/grayscale   |6 
 colorfilter/data/filters/negative|9 
 colorfilter/data/filters/negative-green  |   10 
 colorfilter/data/filters/protanopia  |   43 
 colorfilter/data/filters/sepia   |9 
 colorfilter/data/filters/swap-green-blue |5 
 colorfilter/data/filters/swap-red-blue   |5 
 colorfilter/data/filters/swap-red-green  |5 
 colorfilter/src/colorfilter.cpp  |  507 ++
 colorfilter/src/colorfilter.h|  181 
 colorfilter/src/parser.cpp   |  537 ++
 colorfilter/src/parser.h |  105 
 debian/changelog |7 
 debian/control   |4 
 debian/rules |1 
 debian/watch |2 
 expo |1 
 expo/CMakeLists.txt  |7 
 expo/VERSION |1 
 expo/expo.xml.in |  257 +
 expo/src/expo.cpp| 1376 +
 expo/src/expo.h  |  162 
 ezoom|1 
 ezoom/CMakeLists.txt |5 
 ezoom/VERSION| 

compiz-fusion-plugins-extra: Changes to 'upstream-unstable'

2011-08-03 Thread Janos Guljas
 .gitmodules|3 
 3d |1 
 3d/CMakeLists.txt  |5 
 3d/VERSION |1 
 3d/src/3d.cpp  |  615 
 3d/src/3d.h|  156 
 3d/td.xml.in   |  111 
 AUTHORS|   58 
 CMakeLists.txt |   13 
 ChangeLog  |  711 
 NEWS   |   13 
 VERSION|1 
 addhelper  |1 
 addhelper/CMakeLists.txt   |5 
 addhelper/Makefile |  533 
 addhelper/VERSION  |1 
 addhelper/addhelper.xml.in |   63 
 addhelper/src/addhelper.cpp|  272 
 addhelper/src/addhelper.h  |  125 
 animationaddon |1 
 animationaddon/CMakeLists.txt  |7 
 animationaddon/VERSION |1 
 animationaddon/animationaddon.xml.in   |  529 
 animationaddon/compiz-animationaddon.pc.in |   12 
 animationaddon/include/animationaddon/animationaddon.h |  341 
 animationaddon/src/airplane.cpp|  769 
 animationaddon/src/animation_tex.h |  222 
 animationaddon/src/animationaddon.cpp  |  287 
 animationaddon/src/beamup.cpp  |  235 
 animationaddon/src/burn.cpp|  424 
 animationaddon/src/dissolve.cpp|   66 
 animationaddon/src/domino.cpp  |  281 
 animationaddon/src/explode.cpp |  113 
 animationaddon/src/fold.cpp|  253 
 animationaddon/src/glide3.cpp  |   84 
 animationaddon/src/leafspread.cpp  |  107 
 animationaddon/src/particle.cpp|  327 
 animationaddon/src/polygon.cpp | 1995 +
 animationaddon/src/private.h   |  370 
 animationaddon/src/skewer.cpp  |  228 
 bench  |1 
 bench/CMakeLists.txt   |6 
 bench/VERSION  |1 
 bench/bench.xml.in |   83 
 bench/src/bench.cpp|  455 
 bench/src/bench.h  |  117 
 bench/src/bench_tex.h  |21764 +
 bicubic|1 
 bicubic/CMakeLists.txt |5 
 bicubic/VERSION|1 
 bicubic/bicubic.xml.in |   20 
 bicubic/src/bicubic.cpp|  316 
 bicubic/src/bicubic.h  |   94 
 crashhandler   |1 
 crashhandler/CMakeLists.txt|5 
 crashhandler/VERSION   |1 
 crashhandler/crashhandler.xml.in   |   35 
 crashhandler/src/crashhandler.cpp  |  150 
 crashhandler/src/crashhandler.h|   48 
 cubeaddon  |1 
 cubeaddon/CMakeLists.txt   |6 
 cubeaddon/VERSION  |1 
 cubeaddon/cubeaddon.xml.in |  280 
 cubeaddon/images/compizcap.png |binary
 cubeaddon/images/cubecap_release.png   |binary
 cubeaddon/images/fusioncap.png |binary
 cubeaddon/src/cubeaddon.cpp| 1476 +
 cubeaddon/src/cubeaddon.h  |  187 
 extrawm|1 
 extrawm/CMakeLists.txt |5 
 extrawm/VERSION|1 
 extrawm/extrawm.xml.in |   41 
 extrawm/src/extrawm.cpp|  327 
 extrawm/src/extrawm.h  |  116 
 fadedesktop|1 
 fadedesktop/CMakeLists.txt |5 
 fadedesktop/VERSION|1 
 fadedesktop/fadedesktop.xml.in 

compiz-fusion-plugins-extra: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 .gitmodules|3 
 3d |1 
 3d/CMakeLists.txt  |5 
 3d/VERSION |1 
 3d/src/3d.cpp  |  615 
 3d/src/3d.h|  156 
 3d/td.xml.in   |  111 
 AUTHORS|   58 
 CMakeLists.txt |   13 
 ChangeLog  |  711 
 NEWS   |   13 
 VERSION|1 
 addhelper  |1 
 addhelper/CMakeLists.txt   |5 
 addhelper/Makefile |  533 
 addhelper/VERSION  |1 
 addhelper/addhelper.xml.in |   63 
 addhelper/src/addhelper.cpp|  272 
 addhelper/src/addhelper.h  |  125 
 animationaddon |1 
 animationaddon/CMakeLists.txt  |7 
 animationaddon/VERSION |1 
 animationaddon/animationaddon.xml.in   |  529 
 animationaddon/compiz-animationaddon.pc.in |   12 
 animationaddon/include/animationaddon/animationaddon.h |  341 
 animationaddon/src/airplane.cpp|  769 
 animationaddon/src/animation_tex.h |  222 
 animationaddon/src/animationaddon.cpp  |  287 
 animationaddon/src/beamup.cpp  |  235 
 animationaddon/src/burn.cpp|  424 
 animationaddon/src/dissolve.cpp|   66 
 animationaddon/src/domino.cpp  |  281 
 animationaddon/src/explode.cpp |  113 
 animationaddon/src/fold.cpp|  253 
 animationaddon/src/glide3.cpp  |   84 
 animationaddon/src/leafspread.cpp  |  107 
 animationaddon/src/particle.cpp|  327 
 animationaddon/src/polygon.cpp | 1995 +
 animationaddon/src/private.h   |  370 
 animationaddon/src/skewer.cpp  |  228 
 bench  |1 
 bench/CMakeLists.txt   |6 
 bench/VERSION  |1 
 bench/bench.xml.in |   83 
 bench/src/bench.cpp|  455 
 bench/src/bench.h  |  117 
 bench/src/bench_tex.h  |21764 +
 bicubic|1 
 bicubic/CMakeLists.txt |5 
 bicubic/VERSION|1 
 bicubic/bicubic.xml.in |   20 
 bicubic/src/bicubic.cpp|  316 
 bicubic/src/bicubic.h  |   94 
 crashhandler   |1 
 crashhandler/CMakeLists.txt|5 
 crashhandler/VERSION   |1 
 crashhandler/crashhandler.xml.in   |   35 
 crashhandler/src/crashhandler.cpp  |  150 
 crashhandler/src/crashhandler.h|   48 
 cubeaddon  |1 
 cubeaddon/CMakeLists.txt   |6 
 cubeaddon/VERSION  |1 
 cubeaddon/cubeaddon.xml.in |  280 
 cubeaddon/images/compizcap.png |binary
 cubeaddon/images/cubecap_release.png   |binary
 cubeaddon/images/fusioncap.png |binary
 cubeaddon/src/cubeaddon.cpp| 1476 +
 cubeaddon/src/cubeaddon.h  |  187 
 debian/changelog   |7 
 debian/control |4 
 debian/watch   |2 
 extrawm|1 
 extrawm/CMakeLists.txt |5 
 extrawm/VERSION|1 
 extrawm/extrawm.xml.in |   41 
 extrawm/src/extrawm.cpp|  327 
 extrawm/src/extrawm.h  |  116 
 fadedesktop

compizconfig-python: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS  |   17 +
 CMakeLists.txt   |   40 ++
 ChangeLog|  748 +++
 INSTALL  |6 
 NEWS |   17 -
 VERSION  |2 
 debian/changelog |7 
 debian/control   |2 
 debian/watch |2 
 9 files changed, 822 insertions(+), 19 deletions(-)

New commits:
commit c63521c15f6801bbcc4cb44c58c08914d8827d99
Author: Janos Guljas 
Date:   Wed Aug 3 23:10:52 2011 +0200

Prepare changelog and bump Standards-Version.

diff --git a/debian/changelog b/debian/changelog
index c138ec2..d153a60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+compizconfig-python (0.9.5.0-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+ -- Janos Guljas   Tue, 02 Aug 2011 21:28:57 +0200
+
 compizconfig-python (0.9.2.1+git20110224.5ccb653e-1) experimental; urgency=low
 
   [ Janos Guljas ]
diff --git a/debian/control b/debian/control
index f0cf281..4a38283 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Sean Finney 
 Build-Depends: debhelper (>= 7.0.50~), libtool, compiz-dev (>= 0.9.0),
  libglib2.0-dev, libxml2-dev, libxslt1-dev, libcompizconfig-dev (>= 0.9.0),
  python-all-dev, python-pyrex, cython
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.6
 Section: python
 Homepage: http://www.compiz.org/

commit 387f028788363d88a7b41dd03d4dab9ce1ccb055
Author: Janos Guljas 
Date:   Tue Aug 2 21:28:57 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index e69de29..502934d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -0,0 +1,17 @@
+Christopher Williams 
+Danny Baumann 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Dominique Leuenberger 
+Erkin Bahceci 
+Guillaume Seguin 
+Marien Zwart 
+Patrick Niklaus 
+Quinn Storm 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Scott Moreau 
+Treviño - 3v1n0 
+compiz 
+marex 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000..0bc584f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,40 @@
+find_package (CompizConfig REQUIRED)
+include (LibCompizConfigCommon)
+
+# Hack
+set (CMAKE_PROJECT_NAME compizconfig-python)
+
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 
0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
+
+set (VERSION ${COMPIZ_RELEASE_VERSION})
+
+add_custom_target (python ALL
+   COMMAND python setup.py build
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+   COMMENT "Generating Python Bytecode")
+
+add_custom_target (install
+  COMMAND python setup.py install 
--prefix=${CMAKE_INSTALL_PREFIX}
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Installing Python Files")
+
+add_custom_target (clean
+  COMMAND python setup.py clean
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Cleaning Python Files")
+
+add_custom_target (uninstall
+  COMMAND python setup.py uninstall
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Uninstalling Python Files")
+
+compiz_print_configure_header ("CompizConfig Python")
+compiz_print_configure_footer ()
+
+compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
+
+
diff --git a/ChangeLog b/ChangeLog
index e69de29..dc48f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,748 @@
+Sam Spilsbury 2011-07-08
+
+project () doesn't seem to work on non C/CXX projects so hack around that
+by skipping it and defining CMAKE_PROJECT_NAME instead
+
+Sam Spilsbury 2011-07-07
+
+Don't add C and CXX to enabled languages
+
+Sam Spilsbury 2011-07-07
+
+Add a simple CMake wrapper around distutils/cython
+
+Sam Spilsbury 2011-07-07
+
+Bump VERSION to 0.9.5.0
+
+Scott Moreau 2011-05-13
+
+* Bump version to 0.9.5
+
+Scott Moreau 2011-03-09
+
+Remove whitespace.
+
+Scott Moreau 2011-03-09
+
+Fix typo.
+
+Sam Spilsbury 2011-03-07
+
+"Bump VERSION to 0.9.4"
+
+Sam Spilsbury 2011-03-07
+
+"Update news for 0.9.4 release"
+
+Guillaume Seguin2011-02-18
+
+Don't drop the stderr since it might give a message to the user
+that could actually be quite useful (eg, adjust PKG_CONFIG_PATH)
+
+Sam Spilsbury 2011-02-18
+
+Add packges and list directly
+
+Sam Spilsbury 2011-02-18
+
+Adjust for subprocess syntax
+
+Sam Spilsbury 2011-02-12
+
+Use subprocess instead of commands and print () instead of print
+because they are deprecated in Python 3.0
+
+Sam Spilsbury 2011-02-12
+
+Use __cinit__ instead of __new__ since its removed in Cython 0.14
+
+Sam Spilsbury 2010-12-02
+
+Don't use tabs/spaces in the pkgconfig block
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-1

compizconfig-python: Changes to 'upstream-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS|   17 +
 CMakeLists.txt |   40 +++
 ChangeLog  |  748 +
 INSTALL|6 
 NEWS   |   17 -
 VERSION|2 
 6 files changed, 813 insertions(+), 17 deletions(-)

New commits:
commit 387f028788363d88a7b41dd03d4dab9ce1ccb055
Author: Janos Guljas 
Date:   Tue Aug 2 21:28:57 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index e69de29..502934d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -0,0 +1,17 @@
+Christopher Williams 
+Danny Baumann 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Dominique Leuenberger 
+Erkin Bahceci 
+Guillaume Seguin 
+Marien Zwart 
+Patrick Niklaus 
+Quinn Storm 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Scott Moreau 
+Treviño - 3v1n0 
+compiz 
+marex 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000..0bc584f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,40 @@
+find_package (CompizConfig REQUIRED)
+include (LibCompizConfigCommon)
+
+# Hack
+set (CMAKE_PROJECT_NAME compizconfig-python)
+
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 
0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
+
+set (VERSION ${COMPIZ_RELEASE_VERSION})
+
+add_custom_target (python ALL
+   COMMAND python setup.py build
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+   COMMENT "Generating Python Bytecode")
+
+add_custom_target (install
+  COMMAND python setup.py install 
--prefix=${CMAKE_INSTALL_PREFIX}
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Installing Python Files")
+
+add_custom_target (clean
+  COMMAND python setup.py clean
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Cleaning Python Files")
+
+add_custom_target (uninstall
+  COMMAND python setup.py uninstall
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Uninstalling Python Files")
+
+compiz_print_configure_header ("CompizConfig Python")
+compiz_print_configure_footer ()
+
+compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
+
+
diff --git a/ChangeLog b/ChangeLog
index e69de29..dc48f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,748 @@
+Sam Spilsbury 2011-07-08
+
+project () doesn't seem to work on non C/CXX projects so hack around that
+by skipping it and defining CMAKE_PROJECT_NAME instead
+
+Sam Spilsbury 2011-07-07
+
+Don't add C and CXX to enabled languages
+
+Sam Spilsbury 2011-07-07
+
+Add a simple CMake wrapper around distutils/cython
+
+Sam Spilsbury 2011-07-07
+
+Bump VERSION to 0.9.5.0
+
+Scott Moreau 2011-05-13
+
+* Bump version to 0.9.5
+
+Scott Moreau 2011-03-09
+
+Remove whitespace.
+
+Scott Moreau 2011-03-09
+
+Fix typo.
+
+Sam Spilsbury 2011-03-07
+
+"Bump VERSION to 0.9.4"
+
+Sam Spilsbury 2011-03-07
+
+"Update news for 0.9.4 release"
+
+Guillaume Seguin2011-02-18
+
+Don't drop the stderr since it might give a message to the user
+that could actually be quite useful (eg, adjust PKG_CONFIG_PATH)
+
+Sam Spilsbury 2011-02-18
+
+Add packges and list directly
+
+Sam Spilsbury 2011-02-18
+
+Adjust for subprocess syntax
+
+Sam Spilsbury 2011-02-12
+
+Use subprocess instead of commands and print () instead of print
+because they are deprecated in Python 3.0
+
+Sam Spilsbury 2011-02-12
+
+Use __cinit__ instead of __new__ since its removed in Cython 0.14
+
+Sam Spilsbury 2010-12-02
+
+Don't use tabs/spaces in the pkgconfig block
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-11-06
+
+Update to 0.9.2.1
+
+Sam Spilsbury 2010-10-24
+
+Update NEWS for 0.9.2 release
+
+Merge: 22b38c0 2351cfd
+Sam Spilsbury 2010-07-04
+
+Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-python
+
+Guillaume Seguin2010-07-04
+
+Whitespace fix
+
+Guillaume Seguin2010-07-04
+
+Distribute C file
+
+Sam Spilsbury 2010-07-04
+
+Update NEWS for 0.9.0 release
+
+Sam Spilsbury 2010-07-04
+
+Add maintainer and maintainer email fields
+
+Merge: b94163b 0725bc3
+Sam Spilsbury 2010-07-04
+
+Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-python
+
+Conflicts:
+MANIFEST.in   
+
+Guillaume Seguin2010-07-04
+
+Add MANIFEST.in
+
+Sam Spilsbury 2010-07-04
+
+Add MANIFEST.in to get correct files for sdist and simple Makefile
+as a wrapper around setuptools
+
+Sam Spilsbury 2010-07-04
+
+Better version reading and update package info
+
+Sam Spilsbury 2010-07-04
+
+Bump version
+
+Sam Spilsbury 2010-06-19
+
+Add a better rpath on/off switch
+
+Sa

compizconfig-backend-gconf: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS  |   19 +
 CMakeLists.txt   |   12 
 ChangeLog|  738 +++
 NEWS |   17 -
 VERSION  |2 
 debian/changelog |7 
 debian/control   |2 
 debian/watch |2 
 src/gconf.c  |8 
 9 files changed, 773 insertions(+), 34 deletions(-)

New commits:
commit 72d13ac56655ff5cdd792e247e8bf26a570df660
Author: Janos Guljas 
Date:   Wed Aug 3 23:10:00 2011 +0200

Prepare changelog and bump Standards-Version.

diff --git a/debian/changelog b/debian/changelog
index 378a617..25183e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+compizconfig-backend-gconf (0.9.5.0-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+ -- Janos Guljas   Tue, 02 Aug 2011 21:25:13 +0200
+
 compizconfig-backend-gconf (0.9.2.1+git20110226.g861a1d4-2) experimental; 
urgency=low
 
   * Add a Depends compiz-core-abiversion-${coreabiversion}
diff --git a/debian/control b/debian/control
index 0e4159a..b763e88 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Sean Finney 
 Build-Depends: debhelper (>= 7.0.50~), cmake, intltool, pkg-config, libtool,
  compiz-dev (>= 0.9.0), libcompizconfig-dev (>= 0.9.0), libglib2.0-dev,
  libgconf2-dev, libxslt1-dev, libxml2-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: x11
 Homepage: http://www.compiz.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git

commit fa24b9a140e813b56c86c32d64de28af9f7c0163
Author: Janos Guljas 
Date:   Tue Aug 2 21:25:12 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 8b13789..dd427ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,18 @@
-
+Christopher Williams 
+Danny Baumann 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Didier Roche 
+Erkin Bahceci 
+Guido Iribarren 
+Guillaume Seguin 
+Jigish Gohil 
+Kristian Lyngstøl 
+Robert Carr 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Scott Moreau 
+maniac 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab43d0..caee4b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ include (LibCompizConfigCommon)
 
 compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
 
-# compizconfig-gconf package version number
-# An odd micro number indicates in-progress development.
-# An even micro number indicates a released version.
-set (COMPIZCONFIG_GCONF_VERSION_MAJOR 0)
-set (COMPIZCONFIG_GCONF_VERSION_MINOR 9)
-set (COMPIZCONFIG_GCONF_VERSION_MICRO 2)
-set (COMPIZCONFIG_GCONF_VERSION_MACRO 1)
-set (VERSION 
${COMPIZCONFIG_GCONF_VERSION_MAJOR}.${COMPIZCONFIG_GCONF_VERSION_MINOR}.${COMPIZCONFIG_GCONF_VERSION_MICRO}.${COMPIZCONFIG_GCONF_VERSION_MACRO})
-
 compiz_print_configure_header ("CompizConfig GConf Storage Backend")
 compiz_print_configure_footer ()
-
-compiz_add_uninstall ()
 compiz_package_generation ("CompizConfig GConf Storage Backend")
-compiz_add_git_dist ()
diff --git a/ChangeLog b/ChangeLog
index e69de29..fde4aa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,738 @@
+Sam Spilsbury 2011-07-13
+
+Added some extended debugging info when failing to read keys
+
+Sam Spilsbury 2011-07-07
+
+Add new release commands
+
+Sam Spilsbury 2011-07-07
+
+Bump VERSION
+
+Scott Moreau 2011-05-13
+
+* Bump version to 0.9.5
+
+Sam Spilsbury 2011-03-07
+
+"Bump VERSION to 0.9.4"
+
+Sam Spilsbury 2011-03-07
+
+"Update CMake Version"
+
+Sam Spilsbury 2011-03-07
+
+"Update news for 0.9.4 release"
+
+Sam Spilsbury  2010-12-13
+
+Fix branch confusion
+
+Merge: 9e2664b 55a267f
+Sam Spilsbury 2010-12-10
+
+Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-backend-gconf
+
+Sam Spilsbury 2010-12-10
+
+Add multiscreen support
+
+Sam Spilsbury 2010-12-10
+
+Fix setting /allscreens, we should set /screen%i (defaults to screen 0)
+
+Didier Roche  2010-11-26
+
+fix schema owner and typo
+
+Sam Spilsbury 2010-11-23
+
+Change paths so that old and new settings don't conflict
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-11-06
+
+Set COMPIZCONFIG_GCONF_VERSION_MACRO and update to 0.9.2.1
+
+Sam Spilsbury 2010-11-06
+
+Update to 0.9.2.1
+
+Sam Spilsbury 2010-10-24
+
+Fix date on NEWS
+
+Sam Spilsbury 2010-10-24
+
+Update NEWS for 0.9.2 release
+
+Sam Spilsbury 2010-07-04
+
+Update NEWS for 0.9.0 release
+
+Sam Spilsbury 2010-07-04
+
+Bump version
+
+Sam Spilsbury 2010-07-04
+
+Set project definition in cmake file
+
+Sam Spilsbury 2010-06-06
+
+Typo
+
+Sam Spilsbury 2010-05-14
+
+Add package generation
+
+Sam Spilsbury 2010-05-14
+
+Update for libcompizconfig buildsystem changes
+and add dist and unins

compizconfig-backend-gconf: Changes to 'upstream-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS|   19 +
 CMakeLists.txt |   12 
 ChangeLog  |  738 +
 NEWS   |   17 -
 VERSION|2 
 src/gconf.c|8 
 6 files changed, 764 insertions(+), 32 deletions(-)

New commits:
commit fa24b9a140e813b56c86c32d64de28af9f7c0163
Author: Janos Guljas 
Date:   Tue Aug 2 21:25:12 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 8b13789..dd427ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,18 @@
-
+Christopher Williams 
+Danny Baumann 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Didier Roche 
+Erkin Bahceci 
+Guido Iribarren 
+Guillaume Seguin 
+Jigish Gohil 
+Kristian Lyngstøl 
+Robert Carr 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Scott Moreau 
+maniac 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab43d0..caee4b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ include (LibCompizConfigCommon)
 
 compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
 
-# compizconfig-gconf package version number
-# An odd micro number indicates in-progress development.
-# An even micro number indicates a released version.
-set (COMPIZCONFIG_GCONF_VERSION_MAJOR 0)
-set (COMPIZCONFIG_GCONF_VERSION_MINOR 9)
-set (COMPIZCONFIG_GCONF_VERSION_MICRO 2)
-set (COMPIZCONFIG_GCONF_VERSION_MACRO 1)
-set (VERSION 
${COMPIZCONFIG_GCONF_VERSION_MAJOR}.${COMPIZCONFIG_GCONF_VERSION_MINOR}.${COMPIZCONFIG_GCONF_VERSION_MICRO}.${COMPIZCONFIG_GCONF_VERSION_MACRO})
-
 compiz_print_configure_header ("CompizConfig GConf Storage Backend")
 compiz_print_configure_footer ()
-
-compiz_add_uninstall ()
 compiz_package_generation ("CompizConfig GConf Storage Backend")
-compiz_add_git_dist ()
diff --git a/ChangeLog b/ChangeLog
index e69de29..fde4aa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,738 @@
+Sam Spilsbury 2011-07-13
+
+Added some extended debugging info when failing to read keys
+
+Sam Spilsbury 2011-07-07
+
+Add new release commands
+
+Sam Spilsbury 2011-07-07
+
+Bump VERSION
+
+Scott Moreau 2011-05-13
+
+* Bump version to 0.9.5
+
+Sam Spilsbury 2011-03-07
+
+"Bump VERSION to 0.9.4"
+
+Sam Spilsbury 2011-03-07
+
+"Update CMake Version"
+
+Sam Spilsbury 2011-03-07
+
+"Update news for 0.9.4 release"
+
+Sam Spilsbury  2010-12-13
+
+Fix branch confusion
+
+Merge: 9e2664b 55a267f
+Sam Spilsbury 2010-12-10
+
+Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-backend-gconf
+
+Sam Spilsbury 2010-12-10
+
+Add multiscreen support
+
+Sam Spilsbury 2010-12-10
+
+Fix setting /allscreens, we should set /screen%i (defaults to screen 0)
+
+Didier Roche  2010-11-26
+
+fix schema owner and typo
+
+Sam Spilsbury 2010-11-23
+
+Change paths so that old and new settings don't conflict
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury 2010-11-06
+
+Set COMPIZCONFIG_GCONF_VERSION_MACRO and update to 0.9.2.1
+
+Sam Spilsbury 2010-11-06
+
+Update to 0.9.2.1
+
+Sam Spilsbury 2010-10-24
+
+Fix date on NEWS
+
+Sam Spilsbury 2010-10-24
+
+Update NEWS for 0.9.2 release
+
+Sam Spilsbury 2010-07-04
+
+Update NEWS for 0.9.0 release
+
+Sam Spilsbury 2010-07-04
+
+Bump version
+
+Sam Spilsbury 2010-07-04
+
+Set project definition in cmake file
+
+Sam Spilsbury 2010-06-06
+
+Typo
+
+Sam Spilsbury 2010-05-14
+
+Add package generation
+
+Sam Spilsbury 2010-05-14
+
+Update for libcompizconfig buildsystem changes
+and add dist and uninstall targets
+
+Merge: 350e4d5 2adeb06
+Sam Spilsbury 2010-05-07
+
+Merge branch 'compiz++' of 
git+ssh://smspil...@git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf
 into compiz++
+
+Merge: 74c3fd4 091f2d0
+Danny Baumann 2010-05-03
+
+Merge branch 'master' of 
git+ssh://git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf
+
+Guido Iribarren2010-05-03
+
+Integrate metacity's resize_with_right_button option.
+
+Sam Spilsbury 2010-04-27
+
+Remove autotools builsystem
+
+Sam Spilsbury 2010-04-23
+
+Add merged autotools / cmake buildsystem and adjust for compiz++
+
+Please use cmake, autotools is deprecated
+
+Sam Spilsbury 2010-04-19
+
+Remove dummy
+
+Sam Spilsbury 2010-04-19
+
+Dummy commit
+
+Sam Spilsbury 2010-04-19
+
+Remove multiple-screen support for compiz++
+
+Guillaume Seguin2009-10-14
+
+* Bump version to 0.8.5
+
+Guillaume Seguin2009-10-14
+
+* Bump version to 0.8.4
+
+Erkin Bahceci  2009-09-25
+
+Sync metacity with staticswitcher instead of switcher.
+
+Erkin Bahceci  2009-09-24
+
+Fix crash (LP: #407020).
+
+Danny Baumann 2009-04-08
+
+Fix warning.
+
+Danny Baumann 2009-04-08
+

compiz: Changes to 'upstream-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS  |  114 
 CMakeLists.txt   |   22 
 ChangeLog|19315 
+-
 NEWS |  501 
 VERSION  |1 
 cmake/CompizCommon.cmake |  340 
 cmake/CompizPlugin.cmake |   18 
 gtk/window-decorator/actionmenu.c|3 
 gtk/window-decorator/cairo.c |7 
 gtk/window-decorator/decorator.c |  297 
 gtk/window-decorator/decorprops.c|   34 
 gtk/window-decorator/frames.c|2 
 gtk/window-decorator/gtk-window-decorator.c  |   26 
 gtk/window-decorator/gtk-window-decorator.h  |   25 
 gtk/window-decorator/metacity.c  |   36 
 gtk/window-decorator/wnck.c  |   19 
 include/compiz-common.h.in   |6 
 include/compiz.h |7 
 include/core/CMakeLists.txt  |3 
 include/core/core.h  |3 
 include/core/option.h|1 
 include/core/plugin.h|   24 
 include/core/pluginclasshandler.h|  122 
 include/core/privateunion.h  |   36 
 include/core/rect.h  |2 
 include/core/screen.h|1 
 include/core/timeouthandler.h|   57 
 include/core/timer.h |   34 
 include/core/valueholder.h   |   53 
 include/core/window.h|9 
 include/decoration.h |   69 
 kde/window-decorator-kde4/decorator.cpp  |   23 
 kde/window-decorator-kde4/decorator.h|   21 
 kde/window-decorator-kde4/switcher.cpp   |   15 
 kde/window-decorator-kde4/utils.cpp  |2 
 kde/window-decorator-kde4/window.cpp |  122 
 kde/window-decorator-kde4/window.h   |2 
 libdecoration/decoration.c   |  188 
 plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h  |6 
 plugins/compiztoolbox/src/compiztoolbox.cpp  |   17 
 plugins/composite/CMakeLists.txt |2 
 plugins/composite/include/composite/composite.h  |8 
 plugins/composite/src/privates.h |1 
 plugins/composite/src/window.cpp |   20 
 plugins/copytex/src/copytex.cpp  |   62 
 plugins/copytex/src/copytex.h|   29 
 plugins/dbus/src/dbus.cpp|1 
 plugins/decor/src/decor.cpp  |  554 
 plugins/decor/src/decor.h|   43 
 plugins/fade/fade.xml.in |2 
 plugins/fade/src/fade.cpp|   67 
 plugins/fade/src/fade.h  |1 
 plugins/move/src/move.cpp|   32 
 plugins/opengl/src/paint.cpp |8 
 plugins/opengl/src/window.cpp|   13 
 plugins/place/src/place.cpp  |  147 
 plugins/place/src/place.h|6 
 plugins/resize/resize.xml.in |  263 
 plugins/resize/src/resize.cpp|  167 
 plugins/scale/src/scale.cpp  |3 
 plugins/switcher/src/switcher.cpp|   10 
 plugins/switcher/switcher.xml.in |4 
 plugins/water/src/water.cpp  |6 
 plugins/wobbly/src/wobbly.cpp|   50 
 src/CMakeLists.txt   |5 
 src/event.cpp|  233 
 src/logmessage.cpp   |   85 
 src/privateeventsource.h 

compiz: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS  |  114 
 CMakeLists.txt   |   22 
 ChangeLog|19315 
+-
 NEWS |  501 
 VERSION  |1 
 cmake/CompizCommon.cmake |  340 
 cmake/CompizPlugin.cmake |   18 
 debian/changelog |8 
 debian/control   |4 
 debian/patches/085_add_grid_plugin.patch | 1461 
 debian/patches/086_new_grid_defaults.patch   |   49 
 debian/patches/series|2 
 debian/watch |2 
 gtk/window-decorator/actionmenu.c|3 
 gtk/window-decorator/cairo.c |7 
 gtk/window-decorator/decorator.c |  297 
 gtk/window-decorator/decorprops.c|   34 
 gtk/window-decorator/frames.c|2 
 gtk/window-decorator/gtk-window-decorator.c  |   26 
 gtk/window-decorator/gtk-window-decorator.h  |   25 
 gtk/window-decorator/metacity.c  |   36 
 gtk/window-decorator/wnck.c  |   19 
 include/compiz-common.h.in   |6 
 include/compiz.h |7 
 include/core/CMakeLists.txt  |3 
 include/core/core.h  |3 
 include/core/option.h|1 
 include/core/plugin.h|   24 
 include/core/pluginclasshandler.h|  122 
 include/core/privateunion.h  |   36 
 include/core/rect.h  |2 
 include/core/screen.h|1 
 include/core/timeouthandler.h|   57 
 include/core/timer.h |   34 
 include/core/valueholder.h   |   53 
 include/core/window.h|9 
 include/decoration.h |   69 
 kde/window-decorator-kde4/decorator.cpp  |   23 
 kde/window-decorator-kde4/decorator.h|   21 
 kde/window-decorator-kde4/switcher.cpp   |   15 
 kde/window-decorator-kde4/utils.cpp  |2 
 kde/window-decorator-kde4/window.cpp |  122 
 kde/window-decorator-kde4/window.h   |2 
 libdecoration/decoration.c   |  188 
 plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h  |6 
 plugins/compiztoolbox/src/compiztoolbox.cpp  |   17 
 plugins/composite/CMakeLists.txt |2 
 plugins/composite/include/composite/composite.h  |8 
 plugins/composite/src/privates.h |1 
 plugins/composite/src/window.cpp |   20 
 plugins/copytex/src/copytex.cpp  |   62 
 plugins/copytex/src/copytex.h|   29 
 plugins/dbus/src/dbus.cpp|1 
 plugins/decor/src/decor.cpp  |  554 
 plugins/decor/src/decor.h|   43 
 plugins/fade/fade.xml.in |2 
 plugins/fade/src/fade.cpp|   67 
 plugins/fade/src/fade.h  |1 
 plugins/move/src/move.cpp|   32 
 plugins/opengl/src/paint.cpp |8 
 plugins/opengl/src/window.cpp|   13 
 plugins/place/src/place.cpp  |  147 
 plugins/place/src/place.h|6 
 plugins/resize/resize.xml.in |  263 
 plugins/resize/src/resize.cpp|  167 
 plugins/scale/src/scale.cpp  |3 
 plugins/switcher/src/switcher.cpp|   10 
 plugins/switcher/switcher.xml

ccsm: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS|   93 
 CMakeLists.txt |   40 
 ChangeLog  | 4088 
++
 NEWS   |   28 
 VERSION|2 
 ccm/Window.py  |4 
 debian/changelog   |8 
 debian/control |2 
 debian/patches/0001-Fix-a-crash-with-the-p-and-C-options.patch |   28 
 debian/patches/series  |1 
 debian/watch   |2 
 11 files changed, 4192 insertions(+), 104 deletions(-)

New commits:
commit 4f800721eebc9a11aafbb614919dca4d69da2b71
Author: Janos Guljas 
Date:   Wed Aug 3 23:05:46 2011 +0200

Prepare changelog and bump Standards-Version.

diff --git a/debian/changelog b/debian/changelog
index 1a7e31c..6f46d98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-ccsm (0.9.5.0-1) experimental; urgency=low
+ccsm (0.9.5.0-0.1) experimental; urgency=low
 
+  * Non-maintainer upload.
   * New upstream release.
   * Remove 0001-Fix-a-crash-with-the-p-and-C-options.patch as applied upstream.
 
diff --git a/debian/control b/debian/control
index 3043286..8bfd932 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Debian X Strike Force 
 Uploaders: Sean Finney 
 Build-Depends: debhelper (>= 7.0.50~), intltool, python (>= 2.6)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.6
 Section: x11
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/ccsm.git

commit 0167886f6d0b4acea4d897f766e0627e51987909
Author: Janos Guljas 
Date:   Tue Aug 2 04:08:18 2011 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 18a9b07..1a7e31c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ccsm (0.9.5.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove 0001-Fix-a-crash-with-the-p-and-C-options.patch as applied upstream.
+
+ -- Janos Guljas   Tue, 02 Aug 2011 04:06:29 +0200
+
 ccsm (0.9.4-1) experimental; urgency=low
 
   * New upstream release. 
diff --git a/debian/patches/0001-Fix-a-crash-with-the-p-and-C-options.patch 
b/debian/patches/0001-Fix-a-crash-with-the-p-and-C-options.patch
deleted file mode 100644
index 76d2c9b..000
--- a/debian/patches/0001-Fix-a-crash-with-the-p-and-C-options.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 27ecfcc1d74455474a42315121cc0aa7b6f83922 Mon Sep 17 00:00:00 2001
-From: Didier Roche 
-Date: Thu, 17 Mar 2011 12:08:00 +0100
-Subject: [PATCH] Fix a crash with the -p and -C options
-

- ccm/Window.py |4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ccm/Window.py b/ccm/Window.py
-index 1b57fcf..05115f7 100644
 a/ccm/Window.py
-+++ b/ccm/Window.py
-@@ -64,9 +64,9 @@ class MainWin(gtk.Window):
- self.show_all()
- 
- if pluginPage in self.Context.Plugins:
--self.ShowPlugin(None, self.Context.Plugins[pluginPage])
-+self.MainPage.ShowPlugin(None, self.Context.Plugins[pluginPage])
- if categoryName in self.Context.Categories:
--self.ToggleCategory(None, categoryName)
-+self.MainPage.ToggleCategory(None, categoryName)
- 
- def Quit(self, *args):
- gtk.main_quit()
--- 
-1.7.4.4
-
diff --git a/debian/patches/series b/debian/patches/series
index d6323ab..5cd8722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 invalid_desktop_category.patch
 01-fix-extension-dir.patch
-0001-Fix-a-crash-with-the-p-and-C-options.patch

commit c3a3864d0d05ce3660f9adc6ab1ad7c30b5d8612
Author: Janos Guljas 
Date:   Tue Aug 2 04:02:20 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 670cb0d..b1360c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,46 +1,47 @@
-Lead Developers:
-
-   
-   Patrick Niklaus 
-   Quinnstorm 
-
-
-Contributors:
-
-   Andrew Wedderburn(artwork) 
-   CCSM icon set is based on the Gnome Icon Set from current SVN. Thanks a 
lot to them. Keep on the great work. :-)
-   Guillaume Seguin 
-   Michael Vogt 
-   Dennis Kasprzyk 
-
-Translators:
-
-   de  Patrick Niklaus , Danny Baumann 
, Nick Bauermeister , Thorsten Sperber 
,  Markus Latarius , Johannes Engel 

-   el  Δημήτρης (djdoo) , Βασίλης (Aneurysm) 
, Κώστας (diafanos) , Thodo Mitch 
(Teddy) , Dimman Ramone (dimmanramone) 

-   fr  iXce - Guillaume Seguin , Sylvain Debray 
(syldeb35) , xsnake - Carl Garand 

-   gu  Ankit Patel 
-   it  Marco

ccsm: Changes to 'upstream-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS|   93 -
 CMakeLists.txt |   40 
 ChangeLog  | 4088 +
 NEWS   |   28 
 VERSION|2 
 ccm/Window.py  |4 
 6 files changed, 4182 insertions(+), 73 deletions(-)

New commits:
commit c3a3864d0d05ce3660f9adc6ab1ad7c30b5d8612
Author: Janos Guljas 
Date:   Tue Aug 2 04:02:20 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 670cb0d..b1360c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,46 +1,47 @@
-Lead Developers:
-
-   
-   Patrick Niklaus 
-   Quinnstorm 
-
-
-Contributors:
-
-   Andrew Wedderburn(artwork) 
-   CCSM icon set is based on the Gnome Icon Set from current SVN. Thanks a 
lot to them. Keep on the great work. :-)
-   Guillaume Seguin 
-   Michael Vogt 
-   Dennis Kasprzyk 
-
-Translators:
-
-   de  Patrick Niklaus , Danny Baumann 
, Nick Bauermeister , Thorsten Sperber 
,  Markus Latarius , Johannes Engel 

-   el  Δημήτρης (djdoo) , Βασίλης (Aneurysm) 
, Κώστας (diafanos) , Thodo Mitch 
(Teddy) , Dimman Ramone (dimmanramone) 

-   fr  iXce - Guillaume Seguin , Sylvain Debray 
(syldeb35) , xsnake - Carl Garand 

-   gu  Ankit Patel 
-   it  Marco Trevisan (Treviño) , Fabio Fiorentini 
(Ahren / FaBBio) , Andrea De Iacovo 
(Firstbit), Emiliano Perulli 

-   pl  Karol Sikora (elektrrrus) , Adam 
Kremienowski (kremien) , Jakub Chromiak 
(silverado), Mariusz Fik (fisiu)  
-   pt  Nicolau Goncalves (Excentrik) 
-   sv  Daniel Nylander , Erik Eloff (Loffe) 

-   zh  Thruth Wang 
-
-Note: 

-If you have contributed something significant to ccsm 
-and your name is missing here, please email the lead developers 
-with your Full name, email address, country and a brief 
-reminder of what you have done.
-
-Format :

-In order to parse AUTHORS files some rules must be followed :
-
-1 - Each first chapter line must end by ':'
-The recognized chapter names are :
-"Developer:", "Developers:", "Contributors:", Note:", "Website:", 
"Documenters:"
-and "Translators:".
-
-2 - Each item of the "Translators" chapter must begin by the locale keyword.
-This keyword must be followed by a space.
-
+Alex Heck 
+Andrew Riedi 
+Andrew Wedderburn 
+Artur Flina 
+C-F Language team 
+C-F language team 
+Christopher Williams 
+Christopher Williams 
+Compiz Fusion l10n team 
+Danny Baumann 
+Danny Baumann 
+Dennis Kasprzyk 
+Dennis Kasprzyk 
+Didier Roche 
+Dominique Leuenberger 
+Dominique Leuenberger 
+Eren Türkay 
+Erkin Bahceci 
+Guillaume Seguin 
+Jigish Gohil 
+Jigish Gohil 
+Jigish Gohil 
+Joe Rusbasan 
+Masaaki KANEMOTO 
+Michael Monreal 
+Michael Vogt 
+Milo Casagrande 
+Nicolau Gonçalves 
+Patrick Niklaus 
+Patrick Niklaus 
+Quinn Storm 
+Quinn Storm 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Sam Spilsbury 
+Scott Moreau 
+Silvia Dobrota 
+Sylvain Debray 
+Travis Watkins 
+Treviño - 3v1n0 
+compiz 
+language team 
+marex 
+quinn 
+root 
+Δημήτρης (djdoo) 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000..1fd971d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,40 @@
+find_package (CompizConfig REQUIRED)
+include (LibCompizConfigCommon)
+
+# Hack
+set (CMAKE_PROJECT_NAME ccsm)
+
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 
0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
+
+set (VERSION ${COMPIZ_RELEASE_VERSION})
+
+add_custom_target (python ALL
+   COMMAND python setup.py build
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+   COMMENT "Generating Python Bytecode")
+
+add_custom_target (install
+  COMMAND python setup.py install 
--prefix=${CMAKE_INSTALL_PREFIX}
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Installing Python Files")
+
+add_custom_target (clean
+  COMMAND python setup.py clean
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Cleaning Python Files")
+
+add_custom_target (uninstall
+  COMMAND python setup.py uninstall
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  COMMENT "Uninstalling Python Files")
+
+compiz_print_configure_header ("CompizConfig Settings Manager")
+compiz_print_configure_footer ()
+
+compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
+
+
diff --git a/ChangeLog b/ChangeLog
index e69de29..54d7863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,4088 @@
+Sam Spilsbury 2011-07-08
+
+Add hack to make distcheck work, project () only wo

xorg-server_1.4.2-10.lenny4_amd64.changes ACCEPTED into oldstable-proposed-updates

2011-08-03 Thread Debian FTP Masters


Notes:
Mapping lenny to oldstable.
Mapping oldstable to oldstable-proposed-updates.


Accepted:
xdmx-tools_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xdmx-tools_1.4.2-10.lenny4_amd64.deb
xdmx_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xdmx_1.4.2-10.lenny4_amd64.deb
xnest_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xnest_1.4.2-10.lenny4_amd64.deb
xorg-server_1.4.2-10.lenny4.diff.gz
  to main/x/xorg-server/xorg-server_1.4.2-10.lenny4.diff.gz
xorg-server_1.4.2-10.lenny4.dsc
  to main/x/xorg-server/xorg-server_1.4.2-10.lenny4.dsc
xprint-common_1.4.2-10.lenny4_all.deb
  to main/x/xorg-server/xprint-common_1.4.2-10.lenny4_all.deb
xprint_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xprint_1.4.2-10.lenny4_amd64.deb
xserver-xephyr_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xserver-xephyr_1.4.2-10.lenny4_amd64.deb
xserver-xorg-core-dbg_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xserver-xorg-core-dbg_1.4.2-10.lenny4_amd64.deb
xserver-xorg-core_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xserver-xorg-core_1.4.2-10.lenny4_amd64.deb
xserver-xorg-dev_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xserver-xorg-dev_1.4.2-10.lenny4_amd64.deb
xvfb_1.4.2-10.lenny4_amd64.deb
  to main/x/xorg-server/xvfb_1.4.2-10.lenny4_amd64.deb


Override entries for your package:
xdmx-tools_1.4.2-10.lenny4_amd64.deb - optional x11
xdmx_1.4.2-10.lenny4_amd64.deb - optional x11
xnest_1.4.2-10.lenny4_amd64.deb - optional x11
xorg-server_1.4.2-10.lenny4.dsc - source x11
xprint-common_1.4.2-10.lenny4_all.deb - optional x11
xprint_1.4.2-10.lenny4_amd64.deb - optional x11
xserver-xephyr_1.4.2-10.lenny4_amd64.deb - optional x11
xserver-xorg-core-dbg_1.4.2-10.lenny4_amd64.deb - extra x11
xserver-xorg-core_1.4.2-10.lenny4_amd64.deb - optional x11
xserver-xorg-dev_1.4.2-10.lenny4_amd64.deb - optional x11
xvfb_1.4.2-10.lenny4_amd64.deb - optional x11

Announcing to debian-chan...@lists.debian.org
Closing bugs: 603015 


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qohxq-0003rd...@franck.debian.org



Bug#603015: marked as done (xserver-xorg-video-intel: [G33] Crash (SEGV) when switching to 3D board in Fritz 12 under wine)

2011-08-03 Thread Debian Bug Tracking System
Your message dated Wed, 03 Aug 2011 19:55:32 +
with message-id 
and subject line Bug#603015: fixed in xorg-server 2:1.4.2-10.lenny4
has caused the Debian Bug report #603015,
regarding xserver-xorg-video-intel: [G33] Crash (SEGV) when switching to 3D 
board in Fritz 12 under wine
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
603015: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=603015
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xserver-xorg-video-intel
Version: 2:2.3.2-2+lenny8
Severity: important


The bug is always reproductible : install Fritz 12 under Lenny's wine, then 
launch the app and switch to 3D board. It is not supposed to work under wine 
yet but it's not 
supposed to make X crash.

Here is a backtrace :

#0  0x0035a7c31ed5 in raise () from /lib/libc.so.6
(gdb) bt full
#0  0x0035a7c31ed5 in raise () from /lib/libc.so.6
No symbol table info available.
#1  0x0035a7c333f3 in abort () from /lib/libc.so.6
No symbol table info available.
#2  0x0046a3a9 in ddxGiveUp () at 
../../../../hw/xfree86/common/xf86Init.c:1073
i = 
#3  0x0057bfc8 in AbortServer () at ../../os/log.c:406
No locals.
#4  0x0057c635 in FatalError (f=0x586dc0 "Caught signal %d.  Server 
aborting\n") at ../../os/log.c:552
args = {{gp_offset = 16, fp_offset = 48, overflow_arg_area = 
0x7fff97511ff0, reg_save_area = 0x7fff97511f30}}
beenhere = 1
#5  0x00486e80 in xf86SigHandler (signo=11) at 
../../../../hw/xfree86/common/xf86Events.c:766
No locals.
#6  
No symbol table info available.
#7  GetDrawableOrPixmap (glxc=0x0, drawId=37748747, ppGlxDraw=0x7fff975125c0, 
ppPixmap=0x7fff975125b8, client=0xe1ff20) at ../../../GL/glx/glxcmds.c:475
vid = 35
pDraw = (DrawablePtr) 0xd7b760
modes = 
pGlxDraw = 
drawPixmap = 
rc = 
#8  0x7fd48e4b771e in __glXDisp_SwapBuffers (cl=0x154bad0, pc=) at ../../../GL/glx/glxcmds.c:1506
client = (ClientPtr) 0xe1ff20
tag = 0
drawId = 37748747
glxc = (__GLXcontext *) 0x0
pGlxDraw = 
pPixmap = (__GLXpixmap *) 0xe1ff20
error = 
#9  0x7fd48e4ba8a5 in __glXDispatch (client=0xe1ff20) at 
../../../GL/glx/glxext.c:561
stuff = (xGLXSingleReq *) 0x332aa10
opcode = 
cl = (__GLXclientState *) 0x154bad0
retval = 1
#10 0x0044f7e2 in Dispatch () at ../../dix/dispatch.c:502
result = 
client = (ClientPtr) 0xe1ff20
nready = 0
start_tick = 260
#11 0x00436bd5 in main (argc=9, argv=0x7fff97512be8, envp=) at ../../dix/main.c:452
i = 1
error = 0
xauthfile = 
alwaysCheckForInput = {0, 1}




-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 fév 23  2010 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1959592 jun 11  2009 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corporation 82G33/G31 Express 
Integrated Graphics Controller (rev 10)

/etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 1136 nov  8 18:50 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "pc105"
Option  "XkbLayout" "fr"
Option  "XkbVariant""latin9"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
EndSection

Section "Device"
Identifier  "Configured Video Device"
EndSection

Section "Monitor"
Identifier  "Configured Monitor"
EndSe

Bug#578391: Your website

2011-08-03 Thread duloiscarole

Hello,

 statics of your website http://www.universfreeads.com/website.php?id=38496 


..



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110803142232.c3bce18...@60gp.ovh.net



Bug#613747: kernel oops observed on 5 machines

2011-08-03 Thread Cook, Jesse
I've observed frequent but inconsistent kernel oops on boot and shutdown of 
Debian Squeeze on 5 of 7 tested HP Compaq dc7800 machines.

Running 'lspci | grep VGA' yields:
  
  01:00.0 VGA compatible controller: ATI Technologies Inc RV530 [Radeon X1600]

Running 'lsmod | grep radeon' yields:

  radeon574844  2 
  ttm40146  1 radeon
  drm_kms_helper 20369  1 radeon
  drm   142327  4 radeon,ttm,drm_kms_helper
  i2c_algo_bit4225  1 radeon
  i2c_core   15819  4 radeon,drm_kms_helper,drm,i2c_algo_bit

Adding 'blacklist radeon' to '/etc/modprobe.d/blacklist.conf' changes the 
output of lsmod upon reboot for radeon from:

radeon574844  2 

to:

radeon574844  1

A custom minimal install of Debian without X yielded:

  radeon574844  0

In the last two cases (system with 'blacklist radeon' added and system with 
minimal install without X), I have been unable to reproduce a kernel oops 
testing on multiple machines across many reboots.

Gnome still works with the addition of the blacklist. However, I have observed 
tty switching issues (i.e. if I switch to tty1 then back to tty7 then try to go 
back to another tty I can only get tty7 to come up).

--
Jesse


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/6f8e5e885160fe4f9565838873ac4b6b027...@thunderbolt.camber.com



Re: [Pkg-xfce-devel] Bug#636108: lightdm: does not source ~/.profile

2011-08-03 Thread Andrei POPESCU
[Bcc'd all *dm maintainers and debian-x, in case they want to comment, 
apologize if you get this multiple times]

Dear Debian Developers,

Background: most common ways[1] of logging in to a Debian system involve 
executing or sourcing ~/.profile at some point, but not all of them.

[1] tested gdm, slim, console login, from memory I recall kdm and gdm3 
doing the same

On Lu, 01 aug 11, 10:14:35, Yves-Alexis Perez wrote:
> On lun., 2011-08-01 at 11:08 +0300, Andrei POPESCU wrote:
> > I won't comment on your statement that the dm is not the right place, 
> > but I strongly believe ~/.profile should be sourced from somewhere by 
> > *default*, just as it is done on a console login.
> 
> It's read by bash (and zsh and few other shells I guess).
> > 
> > Do you mind if I move the discussion on -devel? 
> 
> No, go ahead.
> -- 
> Yves-Alexis

IMVHO I think it shouldn't matter how a user logs in, the environment 
should be as much as possible identical, but I'm not sure this belongs 
in the *dm. What do you think?

Kind regards,
Andrei
-- 
Offtopic discussions among Debian users and developers:
http://lists.alioth.debian.org/mailman/listinfo/d-community-offtopic


signature.asc
Description: Digital signature