Hey Ángel! El dc 19 de 06 de 2013 a les 22:47 +0200, en/na Angel Abad va escriure: > Hi Jordi, I cant upload to unstable, almanah 0.10.8 is waiting for > libecal1.2-dev (>= 3.6.0) and libedataserver1.2-dev (>= 3.6.0).
Meh, I totally don't want to entangle this silly transition with all the evo stuff. I tried the upstream patch against 0.9.1, it works flawlessly. Rough, quick patch attached, feel free to cleanup and upload! Thanks! Jordi -- Jordi Mallach Pérez -- Debian developer http://www.debian.org/ [email protected] [email protected] http://www.sindominio.net/ GnuPG public key information available at http://oskuro.net/
diff -Nru almanah-0.9.1/debian/changelog almanah-0.9.1/debian/changelog --- almanah-0.9.1/debian/changelog 2013-03-12 20:57:44.000000000 +0100 +++ almanah-0.9.1/debian/changelog 2013-06-20 10:38:55.000000000 +0200 @@ -1,3 +1,10 @@ +almanah (0.9.1-1.1) unstable; urgency=low + + * Include upstream patch to update GtkSpell3 support (closes: #712812). + * Use dh_autoreconf for the above patch. + + -- Jordi Mallach <[email protected]> Thu, 20 Jun 2013 10:36:31 +0200 + almanah (0.9.1-1) unstable; urgency=high * Imported Upstream version 0.9.1 (Closes: #702905) diff -Nru almanah-0.9.1/debian/control almanah-0.9.1/debian/control --- almanah-0.9.1/debian/control 2013-03-12 20:56:17.000000000 +0100 +++ almanah-0.9.1/debian/control 2013-06-20 10:36:13.000000000 +0200 @@ -3,6 +3,7 @@ Priority: extra Maintainer: Angel Abad <[email protected]> Build-Depends: debhelper (>= 9), + dh-autoreconf, autotools-dev, intltool (>= 0.35.0), libglib2.0-dev, @@ -15,7 +16,7 @@ libecal1.2-dev, libedataserver1.2-dev, libedataserverui-3.0-dev, - libgtkspell-3-dev + libgtkspell3-3-dev Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/collab-maint/almanah.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/almanah.git diff -Nru almanah-0.9.1/debian/patches/gtkspell3.patch almanah-0.9.1/debian/patches/gtkspell3.patch --- almanah-0.9.1/debian/patches/gtkspell3.patch 1970-01-01 01:00:00.000000000 +0100 +++ almanah-0.9.1/debian/patches/gtkspell3.patch 2013-06-20 10:38:19.000000000 +0200 @@ -0,0 +1,88 @@ +From 114c4f78ac9882be51c4154751760bd4fea48403 Mon Sep 17 00:00:00 2001 +From: Álvaro Peña <[email protected]> +Date: Wed, 06 Feb 2013 10:12:54 +0000 +Subject: Update GtkSpell 3 support + +--- +Index: almanah-0.9.1/configure.ac +=================================================================== +--- almanah-0.9.1.orig/configure.ac 2013-06-20 10:37:39.728940237 +0200 ++++ almanah-0.9.1/configure.ac 2013-06-20 10:37:39.724940237 +0200 +@@ -95,7 +95,7 @@ + + dnl Spell checking + if test $spell_checking = "true"; then +- PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell-3.0) ++ PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell3-3.0) + AC_SUBST(SPELL_CHECKING_CFLAGS) + AC_SUBST(SPELL_CHECKING_LIBS) + fi +Index: almanah-0.9.1/src/main-window.c +=================================================================== +--- almanah-0.9.1.orig/src/main-window.c 2013-06-20 10:37:39.728940237 +0200 ++++ almanah-0.9.1/src/main-window.c 2013-06-20 10:37:39.724940237 +0200 +@@ -1389,7 +1389,7 @@ + GDate calendar_date; + gchar calendar_string[100]; + #ifdef ENABLE_SPELL_CHECKING +- GtkSpell *gtkspell; ++ GtkSpellChecker *gtkspell; + #endif /* ENABLE_SPELL_CHECKING */ + AlmanahMainWindowPrivate *priv = main_window->priv; + AlmanahEntry *entry; +@@ -1450,9 +1450,9 @@ + + #ifdef ENABLE_SPELL_CHECKING + /* Ensure the spell-checking is updated */ +- gtkspell = gtkspell_get_from_text_view (priv->entry_view); ++ gtkspell = gtk_spell_checker_get_from_text_view (priv->entry_view); + if (gtkspell != NULL) { +- gtkspell_recheck_all (gtkspell); ++ gtk_spell_checker_recheck_all (gtkspell); + gtk_widget_queue_draw (GTK_WIDGET (priv->entry_view)); + } + #endif /* ENABLE_SPELL_CHECKING */ +@@ -1514,13 +1514,13 @@ + { + AlmanahApplication *application; + GSettings *settings; +- GtkSpell *gtkspell; ++ GtkSpellChecker *gtkspell; + gchar *spelling_language; + GtkTextTagTable *table; + GtkTextTag *tag; + + /* Bail out if spell checking's already enabled */ +- if (gtkspell_get_from_text_view (self->priv->entry_view) != NULL) ++ if (gtk_spell_checker_get_from_text_view (self->priv->entry_view) != NULL) + return TRUE; + + /* If spell checking wasn't already enabled, we have a dummy gtkspell-misspelled text tag to destroy */ +@@ -1541,7 +1541,9 @@ + spelling_language = NULL; + } + +- gtkspell = gtkspell_new_attach (self->priv->entry_view, spelling_language, error); ++ gtkspell = gtk_spell_checker_new (); ++ gtk_spell_checker_set_language (gtkspell, spelling_language, error); ++ gtk_spell_checker_attach (gtkspell, self->priv->entry_view); + g_free (spelling_language); + + if (gtkspell == NULL) +@@ -1552,13 +1554,13 @@ + static void + disable_spell_checking (AlmanahMainWindow *self) + { +- GtkSpell *gtkspell; ++ GtkSpellChecker *gtkspell; + GtkTextTagTable *table; + GtkTextTag *tag; + +- gtkspell = gtkspell_get_from_text_view (self->priv->entry_view); ++ gtkspell = gtk_spell_checker_get_from_text_view (self->priv->entry_view); + if (gtkspell != NULL) +- gtkspell_detach (gtkspell); ++ gtk_spell_checker_detach (gtkspell); + + /* Remove the old gtkspell-misspelling text tag */ + table = gtk_text_buffer_get_tag_table (self->priv->entry_buffer); diff -Nru almanah-0.9.1/debian/patches/series almanah-0.9.1/debian/patches/series --- almanah-0.9.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ almanah-0.9.1/debian/patches/series 2013-06-20 10:35:17.000000000 +0200 @@ -0,0 +1 @@ +gtkspell3.patch diff -Nru almanah-0.9.1/debian/rules almanah-0.9.1/debian/rules --- almanah-0.9.1/debian/rules 2013-03-12 20:55:59.000000000 +0100 +++ almanah-0.9.1/debian/rules 2013-06-20 10:35:52.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with autotools-dev + dh $@ --with autoreconf override_dh_auto_configure: dh_auto_configure -- --disable-silent-rules
