compiz-fusion-bcop: Changes to 'debian-unstable'
VERSION |2 +-
debian/changelog |6 ++
src/bcop.xslt| 17 +
3 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 32c095a9d8c406892d836feb99e1d9495c7fd464
Author: Sean Finney sean...@debian.org
Date: Thu Feb 4 18:04:45 2010 +0100
prepare 0.8.4-1
diff --git a/debian/changelog b/debian/changelog
index 3f0fa31..6b08f46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz-fusion-bcop (0.8.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sean Finney sean...@debian.org Thu, 04 Feb 2010 18:04:13 +0100
+
compiz-fusion-bcop (0.8.2-1) unstable; urgency=low
* New upstream release
commit 1ac65736c1eb23f4cf18eb2f12fe3e889b152f47
Author: Guillaume Seguin guilla...@segu.in
Date: Wed Oct 14 04:08:57 2009 +0200
* Bump version to 0.8.4
diff --git a/VERSION b/VERSION
index 9b265c0..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.4
commit 379b43fe0ab2665c942ffa2d14fc4228f533401c
Author: Dennis Kasprzyk onest...@compiz-fusion.org
Date: Thu Aug 27 18:36:40 2009 +0200
Don't return Options if Screen/Display has been freed.
diff --git a/src/bcop.xslt b/src/bcop.xslt
index 8f169d6..6976df2 100644
--- a/src/bcop.xslt
+++ b/src/bcop.xslt
@@ -723,6 +723,11 @@ void /xsl:text
/xsl:text
xsl:value-of select=$PLUGIN/
xsl:text_OPTIONS_DISPLAY(d);
+if (!od)
+{
+*count = 0;
+return NULL;
+}
*count = /xsl:text
xsl:value-of select=$Plugin/
xsl:textDisplayOptionNum;
@@ -740,6 +745,11 @@ void /xsl:text
/xsl:text
xsl:value-of select=$PLUGIN/
xsl:text_OPTIONS_SCREEN(s);
+if (!os)
+{
+*count = 0;
+return NULL;
+}
*count = /xsl:text
xsl:value-of select=$Plugin/
xsl:textScreenOptionNum;
@@ -955,6 +965,9 @@ static void /xsl:text
/xsl:text
xsl:value-of select=$PLUGIN/
xsl:text_OPTIONS_SCREEN (s);
+/xsl:text
+xsl:value-of select=$PLUGIN/
+xsl:text_OPTIONS_DISPLAY (s-display);
/xsl:text
xsl:if
test=/compiz/plug...@name=$pname]/screen/descendant-or-self::option
@@ -966,6 +979,7 @@ static void /xsl:text
/xsl:text
/xsl:if
xsl:textfree (os);
+s-base.privates[od-screenPrivateIndex].ptr = NULL;
}
/xsl:text
@@ -1067,6 +1081,9 @@ static void /xsl:text
/xsl:text
/xsl:if
xsl:textfree (od);
+d-base.privates[/xsl:text
+xsl:value-of select=$Plugin/
+xsl:textOptionsDisplayPrivateIndex].ptr = NULL;
}
/xsl:text
commit a6ae8e25a17e408dcbe8b31f42754c06b83d23c3
Author: Guillaume Seguin guilla...@segu.in
Date: Mon Mar 9 15:43:44 2009 +0100
* Bump version to 0.8.3
diff --git a/VERSION b/VERSION
index 2dcc312..9b265c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.2
+VERSION=0.8.3
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
compiz-fusion-bcop: Changes to 'debian-unstable'
VERSION |2 +-
debian/changelog | 10 ++
debian/control |2 +-
debian/gbp.conf |8
debian/rules |8
src/bcop.in |2 +-
6 files changed, 25 insertions(+), 7 deletions(-)
New commits:
commit fafb2e9d9f9981ddfd7055bbfa568c578e87fb89
Author: Sean Finney sean...@debian.org
Date: Sun Apr 5 22:17:59 2009 +0200
prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 49b5c95..3f0fa31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+compiz-fusion-bcop (0.8.2-1) unstable; urgency=low
+
+ * New upstream release
+ * add gbp.conf for use with git-buildpackage
+ * lintian fixes:
+- update Standards-Version to 3.8.1
+- build binary in binary-indep, not binary-arch
+
+ -- Sean Finney sean...@debian.org Sun, 05 Apr 2009 22:16:11 +0200
+
compiz-fusion-bcop (0.7.6-1) unstable; urgency=low
* New upstream release.
commit 103120002a9c3019b5d1f8c578a00d95b406e967
Author: Sean Finney sean...@debian.org
Date: Sun Apr 5 22:15:44 2009 +0200
build binary in binary-indep, not binary-arch
diff --git a/debian/rules b/debian/rules
index 23da5d0..9abd9e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,12 +32,12 @@ install: build
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/compiz-fusion-bcop install
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
# Build architecture-dependent files here.
binary-arch: build install
+# We have nothing to do by default.
+
+# Build architecture-independent files here.
+binary-indep: build install
dh_testdir
dh_testroot
# uncomment if upstream ever puts anything in it...
commit c4204dbc974fa5b6549d59eefe4f8d0d62733195
Author: Sean Finney sean...@debian.org
Date: Sun Apr 5 22:02:08 2009 +0200
update Standards-Version to 3.8.1
diff --git a/debian/control b/debian/control
index 6304f1d..56596f0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: extra
Maintainer: Sean Finney sean...@debian.org
Build-Depends: autoconf, automake1.9, debhelper (= 5), intltool,
libglib2.0-dev, libxslt1-dev, pkg-config
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
Package: compiz-fusion-bcop
Architecture: all
commit 22183f118f50747b33c2b86d6f60ccabc0759ff4
Author: Sean Finney sean...@debian.org
Date: Sun Apr 5 22:00:48 2009 +0200
add gbp.conf for use with git-buildpackage
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..5721c00
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+debian-branch = debian-unstable
+debian-tag = compiz-fusion-bcop-%(version)s
+upstream-branch = upstream-unstable
+upstream-tag = %(version)s
+
+[git-dch]
+meta = 1
commit 436a8858618a9dcb8cda6025c81f1dccb004e1d6
Author: Guillaume Seguin guilla...@segu.in
Date: Mon Mar 9 15:43:35 2009 +0100
* Bump version to 0.8.2
diff --git a/VERSION b/VERSION
index 1357b31..2dcc312 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.9
+VERSION=0.8.2
commit 40aec5975dda0a1d3eb4d5483636f4f4b12f11f9
Author: Guillaume Seguin guilla...@segu.in
Date: Tue Sep 23 13:34:19 2008 +0200
* Bump version to 0.7.9
diff --git a/VERSION b/VERSION
index 38e4baa..1357b31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.8
+VERSION=0.7.9
commit 8c1190f17e730ee57eebbf39f350b1ef871015ca
Author: Guillaume Seguin guilla...@segu.in
Date: Tue Sep 23 13:34:17 2008 +0200
* Bump version to 0.7.8
diff --git a/VERSION b/VERSION
index fce301a..38e4baa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.7
+VERSION=0.7.8
commit 521c22755c11ce96310ed84b09d1a5583af8ebc8
Author: Danny Baumann dannybaum...@web.de
Date: Thu Jul 3 13:21:27 2008 +0200
Depend on pkgconfig file only at configure time, not at runtime.
diff --git a/src/bcop.in b/src/bcop.in
index cdb34ea..1b1b224 100755
--- a/src/bcop.in
+++ b/src/bcop.in
@@ -18,7 +18,7 @@
# GNU General Public License for more details.
#
-xsltdir=`pkg-config --variable xsltpath bcop`
+xsltd...@prefix@/share/bcop
function usage
{
commit f5cd61042ab58ba2177f8a6c9d9f16f332e88fea
Author: Guillaume Seguin guilla...@segu.in
Date: Sat May 31 14:08:47 2008 +0200
* Bump version to 0.7.7
diff --git a/VERSION b/VERSION
index 6410fd5..fce301a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.6
+VERSION=0.7.7
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
compiz-fusion-bcop: Changes to 'debian-unstable'
VERSION |2 +- debian/changelog |6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 55e3b7ad00e9be1c3ad2e08ca8c6aac66de4ce7d Author: Sean Finney [EMAIL PROTECTED] Date: Tue Jun 3 00:45:36 2008 +0200 new upstream release diff --git a/debian/changelog b/debian/changelog index 7bbab72..49b5c95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +compiz-fusion-bcop (0.7.6-1) unstable; urgency=low + + * New upstream release. + + -- Sean Finney [EMAIL PROTECTED] Tue, 03 Jun 2008 00:45:02 +0200 + compiz-fusion-bcop (0.7.4-1) unstable; urgency=low * New upstream release. commit ab82df6368c68a5d6551a88325993d5d5732cd0c Author: Guillaume Seguin [EMAIL PROTECTED] Date: Sat May 31 14:08:30 2008 +0200 * Bump version to 0.7.6 diff --git a/VERSION b/VERSION index 130f2d5..6410fd5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.7.5 +VERSION=0.7.6 commit f4fdaa3be29a8ad1393a818254351ae1ff82c672 Author: Guillaume Seguin [EMAIL PROTECTED] Date: Fri Apr 4 00:17:22 2008 +0200 * Bump version to 0.7.5 diff --git a/VERSION b/VERSION index 8eafcce..130f2d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.7.4 +VERSION=0.7.5 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
compiz-fusion-bcop: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 346e74779c33b49bfe4d818e72141d359f02f6d7 Author: Sean Finney [EMAIL PROTECTED] Date: Fri Nov 9 22:46:14 2007 +0100 initial debianisation -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
compiz-fusion-bcop: Changes to 'debian-unstable'
VERSION |2 bcopconvert/bcopconvert.xslt | 323 - debian/changelog |6 debian/rules |1 src/bcop.xslt| 418 ++- 5 files changed, 261 insertions(+), 489 deletions(-) New commits: commit 1f7890f77749d69e5bc6976c65ef20181da6d208 Author: Sean Finney [EMAIL PROTECTED] Date: Mon May 19 19:50:57 2008 +0200 clean up some more autocruft diff --git a/debian/rules b/debian/rules index 157bfd7..23da5d0 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ clean: rm -f build-stamp configure-stamp [ ! -e Makefile ] || $(MAKE) distclean rm -rf Makefile.in aclocal.m4 config.h.in configure src/Makefile.in + rm -f install-sh missing dh_clean install: build commit e0229dd3c7af6763344ae90f3d4caf406a84f23f Author: Sean Finney [EMAIL PROTECTED] Date: Mon May 19 19:49:18 2008 +0200 new upstream release diff --git a/debian/changelog b/debian/changelog index e5b3d0a..7bbab72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +compiz-fusion-bcop (0.7.4-1) unstable; urgency=low + + * New upstream release. + + -- Sean Finney [EMAIL PROTECTED] Mon, 19 May 2008 19:48:56 +0200 + compiz-fusion-bcop (0.6.0-1) unstable; urgency=low * Initial release (Closes: #431756). commit 080ee3f1ae6fe4bd00688e3f30460859f73d847b Author: Guillaume Seguin [EMAIL PROTECTED] Date: Fri Apr 4 00:17:20 2008 +0200 * Bump version to 0.7.4 diff --git a/VERSION b/VERSION index a48124b..8eafcce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.7.3 +VERSION=0.7.4 commit 144f609c556d6947182f3295ea03bc1d924e46aa Author: Dennis Kasprzyk [EMAIL PROTECTED] Date: Wed Mar 19 18:22:02 2008 +0100 Fixed generic private defines. diff --git a/src/bcop.xslt b/src/bcop.xslt index 792ad73..8f169d6 100644 --- a/src/bcop.xslt +++ b/src/bcop.xslt @@ -1422,7 +1422,7 @@ CompPluginVTable * getCompPluginInfo (void); #define PLUGIN_SCREEN(object, plugin, prefix) \ plugin##Screen * prefix##s = \ GET_PLUGIN_SCREEN (object, \ - GET_PLUGIN_DISPLAY (s-display, plugin), plugin) + GET_PLUGIN_DISPLAY ((object)-display, plugin), plugin) #define GET_PLUGIN_WINDOW(object, parent, plugin) \ ((plugin##Window *) \ @@ -1430,8 +1430,8 @@ CompPluginVTable * getCompPluginInfo (void); #define PLUGIN_WINDOW(object, plugin, prefix) \ plugin##Window * prefix##w = \ GET_PLUGIN_WINDOW (object, \ - GET_PLUGIN_SCREEN (w-screen, \ - GET_PLUGIN_DISPLAY (w-screen-display, plugin), plugin), plugin) + GET_PLUGIN_SCREEN ((object)-screen, \ + GET_PLUGIN_DISPLAY ((object)-screen-display, plugin), plugin), plugin) #endif commit e56989fb493c200c75a0aa71705cfcc281dc62ee Author: Dennis Kasprzyk [EMAIL PROTECTED] Date: Wed Mar 19 15:20:44 2008 +0100 Use generic private defines. diff --git a/src/bcop.xslt b/src/bcop.xslt index 5c3e742..792ad73 100644 --- a/src/bcop.xslt +++ b/src/bcop.xslt @@ -208,7 +208,9 @@ xsl:value-of select=$filename/ xsl:text -static int displayPrivateIndex; +static int /xsl:text + xsl:value-of select=$Plugin/ + xsl:textOptionsDisplayPrivateIndex; static CompMetadata /xsl:text xsl:value-of select=$plugin/ @@ -221,39 +223,16 @@ CompPluginVTable /xsl:text xsl:value-of select=$plugin/ xsl:textOptionsVTable; -#define GET_/xsl:text -xsl:value-of select=$PLUGIN/ -xsl:text_OPTIONS_DISPLAY(d) \ -((/xsl:text -xsl:value-of select=$Plugin/ -xsl:textOptionsDisplay *) (d)-base.privates[displayPrivateIndex].ptr) - #define /xsl:text xsl:value-of select=$PLUGIN/ -xsl:text_OPTIONS_DISPLAY(d) \ -/xsl:text +xsl:text_OPTIONS_DISPLAY(d) PLUGIN_DISPLAY(d, /xsl:text xsl:value-of select=$Plugin/ -xsl:textOptionsDisplay *od = GET_/xsl:text -xsl:value-of select=$PLUGIN/ -xsl:text_OPTIONS_DISPLAY (d) - -#define GET_/xsl:text -xsl:value-of select=$PLUGIN/ -xsl:text_OPTIONS_SCREEN(s, od) \ -((/xsl:text -xsl:value-of select=$Plugin/ -xsl:textOptionsScreen *) (s)-base.privates[(od)-screenPrivateIndex].ptr) - +xsl:textOptions, o) #define /xsl:text xsl:value-of select=$PLUGIN/ -xsl:text_OPTIONS_SCREEN(s) \ -/xsl:text +xsl:text_OPTIONS_SCREEN(s) PLUGIN_SCREEN(s, /xsl:text xsl:value-of select=$Plugin/ -xsl:textOptionsScreen *os = GET_/xsl:text -xsl:value-of select=$PLUGIN/ -xsl:text_OPTIONS_SCREEN (s, GET_/xsl:text -xsl:value-of select=$PLUGIN/ -xsl:text_OPTIONS_DISPLAY (s-display)) +xsl:textOptions, o) typedef struct _/xsl:text xsl:value-of select=$Plugin/ @@ -1025,7 +1004,9 @@ static void /xsl:text return FALSE; } -
