diff -rdpu abiword-2.6.2.org/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.am abiword-2.6.2/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.am --- abiword-2.6.2.org/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.am 2008-04-06 18:00:44.000000000 +0200 +++ abiword-2.6.2/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.am 2008-05-14 16:45:34.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 @@ bin_PROGRAMS = abiword 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_LIBRARY = libabiword-$(ABIWORD_S 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 -rdpu abiword-2.6.2.org/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.in abiword-2.6.2/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.in --- abiword-2.6.2.org/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.in 2008-04-06 23:26:18.000000000 +0200 +++ abiword-2.6.2/abiword-2.6.2/abiword/src/wp/main/unix/GNUmakefile.in 2008-05-14 16:45:34.000000000 +0200 @@ -1,8 +1,8 @@ -# GNUmakefile.in generated by automake 1.10 from GNUmakefile.am. +# GNUmakefile.in generated by automake 1.10.1 from GNUmakefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -416,7 +416,7 @@ ABI_TEST_LIBS = $(top_builddir)/src/af/u @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) @@ -553,8 +553,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -566,8 +566,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -577,13 +577,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -729,14 +728,11 @@ uninstall-am: uninstall-binPROGRAMS unin #@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 -rdpu abiword-2.6.2.org/abiword-2.6.2/debian/control abiword-2.6.2/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/abiword-2.6.2/debian/control 2008-05-14 16:45:34.000000000 +0200 @@ -25,6 +25,13 @@ 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. + Text todo + Package: abiword-plugins Section: editors Architecture: any diff -rdpu abiword-2.6.2.org/abiword-2.6.2/debian/rules abiword-2.6.2/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/abiword-2.6.2/debian/rules 2008-05-14 16:45:34.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