diff -Nru gtkspell-2.0.16/debian/changelog gtkspell-2.0.16/debian/changelog --- gtkspell-2.0.16/debian/changelog 2010-01-09 03:18:20.000000000 +0000 +++ gtkspell-2.0.16/debian/changelog 2011-07-24 03:12:50.000000000 +0000 @@ -1,3 +1,15 @@ +gtkspell (2.0.16-1ubuntu1~gwibber1) oneiric; urgency=low + + * debian/patches/gtk3_support.patch + - patched to build for gtk3 + * debian/control, debian/*.install + - Added new package names for libgtkspell3-0 to be installed + side by side with gtk2 builds + * debian/rules + - convert to cdbs and make it dual build gtk2 and gtk3 + + -- Ken VanDine Sat, 23 Jul 2011 17:38:38 -0400 + gtkspell (2.0.16-1) unstable; urgency=low * New upstream release diff -Nru gtkspell-2.0.16/debian/control gtkspell-2.0.16/debian/control --- gtkspell-2.0.16/debian/control 2010-01-09 03:32:47.000000000 +0000 +++ gtkspell-2.0.16/debian/control 2011-07-24 03:03:54.000000000 +0000 @@ -2,14 +2,31 @@ Section: libs Priority: optional Maintainer: Ari Pollak -Build-Depends: debhelper (>= 7.0.0), libenchant-dev, libgtk2.0-dev (>= 2.4.0), libltdl3-dev, libxml-parser-perl, intltool (>= 0.35.0), autotools-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7.0.0), cdbs, libenchant-dev, libgtk-3-dev, libgtk2.0-dev (>= 2.4.0), libltdl3-dev, libxml-parser-perl, intltool (>= 0.35.0), autotools-dev, gtk-doc-tools, dh-autoreconf +Standards-Version: 3.9.2 + +Package: gtkspell +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: spell-checking addon for GTK's TextView widget + GtkSpell provides MSWord/MacOSX-style highlighting of misspelled words in a + GtkTextView widget. Right-clicking a misspelled word pops up a menu of + suggested replacements. Package: libgtkspell0 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: a spell-checking addon for GTK's TextView widget +Depends: ${shlibs:Depends}, ${misc:Depends}, gtkspell (= ${binary:Version}) +Description: spell-checking addon for GTK's TextView widget + GtkSpell provides MSWord/MacOSX-style highlighting of misspelled words in a + GtkTextView widget. Right-clicking a misspelled word pops up a menu of + suggested replacements. + +Package: libgtkspell3-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gtkspell (= ${binary:Version}) +Description: spell-checking addon for GTK's TextView widget GtkSpell provides MSWord/MacOSX-style highlighting of misspelled words in a GtkTextView widget. Right-clicking a misspelled word pops up a menu of suggested replacements. @@ -18,6 +35,16 @@ Section: libdevel Architecture: any Depends: libenchant-dev, libgtk2.0-dev, libgtkspell0 (= ${binary:Version}), + ${misc:Depends}, libgtkspell3-dev +Description: Development files for GtkSpell + This package contains the headers and static libraries for developing + applications with GtkSpell support. Also included are documentation and + example code for developing GtkSpell applications. + +Package: libgtkspell3-dev +Section: libdevel +Architecture: any +Depends: libenchant-dev, libgtk-3-dev, libgtkspell3-0 (= ${binary:Version}), ${misc:Depends} Description: Development files for GtkSpell This package contains the headers and static libraries for developing diff -Nru gtkspell-2.0.16/debian/gtkspell.install gtkspell-2.0.16/debian/gtkspell.install --- gtkspell-2.0.16/debian/gtkspell.install 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/gtkspell.install 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/share/locale /usr/share/ diff -Nru gtkspell-2.0.16/debian/libgtkspell0.dirs gtkspell-2.0.16/debian/libgtkspell0.dirs --- gtkspell-2.0.16/debian/libgtkspell0.dirs 2010-01-09 03:12:54.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell0.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib diff -Nru gtkspell-2.0.16/debian/libgtkspell0.files gtkspell-2.0.16/debian/libgtkspell0.files --- gtkspell-2.0.16/debian/libgtkspell0.files 2010-01-09 03:12:54.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell0.files 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/lib*.so.* -usr/share/locale diff -Nru gtkspell-2.0.16/debian/libgtkspell0.install gtkspell-2.0.16/debian/libgtkspell0.install --- gtkspell-2.0.16/debian/libgtkspell0.install 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell0.install 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/lib*.so.* /usr/lib/ diff -Nru gtkspell-2.0.16/debian/libgtkspell3-0.install gtkspell-2.0.16/debian/libgtkspell3-0.install --- gtkspell-2.0.16/debian/libgtkspell3-0.install 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell3-0.install 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/lib/lib*.so.* /usr/lib/ diff -Nru gtkspell-2.0.16/debian/libgtkspell3-0.symbols gtkspell-2.0.16/debian/libgtkspell3-0.symbols --- gtkspell-2.0.16/debian/libgtkspell3-0.symbols 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell3-0.symbols 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1,10 @@ +libgtkspell3.so.0 libgtkspell3-0 #MINVER# + gtkspell_attach@Base 2.0.16 + gtkspell_detach@Base 2.0.16 + gtkspell_error_quark@Base 2.0.16 + gtkspell_get_from_text_view@Base 2.0.16 + gtkspell_get_suggestions_menu@Base 2.0.16 + gtkspell_init@Base 2.0.16 + gtkspell_new_attach@Base 2.0.16 + gtkspell_recheck_all@Base 2.0.16 + gtkspell_set_language@Base 2.0.16 diff -Nru gtkspell-2.0.16/debian/libgtkspell3-dev.install gtkspell-2.0.16/debian/libgtkspell3-dev.install --- gtkspell-2.0.16/debian/libgtkspell3-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell3-dev.install 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1,5 @@ +debian/tmp/gtk3/usr/include/* /usr/include/ +debian/tmp/gtk3/usr/lib/lib*.a /usr/lib/ +debian/tmp/gtk3/usr/lib/lib*.so /usr/lib/ +debian/tmp/gtk3/usr/lib/pkgconfig /usr/lib/ +debian/tmp/gtk3/usr/share/gtk-doc /usr/share/ diff -Nru gtkspell-2.0.16/debian/libgtkspell-dev.dirs gtkspell-2.0.16/debian/libgtkspell-dev.dirs --- gtkspell-2.0.16/debian/libgtkspell-dev.dirs 2010-01-09 03:12:54.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell-dev.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib -usr/include diff -Nru gtkspell-2.0.16/debian/libgtkspell-dev.docs gtkspell-2.0.16/debian/libgtkspell-dev.docs --- gtkspell-2.0.16/debian/libgtkspell-dev.docs 2010-01-09 03:12:54.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell-dev.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -README diff -Nru gtkspell-2.0.16/debian/libgtkspell-dev.examples gtkspell-2.0.16/debian/libgtkspell-dev.examples --- gtkspell-2.0.16/debian/libgtkspell-dev.examples 2010-01-09 03:12:54.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell-dev.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -examples/Makefile -examples/advanced.c -examples/simple.c diff -Nru gtkspell-2.0.16/debian/libgtkspell-dev.files gtkspell-2.0.16/debian/libgtkspell-dev.files --- gtkspell-2.0.16/debian/libgtkspell-dev.files 2010-01-09 03:12:54.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell-dev.files 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -usr/include/* -usr/lib/lib*.a -usr/lib/lib*.la -usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/share/gtk-doc/html/gtkspell/* - diff -Nru gtkspell-2.0.16/debian/libgtkspell-dev.install gtkspell-2.0.16/debian/libgtkspell-dev.install --- gtkspell-2.0.16/debian/libgtkspell-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/libgtkspell-dev.install 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1,3 @@ +debian/tmp/gtk2/usr/lib/lib*.a /usr/lib/ +debian/tmp/gtk2/usr/lib/lib*.so /usr/lib/ +debian/tmp/gtk2/usr/lib/pkgconfig /usr/lib/ diff -Nru gtkspell-2.0.16/debian/patches/gtk3_support.patch gtkspell-2.0.16/debian/patches/gtk3_support.patch --- gtkspell-2.0.16/debian/patches/gtk3_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/patches/gtk3_support.patch 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1,141 @@ +=== modified file 'Makefile.am' +--- old/Makefile.am 2010-01-08 22:13:05 +0000 ++++ new/Makefile.am 2011-07-23 21:39:04 +0000 +@@ -1,8 +1,14 @@ + SUBDIRS=gtkspell examples docs po + + pkgconfigdir=$(libdir)/pkgconfig ++ ++if USE_GTK3 ++pkgconfig_DATA=gtkspell3-2.0.pc ++DISTCLEANFILES=gtkspell3-2.0.pc ++else + pkgconfig_DATA=gtkspell-2.0.pc + DISTCLEANFILES=gtkspell-2.0.pc ++endif + + dist-hook: + $(MAKE) -C "$(srcdir)/po" "$(GETTEXT_PACKAGE).pot" + +=== modified file 'configure.ac' +--- old/configure.ac 2010-01-08 22:13:05 +0000 ++++ new/configure.ac 2011-07-24 00:34:17 +0000 +@@ -15,11 +15,32 @@ + SPELLER_LIB=-lenchant + + AC_SUBST(SPELLER_LIB) +-GTKSPELL_PACKAGES=gtk+-2.0 ++ ++AC_ARG_WITH([gtk], ++ [AS_HELP_STRING([--with-gtk], ++ [Which version of gtk to use @<:@default=2@:>@])], ++ [], ++ [with_gtk=3]) ++AS_IF([test "x$with_gtk" = x3], ++ [PKG_CHECK_MODULES(GTKSPELL, gtk+-3.0 ++ enchant >= 0.4.0) ++ GTKSPELL_PACKAGES=gtk+-3.0 ++ AC_SUBST(GTKSPELL_CFLAGS) ++ AC_SUBST(GTKSPELL_LIBS) ++ AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ++ ], ++ [test "x$with_gtk" = x2], ++ [PKG_CHECK_MODULES(GTKSPELL, gtk+-2.0 ++ enchant >= 0.4.0) ++ GTKSPELL_PACKAGES=gtk+-2.0 ++ AC_SUBST(GTKSPELL_CFLAGS) ++ AC_SUBST(GTKSPELL_LIBS) ++ ], ++ [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ++) ++AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ++ + AC_SUBST(GTKSPELL_PACKAGES) +-PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0 ) +-AC_SUBST(GTKSPELL_CFLAGS) +-AC_SUBST(GTKSPELL_LIBS) + + # check Pango version so we can use PANGO_UNDERLINE_ERROR when available: + PKG_CHECK_MODULES(PANGO, [pango >= 1.3.5], +@@ -90,7 +111,7 @@ + + dnl AM_MAINTAINER_MODE + +-AC_CONFIG_FILES(Makefile gtkspell/Makefile examples/Makefile gtkspell-2.0.pc gtkspell.spec docs/Makefile po/Makefile.in) ++AC_CONFIG_FILES(Makefile gtkspell/Makefile examples/Makefile gtkspell-2.0.pc gtkspell3-2.0.pc gtkspell.spec docs/Makefile po/Makefile.in) + + GTK_DOC_CHECK(1.0) + + +=== modified file 'examples/Makefile.am' +--- old/examples/Makefile.am 2005-09-06 13:00:45 +0000 ++++ new/examples/Makefile.am 2011-07-23 21:39:04 +0000 +@@ -1,6 +1,10 @@ + noinst_PROGRAMS = simple advanced + AM_CFLAGS = @GTKSPELL_CFLAGS@ -I$(top_builddir) + INCLUDES = -I$(top_srcdir) ++if USE_GTK3 ++LDADD = @GTKSPELL_LIBS@ $(top_builddir)/gtkspell/libgtkspell3.la ++else + LDADD = @GTKSPELL_LIBS@ $(top_builddir)/gtkspell/libgtkspell.la ++endif + simple_SOURCES = simple.c + advanced_SOURCES = advanced.c + +=== modified file 'gtkspell/Makefile.am' +--- old/gtkspell/Makefile.am 2005-09-06 13:00:45 +0000 ++++ new/gtkspell/Makefile.am 2011-07-23 21:39:04 +0000 +@@ -1,6 +1,19 @@ +-lib_LTLIBRARIES=libgtkspell.la ++if USE_GTK3 ++VER=3 ++lib_LTLIBRARIES = libgtkspell3.la ++else ++VER= ++lib_LTLIBRARIES = libgtkspell.la ++endif ++ + AM_CFLAGS=@GTKSPELL_CFLAGS@ -DG_LOG_DOMAIN=\"gtkspell\" -DLOCALEDIR=\""$(datadir)/locale"\" + libgtkspell_la_LIBADD=@GTKSPELL_LIBS@ @SPELLER_LIB@ + libgtkspell_la_includedir=$(includedir)/gtkspell-2.0/gtkspell + libgtkspell_la_include_HEADERS=gtkspell.h + libgtkspell_la_SOURCES=gtkspell.c deprecated.c gtkspell.h ++ ++libgtkspell3_la_LIBADD=$(libgtkspell_la_LIBADD) ++libgtkspell3_la_includedir=$(libgtkspell_la_includedir) ++libgtkspell3_la_include_HEADERS=$(libgtkspell_la_include_HEADERS) ++libgtkspell3_la_SOURCES=$(libgtkspell_la_SOURCES) ++ + +=== modified file 'gtkspell/gtkspell.c' +--- old/gtkspell/gtkspell.c 2010-01-08 22:13:05 +0000 ++++ new/gtkspell/gtkspell.c 2011-07-23 21:39:04 +0000 +@@ -310,7 +310,8 @@ + + get_word_extents_from_mark(spell->buffer, &start, &end, spell->mark_click); + oldword = gtk_text_buffer_get_text(spell->buffer, &start, &end, FALSE); +- newword = gtk_label_get_text(GTK_LABEL(GTK_BIN(menuitem)->child)); ++ newword = ++ gtk_label_get_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem)))); + + if (debug) { + g_print("old word: '%s'\n", oldword); + +=== added file 'gtkspell3-2.0.pc.in' +--- old/gtkspell3-2.0.pc.in 1970-01-01 00:00:00 +0000 ++++ new/gtkspell3-2.0.pc.in 2011-07-23 21:39:04 +0000 +@@ -0,0 +1,13 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: GTKSpell ++Description: GTK spelling library ++Version: @VERSION@ ++Requires: @GTKSPELL_PACKAGES@ ++Libs: -L${libdir} -lgtkspell3 ++Libs.private: @SPELLER_LIB@ ++Cflags: -I${includedir}/gtkspell-2.0 ++ + diff -Nru gtkspell-2.0.16/debian/patches/series gtkspell-2.0.16/debian/patches/series --- gtkspell-2.0.16/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gtkspell-2.0.16/debian/patches/series 2011-07-24 03:03:04.000000000 +0000 @@ -0,0 +1 @@ +gtk3_support.patch diff -Nru gtkspell-2.0.16/debian/rules gtkspell-2.0.16/debian/rules --- gtkspell-2.0.16/debian/rules 2010-01-09 03:30:05.000000000 +0000 +++ gtkspell-2.0.16/debian/rules 2011-07-24 03:03:04.000000000 +0000 @@ -1,96 +1,23 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif - -config.status: configure - dh_testdir - - -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 - - # Add here commands to configure the package. - ./configure $(CROSS) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-gtk-doc --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-gtk-doc - - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr - - rm debian/tmp/usr/lib/*.la - -# 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 - dh_testdir - dh_testroot - dh_movefiles - -# dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit - dh_installcron - dh_installman - dh_installinfo - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_CONFIGURE_EXTRA_FLAGS = --disable-gtk-doc + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete