reverted: --- gtk2-engines-murrine-0.53.1/src/support.c +++ gtk2-engines-murrine-0.53.1.orig/src/support.c @@ -274,7 +274,7 @@ if (tmp_size) { *indicator_size = *tmp_size; + g_free (tmp_size); - gtk_requisition_free (tmp_size); } else *indicator_size = default_option_indicator_size; @@ -282,7 +282,7 @@ if (tmp_spacing) { *indicator_spacing = *tmp_spacing; + g_free (tmp_spacing); - gtk_border_free (tmp_spacing); } else *indicator_spacing = default_option_indicator_spacing; diff -u gtk2-engines-murrine-0.53.1/config.sub gtk2-engines-murrine-0.53.1/config.sub --- gtk2-engines-murrine-0.53.1/config.sub +++ gtk2-engines-murrine-0.53.1/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; diff -u gtk2-engines-murrine-0.53.1/config.guess gtk2-engines-murrine-0.53.1/config.guess --- gtk2-engines-murrine-0.53.1/config.guess +++ gtk2-engines-murrine-0.53.1/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -330,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -793,7 +793,7 @@ exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) diff -u gtk2-engines-murrine-0.53.1/debian/changelog gtk2-engines-murrine-0.53.1/debian/changelog --- gtk2-engines-murrine-0.53.1/debian/changelog +++ gtk2-engines-murrine-0.53.1/debian/changelog @@ -1,3 +1,24 @@ +gtk2-engines-murrine (0.53.1-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - adhere to DebianMaintainerField spec + - drop murrina-theme recommends (not in the archive yet) + * debian/control: use a Homepage field to reference the upstream + homepage instead of embedding this in the package description + + -- Steve Langasek Wed, 05 Dec 2007 11:52:48 -0800 + +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.53.1-0ubuntu2) gutsy; urgency=low * Use gtk_requisition_free() and gtk_border_free() where appropriate instead @@ -23,0 +45 @@ + diff -u gtk2-engines-murrine-0.53.1/debian/rules gtk2-engines-murrine-0.53.1/debian/rules --- gtk2-engines-murrine-0.53.1/debian/rules +++ gtk2-engines-murrine-0.53.1/debian/rules @@ -9,8 +9,19 @@ 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: +configure-stamp: patch-stamp dh_testdir ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-animation @@ -24,13 +35,13 @@ $(MAKE) touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f configure-stamp build-stamp - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean -test -r /usr/share/misc/config.sub && \ cp -f /usr/share/misc/config.sub config.sub diff -u gtk2-engines-murrine-0.53.1/debian/control gtk2-engines-murrine-0.53.1/debian/control --- gtk2-engines-murrine-0.53.1/debian/control +++ gtk2-engines-murrine-0.53.1/debian/control @@ -6,15 +6,13 @@ -Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.1-1) +Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.1-1), quilt Standards-Version: 3.7.2 Package: gtk2-engines-murrine Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Homepage: http://cimi.netsons.org/pages/murrine.php 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. . - Homepage: http://cimi.netsons.org/pages/murrine.php - . - This package includes the Murrine engine only. Themes have to be installed - to ~/.themes/. + This package includes the Murrine engine. only in patch2: unchanged: --- gtk2-engines-murrine-0.53.1.orig/debian/patches/01_use-correct-free-functions.patch +++ gtk2-engines-murrine-0.53.1/debian/patches/01_use-correct-free-functions.patch @@ -0,0 +1,21 @@ +--- gtk2-engines-murrine-0.53.1.orig/src/support.c ++++ gtk2-engines-murrine-0.53.1/src/support.c +@@ -274,7 +274,7 @@ + if (tmp_size) + { + *indicator_size = *tmp_size; +- g_free (tmp_size); ++ gtk_requisition_free (tmp_size); + } + else + *indicator_size = default_option_indicator_size; +@@ -282,7 +282,7 @@ + if (tmp_spacing) + { + *indicator_spacing = *tmp_spacing; +- g_free (tmp_spacing); ++ gtk_border_free (tmp_spacing); + } + else + *indicator_spacing = default_option_indicator_spacing; + only in patch2: unchanged: --- gtk2-engines-murrine-0.53.1.orig/debian/patches/series +++ gtk2-engines-murrine-0.53.1/debian/patches/series @@ -0,0 +1 @@ +01_use-correct-free-functions.patch