debian/changelog | 10 +
debian/control | 2
debian/install | 1
debian/patches/series | 1
debian/patches/upstream_git_set-include-order.patch | 146 ++++++++++++++++++++
debian/rules | 6
6 files changed, 163 insertions(+), 3 deletions(-)
New commits:
commit 3f04b0da9e355e95c3456b81b79017cbf120ef9e
Author: Sean Finney <sean...@debian.org>
Date: Fri Feb 12 15:00:16 2010 +0100
prepare changelog for 0.8.4-2
diff --git a/debian/changelog b/debian/changelog
index 742d41d..e1d6f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+compiz-fusion-plugins-unsupported (0.8.4-2) unstable; urgency=low
+
+ * Add extra install rules for new svg files in 0.8.4.
+ * Incorporate quilt into the build system.
+ * New patch upstream_git_set-include-order.patch backported from
+ upstream git to fix FTBFS on systems with an older -unsupported
+ package installed.
+
+ -- Sean Finney <sean...@debian.org> Fri, 12 Feb 2010 16:03:06 +0100
+
compiz-fusion-plugins-unsupported (0.8.4-1) unstable; urgency=low
* New upstream release.
commit 7c39d21bf62066ada442b881cba87f18905873b1
Author: Sean Finney <sean...@debian.org>
Date: Fri Feb 12 15:58:53 2010 +0100
Backport upstream patch to fix include order FTBFS
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..cdc4570 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_git_set-include-order.patch
diff --git a/debian/patches/upstream_git_set-include-order.patch
b/debian/patches/upstream_git_set-include-order.patch
new file mode 100644
index 0000000..1519efb
--- /dev/null
+++ b/debian/patches/upstream_git_set-include-order.patch
@@ -0,0 +1,146 @@
+commit cd540468a63676ed7c979ac0eb548b6d1324d075
+Author: Robert Noland <rnol...@2hip.net>
+Date: Tue Nov 3 11:52:57 2009 -0600
+
+ Order the include directories so that local includes get picked up first.
+
+diff --git a/src/atlantis/Makefile.am b/src/atlantis/Makefile.am
+index e217477..ac2fb4f 100644
+--- a/src/atlantis/Makefile.am
++++ b/src/atlantis/Makefile.am
+@@ -40,12 +40,12 @@ dist_libatlantis_la_SOURCES = \
+ BUILT_SOURCES = $(nodist_libatlantis_la_SOURCES)
+
+ INCLUDES = \
+- @COMPIZ_CFLAGS@ \
++ -I$(top_srcdir)/include \
++ @COMPIZ_CFLAGS@ \
+ -DDATADIR='"$(compdatadir)"' \
+ -DLIBDIR='"$(libdir)"' \
+ -DLOCALEDIR="\"@datadir@/locale\"" \
+- -DIMAGEDIR='"$(imagedir)"' \
+- -I$(top_srcdir)/include
++ -DIMAGEDIR='"$(imagedir)"'
+
+ moduledir = $(plugindir)
+
+diff --git a/src/cubemodel/Makefile.am b/src/cubemodel/Makefile.am
+index c9b1369..866082c 100644
+--- a/src/cubemodel/Makefile.am
++++ b/src/cubemodel/Makefile.am
+@@ -14,12 +14,12 @@ dist_libcubemodel_la_SOURCES = \
+ BUILT_SOURCES = $(nodist_libcubemodel_la_SOURCES)
+
+ INCLUDES = \
+- @COMPIZ_CFLAGS@ \
++ -I$(top_srcdir)/include \
++ @COMPIZ_CFLAGS@ \
+ -DDATADIR='"$(compdatadir)"' \
+ -DLIBDIR='"$(libdir)"' \
+ -DLOCALEDIR="\"@datadir@/locale\"" \
+- -DIMAGEDIR='"$(imagedir)"' \
+- -I$(top_srcdir)/include
++ -DIMAGEDIR='"$(imagedir)"'
+
+ moduledir = $(plugindir)
+
+diff --git a/src/elements/Makefile.am b/src/elements/Makefile.am
+index cfb6a70..b675fec 100644
+--- a/src/elements/Makefile.am
++++ b/src/elements/Makefile.am
+@@ -17,12 +17,12 @@ dist_libelements_la_SOURCES = \
+ BUILT_SOURCES = $(nodist_libelements_la_SOURCES)
+
+ INCLUDES = \
+- @COMPIZ_CFLAGS@ \
++ -I$(top_srcdir)/include \
++ @COMPIZ_CFLAGS@ \
+ -DDATADIR='"$(compdatadir)"' \
+ -DLIBDIR='"$(libdir)"' \
+ -DLOCALEDIR="\"@datadir@/locale\"" \
+- -DIMAGEDIR='"$(imagedir)"' \
+- -I$(top_srcdir)/include
++ -DIMAGEDIR='"$(imagedir)"'
+
+ moduledir = $(plugindir)
+
+diff --git a/src/fakeargb/Makefile.am b/src/fakeargb/Makefile.am
+index 0a4f275..8cbe3ed 100644
+--- a/src/fakeargb/Makefile.am
++++ b/src/fakeargb/Makefile.am
+@@ -9,12 +9,12 @@ dist_libfakeargb_la_SOURCES = fakeargb.c
+ BUILT_SOURCES = $(nodist_libfakeargb_la_SOURCES)
+
+ INCLUDES = \
+- @COMPIZ_CFLAGS@ \
++ -I$(top_srcdir)/include \
++ @COMPIZ_CFLAGS@ \
+ -DDATADIR='"$(compdatadir)"' \
+ -DLIBDIR='"$(libdir)"' \
+ -DLOCALEDIR="\"@datadir@/locale\"" \
+- -DIMAGEDIR='"$(imagedir)"' \
+- -I$(top_srcdir)/include
++ -DIMAGEDIR='"$(imagedir)"'
+
+ moduledir = $(plugindir)
+
+diff --git a/src/mswitch/Makefile.am b/src/mswitch/Makefile.am
+index 55439ba..28f7732 100644
+--- a/src/mswitch/Makefile.am
++++ b/src/mswitch/Makefile.am
+@@ -9,12 +9,12 @@ dist_libmswitch_la_SOURCES = mswitch.c
+ BUILT_SOURCES = $(nodist_libmswitch_la_SOURCES)
+
+ INCLUDES = \
+- @COMPIZ_CFLAGS@ \
++ -I$(top_srcdir)/include \
++ @COMPIZ_CFLAGS@ \
+ -DDATADIR='"$(compdatadir)"' \
+ -DLIBDIR='"$(libdir)"' \
+ -DLOCALEDIR="\"@datadir@/locale\"" \
+- -DIMAGEDIR='"$(imagedir)"' \
+- -I$(top_srcdir)/include
++ -DIMAGEDIR='"$(imagedir)"'
+
+ moduledir = $(plugindir)
+
+diff --git a/src/snow/Makefile.am b/src/snow/Makefile.am
+index 4440202..3c691f9 100644
+--- a/src/snow/Makefile.am
++++ b/src/snow/Makefile.am
+@@ -9,12 +9,12 @@ dist_libsnow_la_SOURCES = snow.c
+ BUILT_SOURCES = $(nodist_libsnow_la_SOURCES)
+
+ INCLUDES = \
+- @COMPIZ_CFLAGS@ \
++ -I$(top_srcdir)/include \
++ @COMPIZ_CFLAGS@ \
+ -DDATADIR='"$(compdatadir)"' \
+ -DLIBDIR='"$(libdir)"' \
+ -DLOCALEDIR="\"@datadir@/locale\"" \
+- -DIMAGEDIR='"$(imagedir)"' \
+- -I$(top_srcdir)/include
++ -DIMAGEDIR='"$(imagedir)"'
+
+ moduledir = $(plugindir)
+
+diff --git a/src/tile/Makefile.am b/src/tile/Makefile.am
+index 03b7289..9eec1c1 100644
+--- a/src/tile/Makefile.am
++++ b/src/tile/Makefile.am
+@@ -9,12 +9,12 @@ dist_libtile_la_SOURCES = tile.c
+ BUILT_SOURCES = $(nodist_libtile_la_SOURCES)
+
+ INCLUDES = \
+- @COMPIZ_CFLAGS@ \
++ -I$(top_srcdir)/include \
++ @COMPIZ_CFLAGS@ \
+ -DDATADIR='"$(compdatadir)"' \
+ -DLIBDIR='"$(libdir)"' \
+ -DLOCALEDIR="\"@datadir@/locale\"" \
+- -DIMAGEDIR='"$(imagedir)"' \
+- -I$(top_srcdir)/include
++ -DIMAGEDIR='"$(imagedir)"'
+
+ moduledir = $(plugindir)
+
commit 4bde1f0eef0accec4f349544179539c1de0262ee
Author: Sean Finney <sean...@debian.org>
Date: Fri Feb 12 15:54:04 2010 +0100
Incorporate quilt into build system.
diff --git a/debian/control b/debian/control
index 69e7e30..2701a71 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compiz-fusion-plugins-unsupported
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Sean Finney <sean...@debian.org>
-Build-Depends: automake1.9, autotools-dev, compiz-dev (>= 0.8.4),
compiz-fusion-bcop (>= 0.8.4), compiz-fusion-plugins-main (>= 0.8.4), debhelper
(>= 5), intltool, libgconf2-dev, libglib2.0-dev, libtool, libxml2-dev,
libxslt1-dev, pkg-config, xsltproc, librsvg2-dev, libcairo2-dev, libsm-dev,
libglu1-mesa-dev, libdbus-1-dev, libdecoration0-dev, libxml-parser-perl,
x11proto-core-dev, libxrender-dev
+Build-Depends: automake1.9, autotools-dev, compiz-dev (>= 0.8.4),
compiz-fusion-bcop (>= 0.8.4), compiz-fusion-plugins-main (>= 0.8.4), debhelper
(>= 5), intltool, libgconf2-dev, libglib2.0-dev, libtool, libxml2-dev,
libxslt1-dev, pkg-config, xsltproc, librsvg2-dev, libcairo2-dev, libsm-dev,
libglu1-mesa-dev, libdbus-1-dev, libdecoration0-dev, libxml-parser-perl,
x11proto-core-dev, libxrender-dev, quilt
Standards-Version: 3.7.2
Section: x11
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index dc8496d..53d4c51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -21,7 +23,7 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in
config.sub configure \
intltool-update.in ltmain.sh missing mkinstalldirs
configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
for f in $(UPSTREAM_PRESERVE); do \
cp -a $$f $$f.preserve; \
@@ -36,7 +38,7 @@ build-stamp: configure-stamp
$(MAKE)
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
commit 293553331731b205fd6c5fa2e5b1c24f16cd696b
Author: Sean Finney <sean...@debian.org>
Date: Fri Feb 12 14:59:30 2010 +0100
Add extra install rules for new svg files in 0.8.4
diff --git a/debian/install b/debian/install
index 3ed88bb..6fa5eef 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,6 @@
usr/share/locale/*/LC_MESSAGES/*.mo
usr/share/compiz/*.xml
usr/share/compiz/*.png
+usr/share/compiz/*.svg
usr/lib/compiz/*.so
usr/include/compiz/compiz-elements.h
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
