--- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/copyright +++ gtk2-engines-murrine-0.90.3+git20100323/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by Yves-Alexis Perez on +Thu, 25 Jan 2007 18:36:55 +0100 + +It is based on gtk2-engines-xfce package by Martin Loschwitz + + +You can fetch this package from http://cimi.netsons.org/pages/murrine.php + +Upstream Author is Andrea Cimitan +Murrine is based on work from various projects: + +Clearlooks development team: + Richard Stellingwerff - remenic@gmail.com + Daniel Borgmann - daniel.borgmann@gmail.com + +Rezlooks modifications: + Doug Whiteley - dougwhiteley@gmail.com + +Candido modifications: + Andrea Cimitan - andrea.cimitan@gmail.com + +© 2006-2009 Andrea Cimitan + +Licensing: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 or later. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +On Debian systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL'. --- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/watch +++ gtk2-engines-murrine-0.90.3+git20100323/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/murrine/([\d\.]+)/ \ + murrine-([\d\.]+)\.tar\.gz --- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/control +++ gtk2-engines-murrine-0.90.3+git20100323/debian/control @@ -0,0 +1,18 @@ +Source: gtk2-engines-murrine +Section: x11 +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Yves-Alexis Perez +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gtk2-engines-murrine/ubuntu +Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.12.0), intltool, quilt +Standards-Version: 3.8.1 + +Package: gtk2-engines-murrine +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: cairo-based gtk+-2.0 theme engine + "Murrine" is an Italian word meaning the glass artworks done by Venicians + glass blowers. The Engine is cairo-based, and it's very fast compared to + clearlooks-cairo and ubuntulooks. + . + This package includes the Murrine engine. --- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/rules +++ gtk2-engines-murrine-0.90.3+git20100323/debian/rules @@ -0,0 +1,90 @@ +#!/usr/bin/make -f + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +patch: patch-stamp +patch-stamp: + dh_testdir + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch patch-stamp + +unpatch: + dh_testdir + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + rm -rf .pc patch-stamp + +configure: configure-stamp +configure-stamp: patch-stamp + + dh_testdir + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-animation + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + + dh_testdir + $(MAKE) + touch build-stamp + +clean: unpatch + + dh_testdir + dh_testroot + rm -f configure-stamp build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + + dh_clean + +install: build + + dh_testdir + dh_testroot + dh_clean -k + + $(MAKE) install DESTDIR=`pwd`/debian/gtk2-engines-murrine + + #Don't ship .la files: + rm -f `pwd`/debian/gtk2-engines-murrine/usr/lib/gtk-2.0/2.10.0/engines/libmurrine.a + rm -f `pwd`/debian/gtk2-engines-murrine/usr/lib/gtk-2.0/2.10.0/engines/libmurrine.la + +binary-indep: build install + +binary-arch: build install + + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs ChangeLog + + dh_gtkmodules + + dh_strip + dh_compress + + dh_fixperms + dh_installdeb + + dh_shlibdeps + dh_gencontrol + + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/changelog +++ gtk2-engines-murrine-0.90.3+git20100323/debian/changelog @@ -0,0 +1,91 @@ +gtk2-engines-murrine (0.90.3+git20100323-0ubuntu2) lucid; urgency=low + + * debian/patches/01_display_only_selected_menu_items.patch: + - change by Cody Russell to display the menu entry widgets only next to + the selected entries (lp: #546263) + + -- Sebastien Bacher Mon, 29 Mar 2010 22:44:28 +0200 + +gtk2-engines-murrine (0.90.3+git20100323-0ubuntu1) lucid; urgency=low + + * New git snapshot version to fix some theme issues (lp: #533484) + + -- Sebastien Bacher Wed, 24 Mar 2010 16:09:39 +0100 + +gtk2-engines-murrine (0.90.3+git20091211-0ubuntu1) lucid; urgency=low + + * Upload a git snapshot to lucid + * Drop the git changes which are in the new version + + -- Sebastien Bacher Fri, 05 Feb 2010 17:05:09 -0800 + +gtk2-engines-murrine (0.90.3-1ubuntu2) karmic-proposed; urgency=low + + * murrine fix for bug LP: #460710 + - add ./debian/patches + - cherry-pick GIT commits: + - debian/patches/01-I-don-t-know-why-I-had-x_step-2-here-maybe-to-avoid-.patch + GIT commit 1c36c51a94716a34567d21390908616cdf89f832 + - debian/patches/02-Fix-a-potential-endless-loop-in-draw_progressbar_fil.patch + GIT commint beaeda3e777f9e91a2f17d61584a38ee043b7866 + - debian/patches/series: added. + - debian/rules: augmented to deal with quilt patches. + I could have consolidated them, but this makes it easier to cross-check. + - debian/control: added quilt as a build-depends. + + -- C de-Avillez Mon, 02 Nov 2009 13:27:35 -0600 + +gtk2-engines-murrine (0.90.3-1ubuntu1) jaunty; urgency=low + + * Merge with debian version to fix FTBFS from syncing (LP: #357543) + Remaining changes: + + debian/control: + - keep debhelper 4 b-d as 7.0.50 is not in jaunty + - keep libgtk2.0-dev >= 2.12.0 + - don't recommend murrine-themes as we don't want to change seeded + packages so close to jaunty gate + + debian/rules: use old one with debhelper 4 as 7.0.50 is needed + by the new debian version of this file + + debian/compat: still 4 + + -- Didier Roche Wed, 08 Apr 2009 15:33:28 +0200 + +gtk2-engines-murrine (0.90.3-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - add build-dep on intltool. + * Cleanup the source git folder of spurious build files and thus build + schema.xml. closes: #520515 + + -- Yves-Alexis Perez Sat, 04 Apr 2009 15:36:12 +0200 + +gtk2-engines-murrine (0.90.2-1) unstable; urgency=low + + * New upstream release. + * debian/watch updated to point to GNOME sources. + * debian/control: + - update standards version to 3.8.1. + - update debhelper build-dep to 7. + * debian/compat bumped to 7. + * debian/rules: + - LDFLAGS+=-Wl,-z,defs -Wl,--as-needed to LDFLAGS. + - switch to debhelper 7 with tiny rules. + + -- Yves-Alexis Perez Wed, 18 Mar 2009 22:57:23 +0100 + +gtk2-engines-murrine (0.53.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: correct description since there is no theme included with + it. closes: #428874 + * debian/patches: add a patch from Steve Langasek to use the correct free() + function and avoid a segfault in gimp. closes: #447008 + + -- Yves-Alexis Perez Wed, 17 Oct 2007 19:28:00 +0200 + +gtk2-engines-murrine (0.52-1) unstable; urgency=low + + * Initial Release. closes: #411354 + + -- Yves-Alexis Perez Mon, 14 May 2007 23:25:21 +0200 --- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/compat +++ gtk2-engines-murrine-0.90.3+git20100323/debian/compat @@ -0,0 +1 @@ +4 --- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/patches/series +++ gtk2-engines-murrine-0.90.3+git20100323/debian/patches/series @@ -0,0 +1 @@ +01_display_only_selected_menu_items.patch --- gtk2-engines-murrine-0.90.3+git20100323.orig/debian/patches/01_display_only_selected_menu_items.patch +++ gtk2-engines-murrine-0.90.3+git20100323/debian/patches/01_display_only_selected_menu_items.patch @@ -0,0 +1,146 @@ +=== modified file 'gtk2-engines-murrine/src/murrine_draw.c' +--- gtk2-engines-murrine/src/murrine_draw.c 2010-03-29 16:46:10 +0000 ++++ gtk2-engines-murrine/src/murrine_draw.c 2010-03-29 17:34:42 +0000 +@@ -2315,6 +2315,23 @@ murrine_draw_radiobutton (cairo_t *cr, + inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + draw_bullet |= inconsistent; + ++ if (checkbox->in_menu) ++ { ++ if (draw_bullet) ++ { ++ dot = &colors->text[0]; ++ ++ murrine_set_color_rgba (cr, dot, trans); ++ ++ cairo_translate (cr, x, y); ++ ++ cairo_arc (cr, 7, 7, 2.5, 0, G_PI*2); ++ cairo_fill (cr); ++ } ++ ++ return; ++ } ++ + width = height = 14; + + if (widget->state_type == GTK_STATE_INSENSITIVE) +@@ -2468,60 +2485,64 @@ murrine_draw_checkbox (cairo_t *cr, + + cairo_translate (cr, x, y); + +- if (widget->xthickness > 2 && widget->ythickness > 2) +- { +- if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE) +- { +- MurrineRGB shadow; +- murrine_shade (border, 0.9, &shadow); +- +- murrine_draw_shadow (cr, &shadow, +- 0.5, 0.5, width-1, height-1, +- roundness+1, widget->corners, +- widget->reliefstyle, +- mrn_gradient_new, 0.08); +- } +- else if (widget->reliefstyle != 0) +- murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners); +- } +- +- cairo_save (cr); +- +- murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners); +- cairo_clip_preserve (cr); ++ if (!checkbox->in_menu) ++ { + +- if (draw_bullet) +- { +- murrine_draw_glaze (cr, bg, +- widget->glow_shade, highlight_shade_new, lightborder_shade_new, +- mrn_gradient_new, widget, 2, 2, width-4, height-4, +- roundness, widget->corners, TRUE); +- } +- else +- { +- murrine_set_color_rgb (cr, bg); +- cairo_fill (cr); +- } +- +- cairo_restore (cr); +- +- if (checkbox->in_menu || checkbox->in_cell) +- { +- mrn_gradient_new.border_shades[0] = 1.0; +- mrn_gradient_new.border_shades[1] = 1.0; +- if (!draw_bullet) +- mrn_gradient_new.has_border_colors = FALSE; +- } +- else if (!draw_bullet) +- { +- mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new); +- mrn_gradient_new.has_border_colors = FALSE; +- } +- +- murrine_draw_border (cr, border, +- 1.5, 1.5, width-3, height-3, +- roundness, widget->corners, +- mrn_gradient_new, 1.0); ++ if (widget->xthickness > 2 && widget->ythickness > 2) ++ { ++ if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE) ++ { ++ MurrineRGB shadow; ++ murrine_shade (border, 0.9, &shadow); ++ ++ murrine_draw_shadow (cr, &shadow, ++ 0.5, 0.5, width-1, height-1, ++ roundness+1, widget->corners, ++ widget->reliefstyle, ++ mrn_gradient_new, 0.08); ++ } ++ else if (widget->reliefstyle != 0) ++ murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners); ++ } ++ ++ cairo_save (cr); ++ ++ murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners); ++ cairo_clip_preserve (cr); ++ ++ if (draw_bullet) ++ { ++ murrine_draw_glaze (cr, bg, ++ widget->glow_shade, highlight_shade_new, lightborder_shade_new, ++ mrn_gradient_new, widget, 2, 2, width-4, height-4, ++ roundness, widget->corners, TRUE); ++ } ++ else ++ { ++ murrine_set_color_rgb (cr, bg); ++ cairo_fill (cr); ++ } ++ ++ cairo_restore (cr); ++ ++ if (checkbox->in_menu || checkbox->in_cell) ++ { ++ mrn_gradient_new.border_shades[0] = 1.0; ++ mrn_gradient_new.border_shades[1] = 1.0; ++ if (!draw_bullet) ++ mrn_gradient_new.has_border_colors = FALSE; ++ } ++ else if (!draw_bullet) ++ { ++ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new); ++ mrn_gradient_new.has_border_colors = FALSE; ++ } ++ ++ murrine_draw_border (cr, border, ++ 1.5, 1.5, width-3, height-3, ++ roundness, widget->corners, ++ mrn_gradient_new, 1.0); ++ } + + if (draw_bullet) + { +