--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package 'abiword'
This update will fix awful bugs like:
* document corruption on save (some documents can't be opened again)
* crash on open document with table in header
Also this version finally fixes GTK2 build which was not possible before.
(This will only be useful for those who will rebuild package from source using
--with-gtk2)
Finally together with some harmless changes this version fixes totally
unusable "insert clipart dialog" (#672150).
All fixes are either backported or applied upstream.
Changelog:
abiword (2.9.2+svn20120603-6) unstable; urgency=low
* debian/watch to find all available versions with fallback to latest-dev.
* new patch to fix collab backend if built --with-gtk2 and to fix FTBFS
without libgtk-3-dev (finally abiword can be built for GTK2).
* new backported patches:
+ r31861_fix-FTBFS-with-fake-collab-backend.patch
+ r31901_fix-crash-on-open-doc-with-table-in-header.patch
+ r31909_fix-doc-corruption.patch
+ r31910_fix-memory-leak-in-ABW-exporter.patch
+ r31914_fix-clip-art-window.patch (Closes: #672150)
* beautified list of Build-Depends.
* libchamplain-gtk-0.12-dev (optional build-dependency) is added to
Build-Depends (commented, to conform with freeze policy).
See all the changes in the attached diff.
unblock abiword/2.9.2+svn20120603-6
Thank you.
Regards,
Dmitry.
diff --git a/debian/changelog b/debian/changelog
index 284aa89..3834422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,21 @@
+abiword (2.9.2+svn20120603-6) unstable; urgency=low
+
+ * debian/watch to find all available versions with fallback to latest-dev.
+ * new patch to fix collab backend if built --with-gtk2 and to fix FTBFS
+ without libgtk-3-dev (finally abiword can be built for GTK2).
+ * new backported patches:
+ + r31861_fix-FTBFS-with-fake-collab-backend.patch
+ + r31901_fix-crash-on-open-doc-with-table-in-header.patch
+ + r31909_fix-doc-corruption.patch
+ + r31910_fix-memory-leak-in-ABW-exporter.patch
+ + r31914_fix-clip-art-window.patch (Closes: #672150)
+ * beautified list of Build-Depends.
+ * libchamplain-gtk-0.12-dev (optional build-dependency) is added to
+ Build-Depends (commented, to conform with freeze policy).
+
+ -- Dmitry Smirnov <only...@member.fsf.org> Thu, 13 Sep 2012 13:08:48 +1000
+
abiword (2.9.2+svn20120603-5) unstable; urgency=low
* xz compression for binary packages.
* new backported patch to fix gtk3 presentation (Closes: #682613).
diff --git a/debian/control b/debian/control
index f58f2e4..48d90c2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,41 @@
Source: abiword
Section: gnome
Priority: optional
Maintainer: Dmitry Smirnov <only...@member.fsf.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, quilt, imagemagick,
- bison, flex, libaiksaurus-1.2-dev, libaiksaurusgtk-1.2-dev, libasio-dev, libenchant-dev,
- libfribidi-dev, libgtk2.0-dev, libglib2.0-dev, libgtk-3-dev, libgtkmathview-dev,
- libjpeg8-dev, liblink-grammar4-dev, libloudmouth1-dev, libots-dev, libpng-dev,
- librdf0-dev, libreadline-dev, librsvg2-dev, libsoup2.4-dev, libtelepathy-glib-dev,
- libtidy-dev, libwmf-dev, libwpg-dev, libwps-dev, libwv-dev, libxslt1-dev,
- subversion, subversion-tools,
+Build-Depends: debhelper (>= 9), dh-autoreconf, quilt, imagemagick
+ ,bison
+ ,flex
+ ,libaiksaurus-1.2-dev
+ ,libaiksaurusgtk-1.2-dev
+ ,libasio-dev
+# ,libchamplain-gtk-0.12-dev
+ ,libenchant-dev
+ ,libfribidi-dev
+ ,libgtk2.0-dev
+ ,libglib2.0-dev
+ ,libgtk-3-dev
+ ,libgtkmathview-dev
+ ,libjpeg8-dev
+ ,liblink-grammar4-dev
+ ,libloudmouth1-dev
+ ,libots-dev
+ ,libpng-dev
+ ,librdf0-dev
+ ,libreadline-dev
+ ,librsvg2-dev
+ ,libsoup2.4-dev
+ ,libtelepathy-glib-dev
+ ,libtidy-dev
+ ,libwmf-dev
+ ,libwpg-dev
+ ,libwps-dev
+ ,libwv-dev
+ ,libxslt1-dev
+# subversion is used by get-orig-source
+ ,subversion, subversion-tools
# valgrind is only used in post-build tests, enable on available architectures
- valgrind [amd64 armel armhf i386 powerpc],
+ ,valgrind [amd64 armel armhf i386 powerpc]
Standards-Version: 3.9.3
Homepage: http://www.abisource.com/
VCS-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/abiword.git
VCS-Git: git://anonscm.debian.org/collab-maint/abiword.git
diff --git a/debian/patches/fix_gtk2-in-presence-of-gtk3.patch b/debian/patches/fix_gtk2-in-presence-of-gtk3.patch
new file mode 100644
index 0000000..12609c4
--- /dev/null
+++ b/debian/patches/fix_gtk2-in-presence-of-gtk3.patch
@@ -0,0 +1,44 @@
+Author: Dmitry Smirnov <only...@member.fsf.org>
+Last-Update: 2012-09-08
+Forwarded: 2012-09-08
+Bug-abiword: http://bugzilla.abisource.com/show_bug.cgi?id=13400
+Description: fixes two problems with collab-backend if built using "--with-gtk2":
+ Because [ "$TOOLKIT" = "gtk2" ] condition is always false,
+ collab-backend-xmpp always requests gtk3. Therefore build using
+ --with-gtk2 --enable-collab-backend-xmpp
+ FTBFS without gtk3 development files installed (i.e. "libgtk-3-dev" package).
+ .
+ In presence of libgtk-3-dev --enable-collab-backend-xmpp always links to gtk3
+ even if built using "--with-gtk2" which completely breaks collaborate menu.
+
+--- a/plugins/collab/plugin.m4
++++ b/plugins/collab/plugin.m4
+@@ -1,7 +1,7 @@
+
+ collab_req="libgsf-1 >= 1.12 libxml-2.0 >= 2.4.0"
+ collab_telepathy_req="dbus-glib-1 >= 0.70 telepathy-glib >= 0.14.5"
+-if test "$TOOLKIT" = "gtk2"; then
++if test "$TOOLKIT_IS_GTK2" = "yes"; then
+ collab_xmpp_req="loudmouth-1.0 >= 1.3.2 gtk+-2.0"
+ else
+ collab_xmpp_req="loudmouth-1.0 >= 1.3.2 gtk+-3.0"
+--- a/plugins/aiksaurus/plugin.m4
++++ b/plugins/aiksaurus/plugin.m4
+@@ -7,7 +7,7 @@
+
+ PKG_CHECK_EXISTS([ $aiksaurus_pkgs ],
+ [
+- if test "$TOOLKIT" = "gtk2"; then
++ if test "$TOOLKIT_IS_GTK2" = "yes"; then
+ PKG_CHECK_EXISTS([ $aiksaurus_gtk_pkgs ],
+ [
+ aiksaurus_deps="yes"
+@@ -32,7 +32,7 @@
+
+ PKG_CHECK_MODULES(AIKSAURUS,[ $aiksaurus_pkgs ])
+
+-if test "$TOOLKIT" = "gtk2"; then
++if test "$TOOLKIT_IS_GTK2" = "yes"; then
+ PKG_CHECK_MODULES(AIKSAURUS_GTK,[ $aiksaurus_gtk_pkgs ])
+ AIKSAURUS_CFLAGS="$AIKSAURUS_CFLAGS $AIKSAURUS_GTK_CFLAGS"
+ AIKSAURUS_LIBS="$AIKSAURUS_LIBS $AIKSAURUS_GTK_LIBS"
diff --git a/debian/patches/goffice-0.10-ver.patch b/debian/patches/goffice-0.10-ver.patch
index 4d85f60..d95c3d3 100644
--- a/debian/patches/goffice-0.10-ver.patch
+++ b/debian/patches/goffice-0.10-ver.patch
@@ -1,13 +1,12 @@
Author: Dmitry Smirnov <only...@member.fsf.org>
-Last-Update: 2012-02-06
+Last-Update: 2012-08-31
Forwarded: no
Description: correct libgoffice-0.10 version requirements
-
--- a/configure.in
+++ b/configure.in
-@@ -95,7 +95,7 @@
+@@ -93,7 +93,7 @@
# optional deps
enchant_req='enchant >= 1.2.0'
gio_req='gio-2.0'
-goffice_req='libgoffice-0.10 >= 0.10.0'
diff --git a/debian/patches/r31861-fix-fake-collab-backend.patch b/debian/patches/r31861-fix-fake-collab-backend.patch
new file mode 100644
index 0000000..9a1a2f5
--- /dev/null
+++ b/debian/patches/r31861-fix-fake-collab-backend.patch
@@ -0,0 +1,60 @@
+Last-Update: 2012-09-08
+Author: Dmitry Smirnov <only...@member.fsf.org>
+Forwarded: not-needed
+Description: backported patch (r31861) to fix FTBFS with --enable-collab-backend-fake
+
+--- a/plugins/collab/backends/fake/xp/FakeAccountHandler.cpp
++++ b/plugins/collab/backends/fake/xp/FakeAccountHandler.cpp
+@@ -295,7 +295,7 @@
+ {
+ UT_DEBUGMSG(("Starting a locally controlled collaboration session: %s\n", sSessionId.utf8_str()));
+ // FIXME: we need to set the proper collab id and master descriptor
+- m_pSession = pManager->startSession(m_pDoc, sSessionId, NULL, "fake://master");
++ m_pSession = pManager->startSession(m_pDoc, sSessionId, this, true, NULL, "fake://master");
+ }
+ else
+ {
+@@ -320,8 +320,7 @@
+ }
+
+ addBuddy(pCollaborator);
+- XAP_Frame* pFrame = XAP_App::getApp()->newFrame(); // FIXME: this is a memory leak
+- m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, pFrame);
++ m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, this, true);
+ pManager->joinSession(m_pSession, pCollaborator);
+ }
+
+--- a/plugins/collab/backends/fake/xp/FakeAccountHandler.h
++++ b/plugins/collab/backends/fake/xp/FakeAccountHandler.h
+@@ -64,6 +64,8 @@
+ { return false; }
+ virtual void forceDisconnectBuddy(BuddyPtr pBuddy);
+ virtual bool recognizeBuddyIdentifier(const std::string& identifier);
++ virtual bool hasPersistentAccessControl()
++ { return true; }
+
+ // session management
+ virtual bool allowsSessionTakeover()
+--- a/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp
++++ b/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp
+@@ -94,6 +94,9 @@
+ #ifdef ABICOLLAB_HANDLER_SIPSIMPLE
+ #include <backends/sipsimple/unix/SIPSimpleUnixAccountHandler.h>
+ #endif
++#ifdef ABICOLLAB_HANDLER_FAKE
++#include <backends/fake/xp/FakeAccountHandler.h>
++#endif
+
+ // event includes
+ #include <account/xp/Event.h>
+@@ -287,6 +290,10 @@
+ #ifdef ABICOLLAB_HANDLER_SIPSIMPLE
+ m_regAccountHandlers[SIPSimpleAccountHandler::getStaticStorageType()] = SIPSimpleAccountHandlerConstructor;
+ #endif
++#ifdef ABICOLLAB_HANDLER_FAKE
++ AccountHandler *pFakeHandler = new FakeAccountHandler("FakeAbiCollabBackend", NULL);
++ addAccount(pFakeHandler);
++#endif
+ return true;
+ }
+
diff --git a/debian/patches/r31861_fix-FTBFS-with-fake-collab-backend.patch b/debian/patches/r31861_fix-FTBFS-with-fake-collab-backend.patch
new file mode 100644
index 0000000..9a1a2f5
--- /dev/null
+++ b/debian/patches/r31861_fix-FTBFS-with-fake-collab-backend.patch
@@ -0,0 +1,60 @@
+Last-Update: 2012-09-08
+Author: Dmitry Smirnov <only...@member.fsf.org>
+Forwarded: not-needed
+Description: backported patch (r31861) to fix FTBFS with --enable-collab-backend-fake
+
+--- a/plugins/collab/backends/fake/xp/FakeAccountHandler.cpp
++++ b/plugins/collab/backends/fake/xp/FakeAccountHandler.cpp
+@@ -295,7 +295,7 @@
+ {
+ UT_DEBUGMSG(("Starting a locally controlled collaboration session: %s\n", sSessionId.utf8_str()));
+ // FIXME: we need to set the proper collab id and master descriptor
+- m_pSession = pManager->startSession(m_pDoc, sSessionId, NULL, "fake://master");
++ m_pSession = pManager->startSession(m_pDoc, sSessionId, this, true, NULL, "fake://master");
+ }
+ else
+ {
+@@ -320,8 +320,7 @@
+ }
+
+ addBuddy(pCollaborator);
+- XAP_Frame* pFrame = XAP_App::getApp()->newFrame(); // FIXME: this is a memory leak
+- m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, pFrame);
++ m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, this, true);
+ pManager->joinSession(m_pSession, pCollaborator);
+ }
+
+--- a/plugins/collab/backends/fake/xp/FakeAccountHandler.h
++++ b/plugins/collab/backends/fake/xp/FakeAccountHandler.h
+@@ -64,6 +64,8 @@
+ { return false; }
+ virtual void forceDisconnectBuddy(BuddyPtr pBuddy);
+ virtual bool recognizeBuddyIdentifier(const std::string& identifier);
++ virtual bool hasPersistentAccessControl()
++ { return true; }
+
+ // session management
+ virtual bool allowsSessionTakeover()
+--- a/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp
++++ b/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp
+@@ -94,6 +94,9 @@
+ #ifdef ABICOLLAB_HANDLER_SIPSIMPLE
+ #include <backends/sipsimple/unix/SIPSimpleUnixAccountHandler.h>
+ #endif
++#ifdef ABICOLLAB_HANDLER_FAKE
++#include <backends/fake/xp/FakeAccountHandler.h>
++#endif
+
+ // event includes
+ #include <account/xp/Event.h>
+@@ -287,6 +290,10 @@
+ #ifdef ABICOLLAB_HANDLER_SIPSIMPLE
+ m_regAccountHandlers[SIPSimpleAccountHandler::getStaticStorageType()] = SIPSimpleAccountHandlerConstructor;
+ #endif
++#ifdef ABICOLLAB_HANDLER_FAKE
++ AccountHandler *pFakeHandler = new FakeAccountHandler("FakeAbiCollabBackend", NULL);
++ addAccount(pFakeHandler);
++#endif
+ return true;
+ }
+
diff --git a/debian/patches/r31901_fix-crash-on-open-doc-with-table-in-header.patch b/debian/patches/r31901_fix-crash-on-open-doc-with-table-in-header.patch
new file mode 100644
index 0000000..7aa513a
--- /dev/null
+++ b/debian/patches/r31901_fix-crash-on-open-doc-with-table-in-header.patch
@@ -0,0 +1,25 @@
+Author: Dmitry Smirnov <only...@member.fsf.org>
+Last-Update: 2012-09-13
+Forwarded: not-needed
+Bug-Abiword: http://bugzilla.abisource.com/show_bug.cgi?id=12757
+Description: backported patch (r31901) to fix crash on
+ opening a document with a header containing a table
+
+
+--- a/src/text/fmt/xp/fl_TableLayout.cpp
++++ b/src/text/fmt/xp/fl_TableLayout.cpp
+@@ -2292,7 +2292,13 @@
+
+ UT_sint32 iNewHeight = getFirstContainer()->getHeight();
+ fl_ContainerLayout * myL = myContainingLayout();
+- if((myL->getContainerType() != FL_CONTAINER_SHADOW) &&
++ while (myL && (myL->getContainerType() != FL_CONTAINER_SHADOW &&
++ myL->getContainerType() != FL_CONTAINER_HDRFTR &&
++ myL->getContainerType() != FL_CONTAINER_DOCSECTION))
++ {
++ myL = myL->myContainingLayout();
++ }
++ if(myL && (myL->getContainerType() != FL_CONTAINER_SHADOW) &&
+ (myL->getContainerType() != FL_CONTAINER_HDRFTR))
+ {
+ if(iNewHeight != iOldHeight)
diff --git a/debian/patches/r31909_fix-doc-corruption.patch b/debian/patches/r31909_fix-doc-corruption.patch
new file mode 100644
index 0000000..96b085d
--- /dev/null
+++ b/debian/patches/r31909_fix-doc-corruption.patch
@@ -0,0 +1,64 @@
+Author: Dmitry Smirnov <only...@member.fsf.org>
+Last-Update: 2012-09-13
+Forwarded: not-needed
+Bug-Abiword: http://bugzilla.abisource.com/show_bug.cgi?id=13225
+Description: backported patch (r31909) to fix document corruption
+ Fix bug 13225 -- save file with a hyperlink directly following another one
+
+
+--- a/src/wp/impexp/xp/ie_exp_AbiWord_1.cpp
++++ b/src/wp/impexp/xp/ie_exp_AbiWord_1.cpp
+@@ -995,6 +995,7 @@
+ {
+ _closeSpan();
+ _closeField();
++ _closeHyperlink();
+ const PP_AttrProp * pAP = NULL;
+ m_pDocument->getAttrProp(api,&pAP);
+ const gchar * pName;
+@@ -1008,27 +1009,22 @@
+ if(bFound)
+ break;
+ }
+-
++
+ if(bFound)
+ {
+ //this is the start of the hyperlink
+ _openTag("a", "",false, api,pcr->getXID(),true);
+ m_bInHyperlink = true;
+ }
+- else
+- {
+- _closeHyperlink();
+- }
+-
+
+ return true;
+-
+ }
+
+ case PTO_Annotation:
+ {
+ _closeSpan();
+ _closeField();
++ _closeAnnotation();
+ const PP_AttrProp * pAP = NULL;
+ m_pDocument->getAttrProp(api,&pAP);
+ const gchar * pName;
+@@ -1048,15 +1044,8 @@
+ UT_DEBUGMSG(("Doing open annotation object \n"));
+ m_bInAnnotation = true;
+ }
+- else
+- {
+- UT_DEBUGMSG(("Doing close annotation object \n"));
+- _closeAnnotation();
+- }
+-
+
+ return true;
+-
+ }
+
+ case PTO_RDFAnchor:
diff --git a/debian/patches/r31910_fix-memory-leak-in-ABW-exporter.patch b/debian/patches/r31910_fix-memory-leak-in-ABW-exporter.patch
new file mode 100644
index 0000000..dc01fbc
--- /dev/null
+++ b/debian/patches/r31910_fix-memory-leak-in-ABW-exporter.patch
@@ -0,0 +1,60 @@
+Author: Dmitry Smirnov <only...@member.fsf.org>
+Last-Update: 2012-09-13
+Forwarded: not-needed
+Description: backported patch (r31910) to fix memory leak in ABW exporter
+
+
+--- a/src/wp/impexp/xp/ie_exp_AbiWord_1.cpp
++++ b/src/wp/impexp/xp/ie_exp_AbiWord_1.cpp
+@@ -1387,34 +1387,35 @@
+
+ m_pListener = new s_AbiWord_1_Listener(getDoc(),this, m_bIsTemplate);
+ if (!m_pListener)
+- {
+- close_gsf_handle(m_output);
+- return UT_IE_NOMEMORY;
+- }
++ {
++ close_gsf_handle(m_output);
++ return UT_IE_NOMEMORY;
++ }
+
++ bool bStatusTellListener = true;
+ if (getDocRange())
+ {
+- if(!getDoc()->tellListenerSubset(static_cast<PL_Listener *>(m_pListener),getDocRange()))
+- {
+- close_gsf_handle(m_output);
+- return UT_ERROR;
+- }
++ bStatusTellListener = getDoc()->tellListenerSubset(static_cast<PL_Listener *>(m_pListener),getDocRange());
+ }
+ else
+ {
+- if (!getDoc()->tellListener(static_cast<PL_Listener *>(m_pListener)))
+- {
+- close_gsf_handle(m_output);
+- return UT_ERROR;
+- }
++ bStatusTellListener = getDoc()->tellListener(static_cast<PL_Listener *>(m_pListener));
+ }
+
+ delete m_pListener;
+ m_pListener = NULL;
+-
+ close_gsf_handle(m_output);
+
+- return ((m_error) ? UT_IE_COULDNOTWRITE : UT_OK);
++ if (!bStatusTellListener)
++ {
++ return UT_ERROR;
++ }
++ else if (m_error)
++ {
++ return UT_IE_COULDNOTWRITE;
++ }
++
++ return UT_OK;
+ }
+
+ /*****************************************************************/
diff --git a/debian/patches/r31914_fix-clip-art-window.patch b/debian/patches/r31914_fix-clip-art-window.patch
new file mode 100644
index 0000000..7d927a1
--- /dev/null
+++ b/debian/patches/r31914_fix-clip-art-window.patch
@@ -0,0 +1,20 @@
+Author: Dmitry Smirnov <only...@member.fsf.org>
+Last-Update: 2012-09-13
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/672150
+Bug-Abiword: http://bugzilla.abisource.com/show_bug.cgi?id=13402
+Description: backported patch (r31914) to fix clip art window
+ make vbox expandable
+
+
+--- a/src/af/xap/gtk/xap_UnixDlg_ClipArt.cpp
++++ b/src/af/xap/gtk/xap_UnixDlg_ClipArt.cpp
+@@ -144,7 +144,7 @@
+ connectFocus(GTK_WIDGET(this->dlg), pFrame);
+
+ GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area(GTK_DIALOG(this->dlg))), vbox);
++ gtk_box_pack_start(GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(this->dlg))), vbox, TRUE,TRUE,0);
+
+ pSS->getValueUTF8(XAP_STRING_ID_DLG_CLIPART_Loading, s);
+ this->progress = gtk_progress_bar_new ();
diff --git a/debian/patches/series b/debian/patches/series
index 63c9895..3f7cfb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,8 +6,9 @@ ctrl-comma-subscript.diff -p1
mime-types-desktop.diff -p1
mime-types.diff -p1
624095-disable_smooth_scrolling.patch
format-hardening.patch
+fix_gtk2-in-presence-of-gtk3.patch
r31355_fix-wheel-scrolling.patch
r31490_fix-crash-if-inserting-a-footnote.patch
r31566_rearrange-date-and-time-formats.patch
r31576_remove-separator-from-insert-dialogs.patch
@@ -21,4 +22,9 @@ r31768_correct-horizontal-scroll-limit.patch
r31842_fix-crash-13401.patch
r31843_prevent-crash.patch
r31844_fix-gtk3-presentation.patch
r31847_fix-program-hanging-during-paste-unformatted.patch
+r31861_fix-FTBFS-with-fake-collab-backend.patch
+r31901_fix-crash-on-open-doc-with-table-in-header.patch
+r31909_fix-doc-corruption.patch
+r31910_fix-memory-leak-in-ABW-exporter.patch
+r31914_fix-clip-art-window.patch
diff --git a/debian/rules b/debian/rules
index 27ab5b7..8c57cb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,8 +68,9 @@ override_dh_auto_configure:
--enable-dependency-tracking \
--enable-plugins="$(plugins)"
## --with-goffice
# --with-gtk2 \
+# --enable-debug \
override_dh_auto_test:
# do not stop on failed test(s)
-dh_auto_test
diff --git a/debian/watch b/debian/watch
index 0573972..02ba30b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,18 +1,15 @@
-# Run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
+# uscan(1) configuration file.
+# Use 'debian/rules get-orig-source' command to generate orig archive.
-# Compulsory line, this is a version 3 file
version=3
-# this suppose to catch all versions, but it doesn't :(
-opts=dversionmangle=s/\+svn\d+// \
-http://www.abisource.com/downloads/abiword/([\d\.]+)/source/abiword-([\d\.]+)\.tar\.gz
-
-# current version
-opts=dversionmangle=s/\+svn\d+// \
-http://www.abisource.com/downloads/abiword/2.9.2/source/abiword-([\d\.]+)\.tar\.gz
+## all versions
+opts=\
+dversionmangle=s/\+svn\d+//,\
+downloadurlmangle=s/([0-9.]+)\//$1\/source\/abiword-$1\.tar\.gz/,\
+filenamemangle=s/.*/orig.tar.gz/,\
+ http://www.abisource.com/downloads/abiword/ ([0-9.]+)\/
-# latest version
+## latest-dev version
opts=dversionmangle=s/\+svn\d+// \
http://www.abisource.com/downloads/abiword/latest-dev/source/abiword-([\d\.]+)\.tar\.gz
signature.asc
Description: This is a digitally signed message part.
--- End Message ---
