diff --git a/compiz/debian/changelog b/compiz/debian/changelog index 57ddfad..9096bf6 100644 --- a/compiz/debian/changelog +++ b/compiz/debian/changelog @@ -1,3 +1,10 @@ +compiz (1:0.5.4~3v1ubuntu6) feisty; urgency=low + + * Updated obsolete patch: + - 013-add-cursor-theme-support.patch + + -- Trevi - 3v1n0 <> Sun, 21 Oct 2007 18:31:06 +0200 + compiz (1:0.5.4~3v1ubuntu5) feisty; urgency=low * Updated patch against new code: diff --git a/compiz/debian/patches/013-add-cursor-theme-support.patch b/compiz/debian/patches/013-add-cursor-theme-support.patch index c9a5b69..2ab6835 100644 --- a/compiz/debian/patches/013-add-cursor-theme-support.patch +++ b/compiz/debian/patches/013-add-cursor-theme-support.patch @@ -1,5 +1,5 @@ diff --git a/configure.ac b/configure.ac -index 8a45698..33034ae 100644 +index 0c83214..25c85e8 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,7 @@ COMPIZ_REQUIRES="x11-xcb \ @@ -11,7 +11,7 @@ index 8a45698..33034ae 100644 sm \ libxml-2.0 \ diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c -index 23ec3cf..ada6013 100644 +index fb6762a..8cbe1e6 100644 --- a/gtk/window-decorator/gtk-window-decorator.c +++ b/gtk/window-decorator/gtk-window-decorator.c @@ -30,6 +30,7 @@ @@ -132,26 +132,26 @@ index 23ec3cf..ada6013 100644 DBusConnection *connection; DBusMessage *reply; diff --git a/include/compiz-core.h b/include/compiz-core.h -index e65efbd..f016ed6 100644 +index 5e22165..3825bbd 100644 --- a/include/compiz-core.h +++ b/include/compiz-core.h -@@ -753,7 +753,9 @@ removeFileWatch (CompFileWatchHandle handle); - #define COMP_DISPLAY_OPTION_TERMINAL 59 - #define COMP_DISPLAY_OPTION_RUN_TERMINAL_KEY 60 - #define COMP_DISPLAY_OPTION_PING_DELAY 61 --#define COMP_DISPLAY_OPTION_NUM 62 -+#define COMP_DISPLAY_OPTION_CURSOR_THEME 62 -+#define COMP_DISPLAY_OPTION_CURSOR_SIZE 63 -+#define COMP_DISPLAY_OPTION_NUM 64 +@@ -762,7 +762,9 @@ removeFileWatch (CompFileWatchHandle handle); + #define COMP_DISPLAY_OPTION_TERMINAL 64 + #define COMP_DISPLAY_OPTION_RUN_TERMINAL_KEY 65 + #define COMP_DISPLAY_OPTION_PING_DELAY 66 +-#define COMP_DISPLAY_OPTION_NUM 67 ++#define COMP_DISPLAY_OPTION_CURSOR_THEME 67 ++#define COMP_DISPLAY_OPTION_CURSOR_SIZE 68 ++#define COMP_DISPLAY_OPTION_NUM 69 typedef void (*HandleEventProc) (CompDisplay *display, XEvent *event); diff --git a/libdecoration/decoration.c b/libdecoration/decoration.c diff --git a/metadata/core.xml.in b/metadata/core.xml.in -index 8fa18ab..d696dba 100644 +index 7bd9398..2b43b54 100644 --- a/metadata/core.xml.in +++ b/metadata/core.xml.in -@@ -305,6 +305,18 @@ +@@ -325,6 +325,18 @@ <_short>Open a terminal</_short> <_long>Open a terminal</_long> </option> @@ -187,7 +187,7 @@ index e72c71a..b44a6a9 100644 compiz_SOURCES = \ main.c \ diff --git a/src/display.c b/src/display.c -index b688955..a6253b4 100644 +index b1cec71..ec7a1fa 100644 --- a/src/display.c +++ b/src/display.c @@ -41,6 +41,8 @@ @@ -232,7 +232,7 @@ index b688955..a6253b4 100644 const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = { { "abi", "int", 0, 0, 0 }, { "active_plugins", "list", "<type>string</type>", 0, 0 }, -@@ -748,7 +776,9 @@ const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = { +@@ -753,7 +781,9 @@ const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = { { "ignore_hints_when_maximized", "bool", 0, 0, 0 }, { "command_terminal", "string", 0, 0, 0 }, { "run_command_terminal_key", "key", 0, runCommandTerminal, 0 }, @@ -243,7 +243,7 @@ index b688955..a6253b4 100644 }; CompOption * -@@ -900,6 +930,20 @@ setDisplayOption (CompPlugin *plugin, +@@ -905,6 +935,20 @@ setDisplayOption (CompPlugin *plugin, return TRUE; } break; @@ -267,5 +267,6 @@ index b688955..a6253b4 100644 diff --git a/src/event.c b/src/event.c diff --git a/src/main.c b/src/main.c diff --git a/src/screen.c b/src/screen.c +diff --git a/src/session.c b/src/session.c diff --git a/src/texture.c b/src/texture.c diff --git a/src/window.c b/src/window.c |