diff -rdpuN ../abiword-2.6.2.org/abiword-2.6.2/debian/control abiword-2.6.2/debian/control --- ../abiword-2.6.2.org/abiword-2.6.2/debian/control 2008-05-13 13:23:12.000000000 +0200 +++ abiword-2.6.2/debian/control 2008-05-15 11:01:29.000000000 +0200 @@ -25,6 +25,15 @@ Description: efficient, featureful word on Linux and Windows (using TCP or Jabber/XMPP), web translation and dictionary support, and more. +Package: libabiword +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, gsfonts +Description: Library to include an abiword widget in a gtk application. + This library allows to embed an abiword widget inside a gtk application. + The widget provides the same editing methods as the abiword application + and plugins can be used inside the widget. + Package: abiword-plugins Section: editors Architecture: any diff -rdpuN ../abiword-2.6.2.org/abiword-2.6.2/debian/patches/00list abiword-2.6.2/debian/patches/00list --- ../abiword-2.6.2.org/abiword-2.6.2/debian/patches/00list 2008-05-13 13:23:12.000000000 +0200 +++ abiword-2.6.2/debian/patches/00list 2008-05-15 10:37:07.000000000 +0200 @@ -2,4 +2,5 @@ 03_modify_extras_pkgconfig 04_autosave_default 14_comma_subscript +15_libabiword_build_fix 50_backport_pre263.dpatch diff -rdpuN ../abiword-2.6.2.org/abiword-2.6.2/debian/patches/15_libabiword_build_fix.dpatch abiword-2.6.2/debian/patches/15_libabiword_build_fix.dpatch --- ../abiword-2.6.2.org/abiword-2.6.2/debian/patches/15_libabiword_build_fix.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ abiword-2.6.2/debian/patches/15_libabiword_build_fix.dpatch 2008-05-15 11:19:42.000000000 +0200 @@ -0,0 +1,72 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_libabiword_build_fix.dpatch by Fabian Sturm +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make libabiword build outside the tree as it is done in the debian package. + +@DPATCH@ +diff -urNad abiword-2.6.2~/abiword/src/wp/main/unix/GNUmakefile.am abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.am +--- abiword-2.6.2~/abiword/src/wp/main/unix/GNUmakefile.am 2008-04-06 18:00:44.000000000 +0200 ++++ abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.am 2008-05-15 10:30:09.000000000 +0200 +@@ -18,7 +18,7 @@ + + include $(top_srcdir)/includes.mk + +-CLEANFILES = abi_ver.cpp ++CLEANFILES = + ALL_LOCAL_DEPS = + INSTALL_EXEC_LOCAL_DEPS = + +@@ -36,9 +36,6 @@ + abiword_LDADD = @PLUGIN_LIST@ $(REPEAT_LIBS) $(PLATFORM_LIBS) $(OTHER_LIBS) + abiword_SOURCES = abi_ver.cpp UnixMain.cpp + +-abi_ver.cpp: @PLUGIN_LIST@ +- cp $(srcdir)/../xp/abi_ver.cpp . +- + # Hack together a shared library for testing purposes (e.g. olpc). + # Not using libtool because of the increased binary size, + # in fear of Tomas' wrath +@@ -53,11 +50,11 @@ + ABIWORD_SODIR = $(shell pwd) + ABIWORD_DYNBINARY = abiword-dynamic + +-$(ABIWORD_LIBRARY): $(ABI_LIBS) $(srcdir)/libabiword.cpp abi_ver.cpp ++$(ABIWORD_LIBRARY): $(ABI_LIBS) $(srcdir)/libabiword.cpp $(srcdir)/../xp/abi_ver.cpp + $(CXX) -shared -Wl,-soname,$(ABIWORD_LIBRARY) -o $@ \ + $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) \ + -DPACKAGE="\"$(PACKAGE)\"" \ +- abi_ver.cpp \ ++ $(srcdir)/../xp/abi_ver.cpp \ + $(srcdir)/libabiword.cpp \ + -Wl,--whole-archive $(ABI_LIBS) \ + -Wl,--no-whole-archive $(PLATFORM_LIBS) $(OTHER_LIBS) \ +diff -urNad abiword-2.6.2~/abiword/src/wp/main/unix/GNUmakefile.in abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.in +--- abiword-2.6.2~/abiword/src/wp/main/unix/GNUmakefile.in 2008-04-06 23:26:18.000000000 +0200 ++++ abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.in 2008-05-15 10:30:13.000000000 +0200 +@@ -416,7 +416,7 @@ + @EMBEDDED_HILDON_TRUE@ABI_HILDON_OBJECTS = xp/*.o @PLATFORM@/*.o @PLATFORM@/hildon/*.o + ABI_OBJECTS = xp/*.o @PLATFORM@/*.o + ABI_TEST_OBJECTS = xp/t/*.o +-CLEANFILES = abi_ver.cpp $(am__append_6) ++CLEANFILES = $(am__append_6) + ALL_LOCAL_DEPS = $(am__append_7) + INSTALL_EXEC_LOCAL_DEPS = $(am__append_8) + ABIWORD_BINARY = AbiWord-$(ABIWORD_SERIES) +@@ -729,14 +728,11 @@ + + #@PLATFORM@/t/*.o + +-abi_ver.cpp: @PLUGIN_LIST@ +- cp $(srcdir)/../xp/abi_ver.cpp . +- +-@WITH_LIBABIWORD_TRUE@$(ABIWORD_LIBRARY): $(ABI_LIBS) $(srcdir)/libabiword.cpp abi_ver.cpp ++@WITH_LIBABIWORD_TRUE@$(ABIWORD_LIBRARY): $(ABI_LIBS) $(srcdir)/libabiword.cpp $(srcdir)/../xp/abi_ver.cpp + @WITH_LIBABIWORD_TRUE@ $(CXX) -shared -Wl,-soname,$(ABIWORD_LIBRARY) -o $@ \ + @WITH_LIBABIWORD_TRUE@ $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) \ + @WITH_LIBABIWORD_TRUE@ -DPACKAGE="\"$(PACKAGE)\"" \ +-@WITH_LIBABIWORD_TRUE@ abi_ver.cpp \ ++@WITH_LIBABIWORD_TRUE@ $(srcdir)/../xp/abi_ver.cpp \ + @WITH_LIBABIWORD_TRUE@ $(srcdir)/libabiword.cpp \ + @WITH_LIBABIWORD_TRUE@ -Wl,--whole-archive $(ABI_LIBS) \ + @WITH_LIBABIWORD_TRUE@ -Wl,--no-whole-archive $(PLATFORM_LIBS) $(OTHER_LIBS) \ diff -rdpuN ../abiword-2.6.2.org/abiword-2.6.2/debian/rules abiword-2.6.2/debian/rules --- ../abiword-2.6.2.org/abiword-2.6.2/debian/rules 2008-05-13 13:23:12.000000000 +0200 +++ abiword-2.6.2/debian/rules 2008-05-15 10:35:31.000000000 +0200 @@ -39,6 +39,7 @@ configure-stamp: --disable-gucharmap \ --disable-gnomeui \ --disable-gnomevfs \ + --enable-libabiword \ --without-goffice # @@ -136,6 +137,9 @@ install: build # Move auxiliary files. mv -f $(CURDIR)/debian/abiword/usr/share/icons/abiword_48.png $(CURDIR)/debian/abiword/usr/share/pixmaps/abiword.png + # Separate libabiword + dh_movefiles -plibabiword --sourcedir=debian/abiword usr/lib/libabiword-2.6.so + # Separate Plugins dh_movefiles -pabiword-plugins-gnome --sourcedir=debian/abiword dh_movefiles -Nabiword-plugins-gnome --sourcedir=debian/abiword