diff -u goffice-0.2.1/debian/rules goffice-0.2.1/debian/rules --- goffice-0.2.1/debian/rules +++ goffice-0.2.1/debian/rules @@ -38,7 +38,10 @@ # for all libraries specified in the link line. LDFLAGS += -Wl,--as-needed -confflags := -v \ +# 2 packages are built: -gtk and -gnome +VARIANTS := gnome gtk + +confflags-gnome := -v \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -46,18 +49,21 @@ --infodir=\$${prefix}/share/info # FHS locations -confflags += --prefix=/usr \ +confflags-gnome += --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --datadir=\$${prefix}/share \ --libdir=\$${prefix}/lib # Compiler, language dialect -confflags += --enable-iso-c \ +confflags-gnome += --enable-iso-c \ --enable-compile-warnings=maximum # Features -confflags += --without-cairo +confflags-gnome += --without-cairo + +# Gtk build flags +confflags-gtk := $(confflags-gnome) --without-gnome upstreamversion=$(shell dpkg-parsechangelog | grep Version | head -1 | sed -e 's/Version: //g' -e 's/-[A-Za-z0-9\.]*$$//g') versionh=$(shell echo $(upstreamversion) | sed -e 's/\.[^.]*$$//') @@ -84,64 +90,57 @@ done rm -rf autom4te.cache config-stamp -config-stamp: configure +clean: $(foreach v,$(VARIANTS),clean-$(v)) dh_testdir - # Add here commands to configure the package. + dh_testroot + rm -f config-stamp* build-stamp* install-stamp* + dh_clean - rm -rf build && mkdir build - rm -f goffice/goffice-paths.h - cd build && env "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" ../configure $(confflags) +clean-%: + rm -rf debian/tmp-$* + rm -rf build-$* - touch config-stamp +build: $(foreach v,$(VARIANTS),build-stamp-$(v)) + touch build-stamp -build: build-stamp -build-stamp: config-stamp +build-stamp-%: configure-stamp-% dh_testdir cd po; intltool-update -p - $(MAKE) -C build + $(MAKE) -C build-$* - touch build-stamp + touch build-stamp-$* -clean: +configure-stamp-%: dh_testdir - dh_testroot - rm -f config-stamp build-stamp + # Add here commands to configure the package. - -$(MAKE) -C build distclean - rm -rf build - rm -f config.cache config.status - -find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f - - # Update config.{sub,guess} from autotools-dev, if possible. - -for f in config.sub config.guess ; do \ - if test -r /usr/share/misc/$$f ; then \ - OLDDATE=`./$$f -t | tr -d -` ; \ - NEWDATE=`/usr/share/misc/$$f -t | tr -d -` ; \ - if [ $$OLDDATE -lt $$NEWDATE ] ; then \ - echo "GNU config automated update of $$f (replacing $$OLDDATE with $$NEWDATE)" 1>&2 ; \ - cp -f /usr/share/misc/$$f $$f ; \ - fi; \ - fi; \ - done + mkdir build-$* + rm -f goffice/goffice-paths.h + cd build-$* && env "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" ../configure $(confflags-$(*)) - dh_clean + touch config-stamp-$* install: build +install: $(foreach v,$(VARIANTS),install-$(v)) +install-%: dh_testdir dh_testroot dh_clean -k dh_installdirs - # Install the package into debian/tmp - $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install + # Install the gnome package into debian/tmp-gnome + $(MAKE) -C build-$* DESTDIR=$(CURDIR)/debian/tmp-$* install # FIXME: where do we put the debug for the plugins? - mkdir -p $(CURDIR)/debian/tmp/usr/lib/debug - for l in `find $(CURDIR)/debian/tmp/usr/lib -name '*.so*'`; do \ - cp -vdf $$l $(CURDIR)/debian/tmp/usr/lib/debug ; \ + mkdir -p $(CURDIR)/debian/tmp-$*/usr/lib/debug + for l in `find $(CURDIR)/debian/tmp-$(*)/usr/lib -name '*.so*'`; do \ + cp -vdf $$l $(CURDIR)/debian/tmp-$*/usr/lib/debug ; \ done + touch install-stamp-$* + + # Build architecture-independent files here. binary-indep: build install @@ -155,10 +154,25 @@ dh_installdocs rm -rvf $(CURDIR)/debian/libgoffice-1-$(so_version_major)-dbg/usr/share/doc/libgoffice-1-$(so_version_major)-dbg + rm -rvf $(CURDIR)/debian/libgoffice-gtk-1-$(so_version_major)-dbg/usr/share/doc/libgoffice-gtk-1-$(so_version_major)-dbg dh_installexamples - dh_install --sourcedir=debian/tmp --fail-missing -X/usr/lib/debug - dh_install -plibgoffice-1-$(so_version_major)-dbg --sourcedir=debian/tmp + dh_install --sourcedir=debian/tmp-gnome --fail-missing -X/usr/lib/debug + dh_install --sourcedir=debian/tmp-gtk --fail-missing -X/usr/lib/debug + + dh_install -plibgoffice-1-$(so_version_major)-dbg \ + --sourcedir=debian/tmp-gnome + dh_install -plibgoffice-gtk-1-$(so_version_major)-dbg \ + --sourcedir=debian/tmp-gtk + + dh_install -plibgoffice-1-$(so_version_major) \ + --sourcedir=debian/tmp-gnome + dh_install -plibgoffice-gtk-1-$(so_version_major) \ + --sourcedir=debian/tmp-gtk + + dh_install -plibgoffice-1-dev --sourcedir=debian/tmp-gnome + dh_install -plibgoffice-1-common --sourcedir=debian/tmp-gnome + # dh_installmenu # dh_installdebconf # dh_installlogrotate @@ -174,15 +188,25 @@ dh_desktop dh_link dh_strip -v -Nlibgoffice-1-$(so_major_version)-dbg + dh_strip -v -Nlibgoffice-gtk-1-$(so_major_version)-dbg dh_buildinfo dh_compress dh_fixperms # dh_perl # dh_python #dh_makeshlibs -plibgoffice-1 -V 'libgoffice-1 (>= $(upstreamversion)), libgoffice-1 (<< $(nextupstreamversion))' - dh_makeshlibs -plibgoffice-1-$(so_version_major) -V 'libgoffice-1-$(so_version_major) (>= $(upstreamversion))' + dh_makeshlibs -plibgoffice-1-$(so_version_major) \ + -V 'libgoffice-1-$(so_version_major) (>= $(upstreamversion))' + dh_makeshlibs -plibgoffice-gtk-1-$(so_version_major) \ + -V 'libgoffice-1-$(so_version_major) (>= $(upstreamversion))' + dh_installdeb - dh_shlibdeps -l debian/libgoffice-1-$(so_version_major)/usr/lib/ -L libgoffice-1-$(so_version_major) + + dh_shlibdeps -l debian/libgoffice-1-$(so_version_major)/usr/lib/ \ + -L libgoffice-1-$(so_version_major) + dh_shlibdeps -l debian/libgoffice-gtk-1-$(so_version_major)/usr/lib/ \ + -L libgoffice-gtk-1-$(so_version_major) + dh_gencontrol -v -- -VUpstream-Version=$(upstreamversion) dh_md5sums dh_builddeb diff -u goffice-0.2.1/debian/control goffice-0.2.1/debian/control --- goffice-0.2.1/debian/control +++ goffice-0.2.1/debian/control @@ -8,7 +8,7 @@ Package: libgoffice-1-dev Section: libdevel Architecture: any -Depends: libgoffice-1-2 (= ${Source-Version}), libglib2.0-dev (>= 2.6.4), libgsf-gnome-1-dev (>= 1.13.3), libxml2-dev (>= 2.6.10-2), libgtk2.0-dev (>= 2.6.0) libglade2-dev (>= 1:2.4.0-1), libgnomeprint2.2-dev (>= 2.8.2), libart-2.0-dev (>= 2.3.16-5), libgnomeui-dev (>= 2.4.0-2) +Depends: libgoffice-1-2 (= ${Source-Version}) | libgoffice-gtk-1-2 (= ${Source-Version}), libglib2.0-dev (>= 2.6.4), libgsf-gnome-1-dev (>= 1.13.3), libxml2-dev (>= 2.6.10-2), libgtk2.0-dev (>= 2.6.0) libglade2-dev (>= 1:2.4.0-1), libgnomeprint2.2-dev (>= 2.8.2), libart-2.0-dev (>= 2.3.16-5), libgnomeui-dev (>= 2.4.0-2) Description: Document centric objects library - runtime files GOffice is a library of document centric objects and utilities building on top of GLib and Gtk+. @@ -20,6 +20,8 @@ Priority: extra Architecture: any Depends: libgoffice-1-2 (= ${Source-Version}) +Conflicts: libgoffice-gtk-1-2-dbg +Replaces: libgoffice-gtk-1-2-dbg Description: Document centric objects library - debugging files GOffice is a library of document centric objects and utilities building on top of GLib and Gtk+. @@ -31,6 +33,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, libgoffice-1-common (>= ${Source-Version}), ${misc:Depends} +Conflicts: libgoffice-gtk-1-2 +Replaces: libgoffice-gtk-1-2 Description: Document centric objects library - runtime files GOffice is a library of document centric objects and utilities building on top of GLib and Gtk+. @@ -48,0 +53,30 @@ + +Package: libgoffice-gtk-1-2-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libgoffice-gtk-1-2 (= ${Source-Version}) +Conflicts: libgoffice-1-2-dbg +Replaces: libgoffice-1-2-dbg +Description: Document centric objects library - debugging files + GOffice is a library of document centric objects and utilities building on + top of GLib and Gtk+. + . + These are the files used to debug (applications that use) the GOffice + library. + . + This package doesn't use gnome libraries. + +Package: libgoffice-gtk-1-2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, libgoffice-1-common (>= ${Source-Version}), ${misc:Depends} +Conflicts: libgoffice-1-2 +Replaces: libgoffice-1-2 +Description: Document centric objects library - runtime files + GOffice is a library of document centric objects and utilities building on + top of GLib and Gtk+. + . + These are the files needed to run applications that use GOffice. + . + This package doesn't use gnome libraries. diff -u goffice-0.2.1/debian/changelog goffice-0.2.1/debian/changelog --- goffice-0.2.1/debian/changelog +++ goffice-0.2.1/debian/changelog @@ -1,3 +1,12 @@ +goffice (0.2.1-0ubuntu2) dapper; urgency=low + + * Build both gnome dependent and independent packages. + * New created binary packages: + - libgoffice-gtk-1-2 + - libgoffice-gtk-1-2-dbg + + -- Gauvain Pocentek Sat, 25 Mar 2006 13:28:49 +0100 + goffice (0.2.1-0ubuntu1) dapper; urgency=low * New upstream release: only in patch2: unchanged: --- goffice-0.2.1.orig/debian/libgoffice-gtk-1-2-dbg.install +++ goffice-0.2.1/debian/libgoffice-gtk-1-2-dbg.install @@ -0,0 +1 @@ +usr/lib/debug/libgoffice-1.so* only in patch2: unchanged: --- goffice-0.2.1.orig/debian/libgoffice-gtk-1-2.install +++ goffice-0.2.1/debian/libgoffice-gtk-1-2.install @@ -0,0 +1,2 @@ +usr/lib/libgoffice-1.so.* +usr/lib/goffice/*/plugins/*