[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

ccsm: Changes to 'debian-unstable'



 NEWS                                                           |   10 +++
 VERSION                                                        |    2 
 debian/changelog                                               |    7 ++
 debian/patches/0001-Fix-a-crash-with-the-p-and-C-options.patch |   28 ++++++++++
 debian/patches/series                                          |    1 
 5 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit d0f24fe1654446be1cc0bd253f6a78ff2a514cc5
Author: Janos Guljas <janos@resenje.org>
Date:   Sat Apr 30 20:45:35 2011 +0200

    Prepare 0.9.4-1

diff --git a/debian/changelog b/debian/changelog
index c68afc4..18a9b07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ccsm (0.9.4-1) experimental; urgency=low
+
+  * New upstream release. 
+  * Add upstream patch to fix crash with the -p and -C options.
+
+ -- Janos Guljas <janos@resenje.org>  Sat, 30 Apr 2011 20:37:43 +0200
+
 ccsm (0.9.2.1+git20110224.cb1268cb-1) experimental; urgency=low
 
 
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
new file mode 100644
index 0000000..76d2c9b
--- /dev/null
+++ b/debian/patches/0001-Fix-a-crash-with-the-p-and-C-options.patch
@@ -0,0 +1,28 @@
+From 27ecfcc1d74455474a42315121cc0aa7b6f83922 Mon Sep 17 00:00:00 2001
+From: Didier Roche <didrocks@ubuntu.com>
+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 5cd8722..d6323ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 invalid_desktop_category.patch
 01-fix-extension-dir.patch
+0001-Fix-a-crash-with-the-p-and-C-options.patch

commit edd09cacf572e74815ef424c0eecd101615ea490
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date:   Mon Mar 7 18:11:32 2011 +0800

    "Bump VERSION to 0.9.4"

diff --git a/VERSION b/VERSION
index 5d08606..a602fc9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.9.2.1
+0.9.4

commit 32d56868e51d94b3affab9d366a1306fa302ba0b
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date:   Mon Mar 7 18:11:29 2011 +0800

    "Update news for 0.9.4 release"

diff --git a/NEWS b/NEWS
index 1bb34d1..38d00a1 100644
--- a/NEWS
+++ b/NEWS
@@ -14,3 +14,13 @@ Release 0.9.2.1 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
 ========================================================================
 Bugfix release.
 
+Release 0.9.4 (2010-02-24 Sam Spilsbury <sam.spilsbury@canonical.com>)
+========================================================================
+Development Release.
+
+Adapt for Python 3
+
+Remove libsexy code and replace with GTK+ equavilents
+
+Cleanup
+


Reply to: