diff -u abiword-2.6.4/debian/changelog abiword-2.6.4/debian/changelog --- abiword-2.6.4/debian/changelog +++ abiword-2.6.4/debian/changelog @@ -1,9 +1,58 @@ +abiword (2.6.4-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #294028) + - 05_create_and_edit_styles_crash.dpatch: + . Fix crash on opening "Create Styles and Templates" menu. + - debian/control: Added Homepage field. + - debian/watch: Created debian watch file. + - debian/control, debian/rules: Drop libgoffice-0-dev build dependency and + build --without-goffice, since the old goffice 0.4 is in universe and + Abiword does not yet work with the current 0.6. Drop the -goffice + package. + + -- Cody A.W. Somerville Wed, 05 Nov 2008 02:21:34 +0000 + abiword (2.6.4-5) unstable; urgency=low * Fix a crash when returning from Print Preview. closes: #492211 -- Joshua Kwan Tue, 19 Aug 2008 19:55:01 -0700 +abiword (2.6.4-4ubuntu4) intrepid; urgency=low + + * Corrects crash when opening the Create Styles and + Templates menu with 05_create_and_edit_styles_crash.dpatch (LP: #284857) + + -- Michael Casadevall Thu, 23 Oct 2008 09:57:31 -0400 + +abiword (2.6.4-4ubuntu3) intrepid; urgency=low + + * Added Homepage field to debian/control + * Created watch file debian/watch (LP: #257313) + + -- Stefan Lesicnik Tue, 12 Aug 2008 16:25:05 +0200 + +abiword (2.6.4-4ubuntu2) intrepid; urgency=low + + * Build against boost 1.35, now that it is in main and we are transitioning + to it. + + -- Martin Pitt Mon, 11 Aug 2008 10:00:05 +0200 + +abiword (2.6.4-4ubuntu1) intrepid; urgency=low + + * Resync to Debian, thanks to Joshua for incorporating Ryan Pavlik's + repackaging of 2.6! + * Remaining Ubuntu changes: + - debian/control, debian/rules: Drop libgoffice-0-dev build dependency and + build --without-goffice, since the old goffice 0.4 is in universe and + Abiword does not yet work with the current 0.6. Drop the -goffice + package. + - debian/control: Build against boost 1.34 instead of 1.35, until we do + the transition in Ubuntu. + + -- Martin Pitt Wed, 06 Aug 2008 11:08:50 +0200 + abiword (2.6.4-4) unstable; urgency=high * The "Strike three, yer out!" release. @@ -1818,0 +1868 @@ + diff -u abiword-2.6.4/debian/rules abiword-2.6.4/debian/rules --- abiword-2.6.4/debian/rules +++ abiword-2.6.4/debian/rules @@ -46,6 +46,7 @@ ../abiword/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --disable-gucharmap \ --disable-gnomeui \ + --without-goffice \ --disable-gnomevfs # Pre-build abiword-2.6.pc @@ -143,8 +144,8 @@ debian/abiword-plugin-grammar/usr/lib/abiword-$(ABIWORD_SERIES)/plugins/ mv -f $(LIB_DIR)/plugins/libAbiMathView.so \ debian/abiword-plugin-mathview/usr/lib/abiword-$(ABIWORD_SERIES)/plugins/ - mv -f $(LIB_DIR)/plugins/libAbiGOffice.so \ - debian/abiword-plugin-goffice/usr/lib/abiword-$(ABIWORD_SERIES)/plugins/ + #mv -f $(LIB_DIR)/plugins/libAbiGOffice.so \ + # debian/abiword-plugin-goffice/usr/lib/abiword-$(ABIWORD_SERIES)/plugins/ # Move abiword's files away. dh_movefiles --sourcedir=debian/abiword-common diff -u abiword-2.6.4/debian/control abiword-2.6.4/debian/control --- abiword-2.6.4/debian/control +++ abiword-2.6.4/debian/control @@ -1,10 +1,12 @@ Source: abiword Section: gnome Priority: optional -Maintainer: Masayuki Hatta (mhatta) +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Masayuki Hatta (mhatta) Uploaders: Joshua Kwan -Build-Depends: debhelper (>= 7), dpatch, libgoffice-0-dev, libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1), libasio-dev (>= 0.3.8~rc1), libboost-date-time1.35-dev, libboost1.35-dev, libboost-regex1.35-dev, libenchant-dev (>= 1.1.6), libfreetype6-dev, libfribidi-dev, libglade2-dev, libglib2.0-dev, libgnomeprintui2.2-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5), liblink-grammar4-dev, libloudmouth1-dev, libots-dev, libpng12-dev, libpopt-dev, libreadline5-dev | libreadline-dev, librsvg2-dev (>= 2.9.5-5), libwmf-dev, libwpd8-dev (>= 0.8.3-2), libwpg-dev (>= 0.1.0), libwv-dev (>= 1.2) +Build-Depends: debhelper (>= 7), dpatch, libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1), libasio-dev (>= 0.3.8~rc1), libboost-date-time1.35-dev, libboost1.35-dev, libboost-regex1.35-dev, libenchant-dev (>= 1.1.6), libfreetype6-dev, libfribidi-dev, libglade2-dev, libglib2.0-dev, libgnomeprintui2.2-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5), liblink-grammar4-dev, libloudmouth1-dev, libots-dev, libpng12-dev, libpopt-dev, libreadline5-dev | libreadline-dev, librsvg2-dev (>= 2.9.5-5), libwmf-dev, libwpd8-dev (>= 0.8.3-2), libwpg-dev (>= 0.1.0), libwv-dev (>= 1.2) Standards-Version: 3.8.0 +Homepage: http://www.abisource.com/ Package: abiword-common Section: editors @@ -68,20 +70,20 @@ This package contains an equation editing system for AbiWord documents. -Package: abiword-plugin-goffice -Section: editors -Architecture: any -Conflicts: abiword-plugins-gnome -Replaces: abiword-plugins-gnome -Provides: abiword-plugins-gnome -Depends: ${shlibs:Depends}, abiword (= ${binary:Version}) -Description: GOffice interaction plugin for AbiWord - AbiWord is a full-featured, efficient word processing application. - It is suitable for a wide variety of word processing tasks, and - is extensible with a variety of plugins. - . - This package contains an GOffice compatibility plugin for AbiWord - documents. +#Package: abiword-plugin-goffice +#Section: editors +#Architecture: any +#Conflicts: abiword-plugins-gnome +#Replaces: abiword-plugins-gnome +#Provides: abiword-plugins-gnome +#Depends: ${shlibs:Depends}, abiword (= ${binary:Version}) +#Description: GOffice interaction plugin for AbiWord +# AbiWord is a full-featured, efficient word processing application. +# It is suitable for a wide variety of word processing tasks, and +# is extensible with a variety of plugins. +# . +# This package contains an GOffice compatibility plugin for AbiWord +# documents. Package: abiword-help Section: doc reverted: --- abiword-2.6.4/debian/abiword-plugin-goffice.dirs +++ abiword-2.6.4.orig/debian/abiword-plugin-goffice.dirs @@ -1 +0,0 @@ -usr/lib/abiword-2.6/plugins diff -u abiword-2.6.4/debian/patches/00list abiword-2.6.4/debian/patches/00list --- abiword-2.6.4/debian/patches/00list +++ abiword-2.6.4/debian/patches/00list @@ -5,0 +6 @@ +05_create_and_edit_styles_crash.dpatch only in patch2: unchanged: --- abiword-2.6.4.orig/debian/watch +++ abiword-2.6.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.abisource.com/downloads/abiword/([\d\.]+)/source/abiword-([\d\.]+)\.tar\.gz only in patch2: unchanged: --- abiword-2.6.4.orig/debian/patches/05_create_and_edit_styles_crash.dpatch +++ abiword-2.6.4/debian/patches/05_create_and_edit_styles_crash.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_create_and_edit_styles_crash.dpatch by Michael Casadevall +## +## DP: Corrects crash when opening Create Styles menu + +@DPATCH@ +diff -urNad abiword-2.6.4~/abiword/src/wp/ap/unix/ap_UnixDialog_Styles.cpp abiword-2.6.4/abiword/src/wp/ap/unix/ap_UnixDialog_Styles.cpp +--- abiword-2.6.4~/abiword/src/wp/ap/unix/ap_UnixDialog_Styles.cpp 2008-07-13 09:10:00.000000000 -0400 ++++ abiword-2.6.4/abiword/src/wp/ap/unix/ap_UnixDialog_Styles.cpp 2008-10-23 09:56:34.000000000 -0400 +@@ -661,7 +661,7 @@ + // select first + GtkTreePath *path = gtk_tree_path_new_from_string("0"); + gtk_tree_selection_select_path(selection, path); +- g_free(path); ++ gtk_tree_path_free(path); + } + + // selection "changed" doesn't fire here, so hack manually