Andrew Starr-Bochicchio has proposed merging lp:~andrewsomething/compizfusion-plugins-extra/natty into lp:~compiz/compizfusion-plugins-extra/ubuntu.
Requested reviews: compiz packagers (compiz) Related bugs: #693637 New upstream release https://bugs.launchpad.net/bugs/693637 For more details, see: https://code.launchpad.net/~andrewsomething/compizfusion-plugins-extra/natty/+merge/44547 Uploaded to natty. -- https://code.launchpad.net/~andrewsomething/compizfusion-plugins-extra/natty/+merge/44547 Your team compiz packagers is requested to review the proposed merge of lp:~andrewsomething/compizfusion-plugins-extra/natty into lp:~compiz/compizfusion-plugins-extra/ubuntu.
=== modified file 'debian/changelog' --- debian/changelog 2009-10-22 18:17:53 +0000 +++ debian/changelog 2010-12-23 06:08:57 +0000 @@ -1,3 +1,30 @@ +compiz-fusion-plugins-extra (0.9.2.1-0ubuntu1) natty; urgency=low + + * New upstream release (LP: #693637). + * debian/watch: Update to find correct version. + * debian/control: + - Wrap depends. + - Bump Standards-Version to 3.9.1 + - Add build dependencies on, libboost1.42-dev, + libboost-serialization1.42-dev, and libnotify-dev. + - Adjust dependency versions for new release. + - Add homepage field. + - Add suggests on compizconfig-settings-manager. + - Add Vcs-Browser field. + * debian/rules: Move to debhelper 7. + * Move to Debian source format 3.0 (quilt). + + -- Andrew Starr-Bochicchio <[email protected]> Thu, 23 Dec 2010 00:18:24 -0500 + +compiz-fusion-plugins-extra (0.8.6-0ubuntu1) maverick; urgency=low + + * Update to 0.8.6 version + * Drop debian/patches/crash_fix_4082dc3c.patch - merged upstream + * Update debian/rules to not include simple-patchsys.mk now + * Pick up new compiz ABI (LP: #613340) + + -- Chris Coulson <[email protected]> Sun, 15 Aug 2010 19:45:25 +0100 + compiz-fusion-plugins-extra (0.8.4-0ubuntu2) karmic; urgency=low * debian/patches/crash_fix_4082dc3c.patch: === modified file 'debian/control' --- debian/control 2009-09-14 07:39:13 +0000 +++ debian/control 2010-12-23 06:08:57 +0000 @@ -1,21 +1,40 @@ Source: compiz-fusion-plugins-extra Section: x11 Priority: extra -Maintainer: Michael Vogt <[email protected]> -Build-Depends: cdbs, debhelper (>= 5), pkg-config, compiz-dev (>= - 1:0.8.3), librsvg2-dev, libcairo2-dev, libsm-dev, intltool, - libdbus-1-dev, libjpeg62-dev, compiz-fusion-bcop (>= 0.8.2), - libdecoration0-dev (>= 0.8.2), xsltproc, libxslt1-dev, - libglu1-mesa-dev, compiz-fusion-plugins-main (>= 0.8.2), - compiz-core (>= 1:0.8.3), gconf2 -Standards-Version: 3.8.0 +Maintainer: Ubuntu Developers <[email protected]> +XSBC-Original-Maintainer: Michael Vogt <[email protected]> +Build-Depends: debhelper (>= 7.0.50), + cmake, + pkg-config, + compiz-dev (>= 1:0.9.2.1+glibmainloop3), + librsvg2-dev, + libcairo2-dev, + libsm-dev, + intltool, + libdbus-1-dev, + libjpeg62-dev, + libdecoration0-dev (>= 1:0.9.0), + xsltproc, + libxslt1-dev, + libglu1-mesa-dev, + compiz-fusion-plugins-main (>= 0.9.2.1), + gconf2, + libboost1.42-dev, + libboost-serialization1.42-dev, + libnotify-dev +Standards-Version: 3.9.1 +Homepage: http://www.compiz.org/ Vcs-Bzr: http://bazaar.launchpad.net/~compiz/compiz-fusion-plugins-extra/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~compiz/compizfusion-plugins-extra/ubuntu/files Package: compiz-fusion-plugins-extra Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - compiz-core, compiz-core-abiversion-${coreabiversion} -Breaks: compiz-core (<< 1:0.8.3) +Depends: ${shlibs:Depends}, + ${misc:Depends}, + compiz-core, + compiz-core-abiversion-${coreabiversion} +Breaks: compiz-core (<< 1:0.9.2.1+glibmainloop3) +Suggests: compizconfig-settings-manager Description: Collection of extra plugins from OpenCompositing for Compiz The OpenCompositing Project brings 3D desktop visual effects that improve usability of the X Window System and provide increased productivity. === removed directory 'debian/patches' === removed file 'debian/patches/crash_fix_4082dc3c.patch' --- debian/patches/crash_fix_4082dc3c.patch 2009-10-22 18:19:23 +0000 +++ debian/patches/crash_fix_4082dc3c.patch 1970-01-01 00:00:00 +0000 @@ -1,47 +0,0 @@ -From ce15e7c1d48037d3921c8fc1c4bc16164082dc3c Mon Sep 17 00:00:00 2001 -From: Erkin Bahceci <[email protected]> -Date: Wed, 21 Oct 2009 03:58:50 +0000 -Subject: Fix possible crash. - ---- -diff --git a/src/animationaddon/animationaddon.c b/src/animationaddon/animationaddon.c -index 3c024e1..3754c0e 100644 ---- a/src/animationaddon/animationaddon.c -+++ b/src/animationaddon/animationaddon.c -@@ -585,6 +585,7 @@ static Bool animInitWindow(CompPlugin * p, CompWindow * w) - - static void animFiniWindow(CompPlugin * p, CompWindow * w) - { -+ ANIMADDON_SCREEN (w->screen); - ANIMADDON_WINDOW (w); - - // We need to interrupt and clean up the animation currently being played -@@ -607,6 +608,7 @@ static void animFiniWindow(CompPlugin * p, CompWindow * w) - } - - free(aw); -+ w->base.privates[as->windowPrivateIndex].ptr = NULL; - } - - static CompBool -diff --git a/src/animationaddon/polygon.c b/src/animationaddon/polygon.c -index fdbb167..2688891 100644 ---- a/src/animationaddon/polygon.c -+++ b/src/animationaddon/polygon.c -@@ -2093,8 +2093,13 @@ polygonsPrePaintOutput (CompScreen *s, CompOutput *output) - CompWindow *w; - for (w = s->windows; w; w = w->next) - { -+ if (w->destroyed) -+ continue; -+ - ANIMADDON_WINDOW (w); -- if (aw->com->animRemainingTime > 0 && -+ -+ if (aw && aw->com && -+ aw->com->animRemainingTime > 0 && - aw->eng.polygonSet && - aw->eng.polygonSet->doDepthTest) - { --- -cgit v0.8.2 === modified file 'debian/rules' --- debian/rules 2009-04-30 14:51:06 +0000 +++ debian/rules 2010-12-23 06:08:57 +0000 @@ -1,11 +1,12 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/gnome.mk - -CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/compiz-core.h ) - -DEB_CONFIGURE_EXTRA_FLAGS := --enable-schemas -DEB_DH_GENCONTROL_ARGS := -- -Vcoreabiversion=$(CORE_ABIVERSION) \ No newline at end of file +CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/core.h ) + +override_dh_auto_configure: + dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE + +override_dh_gencontrol: + dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION) + +%: + dh $@ === added directory 'debian/source' === added file 'debian/source/format' --- debian/source/format 1970-01-01 00:00:00 +0000 +++ debian/source/format 2010-12-23 06:08:57 +0000 @@ -0,0 +1,1 @@ +3.0 (quilt) === modified file 'debian/watch' --- debian/watch 2009-10-14 22:03:44 +0000 +++ debian/watch 2010-12-23 06:08:57 +0000 @@ -1,4 +1,2 @@ version=3 -http://releases.compiz.org/([\d\.]+)[02468]/ compiz-plugins-extra-([\d\.]+)\.tar\.gz - - +http://releases.compiz.org/([\d\.]+)\d/ compiz-plugins-extra-([\d\.]+)\.tar\.gz
_______________________________________________ Mailing list: https://launchpad.net/~compiz Post to : [email protected] Unsubscribe : https://launchpad.net/~compiz More help : https://help.launchpad.net/ListHelp
