debian/changelog                           |    5 ++-
 debian/control                             |    2 -
 debian/patches/500_snow-requires-png.patch |   39 +++++++++++++++++++++++++++++
 debian/patches/series                      |    1 
 debian/rules                               |    6 ++--
 5 files changed, 49 insertions(+), 4 deletions(-)

New commits:
commit a03add884af38768d6446f8155e0586b5e99d91d
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Fri Jan 19 07:21:16 2007 +0100

    Add a patch to make the snow plugin require the png plugin.
    
    Use quilt as patching system.

diff --git a/debian/changelog b/debian/changelog
index 37a99dc..24f3ee0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 compiz-extra (0.3.6.0-2) UNRELEASED; urgency=low
 
   * Add new plugins to the package description.
+  * Build-depend on quilt as patching system.
+  * Add a patch to make the snow plugin require the png plugin because it's
+    pretty useless without it.
 
- -- Thierry Reding <[EMAIL PROTECTED]>  Fri, 19 Jan 2007 07:02:04 +0100
+ -- Thierry Reding <[EMAIL PROTECTED]>  Fri, 19 Jan 2007 07:19:06 +0100
 
 compiz-extra (0.3.6.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c2cf3e5..f952b6b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Thierry Reding <[EMAIL PROTECTED]>
 # libxrender-dev should probably be added as dependency to libxrandr-dev.
-Build-Depends: debhelper (>= 5), autotools-dev, intltool, pkg-config, gconf2, 
compiz-dev (>= 0.3.6), libglib2.0-dev, libdbus-1-dev, libxrender-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), autotools-dev, intltool, 
pkg-config, gconf2, compiz-dev (>= 0.3.6), libglib2.0-dev, libdbus-1-dev, 
libxrender-dev
 Standards-Version: 3.7.2
 
 Package: compiz-extra
diff --git a/debian/patches/500_snow-requires-png.patch 
b/debian/patches/500_snow-requires-png.patch
new file mode 100644
index 0000000..c71c8f3
--- /dev/null
+++ b/debian/patches/500_snow-requires-png.patch
@@ -0,0 +1,39 @@
+diff --git a/snow/snow.c b/snow/snow.c
+index 5d78d86..d05cafd 100644
+--- a/snow/snow.c
++++ b/snow/snow.c
+@@ -867,6 +867,10 @@ snowGetVersion (CompPlugin *plugin,
+     return ABIVERSION;
+ }
+ 
++CompPluginDep snowDeps[] = {
++      { CompPluginRuleRequire, "png" }
++};
++
+ CompPluginVTable snowVTable = {
+       "snow",
+       N_("Snow"),
+@@ -884,8 +888,8 @@ CompPluginVTable snowVTable = {
+       snowSetDisplayOption,
+       0,                      /*snowGetScreenOptions */
+       0,                      /*snowSetScreenOption */
+-      0,
+-      0,
++      snowDeps,
++      sizeof(snowDeps) / sizeof(snowDeps[0]),
+       0,
+       0
+ };
+diff --git a/snow/snow.schemas.in b/snow/snow.schemas.in
+index 406796e..0249be9 100644
+--- a/snow/snow.schemas.in
++++ b/snow/snow.schemas.in
+@@ -33,7 +33,7 @@
+             <owner>compiz</owner>
+             <type>list</type>
+             <list_type>string</list_type>
+-            <default>[]</default>
++            <default>[png]</default>
+             <locale name="C">
+                 <short>Plugins that this requires</short>
+                 <long>Do not modify</long>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c43f970
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+500_snow-requires-png.patch
diff --git a/debian/rules b/debian/rules
index f07dc97..60cbfa1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ # This special exception was added by Cr
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 1
 
 CFLAGS = -Wall -g
@@ -34,7 +36,7 @@ confflags += --disable-static \
              --disable-dock-plugin \
              --disable-miniwin-plugin
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
        dh_testdir
 ifeq ($(wildcard $(BUILD_DIR)),)
@@ -47,7 +49,7 @@ endif
        
        touch $@
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to