Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv18469
Modified Files: Tag: OPENOFFICE_ORG680 changelog rules Log Message: - fix installation of Gnome stuff to get ucpgvfs1.so, gconfbe1.so and gnome-set-default-application packaged [RE] Index: changelog =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v retrieving revision 1.338.2.25.2.15 retrieving revision 1.338.2.25.2.16 diff -u -d -r1.338.2.25.2.15 -r1.338.2.25.2.16 --- changelog 14 Mar 2005 18:01:19 -0000 1.338.2.25.2.15 +++ changelog 15 Mar 2005 16:05:53 -0000 1.338.2.25.2.16 @@ -2,6 +2,9 @@ * upstream milestone 82: - now uses libneon24 (closes: #251738) + * ooo-build/bin/package-ooo: + - installi of ucpgvfs1.so, gconfbe1.so and gnome-set-default-application + (gid_Module_Optional_Gnome) [RE] * build with java, use gij/gcj. * debian/control.in: - add Build-Depends: gij-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), @@ -17,6 +20,8 @@ - move gnome-open-url.bin into -gnome [RE] - create links to /usr/bin/g{cc,++}-4.0 in debian/usr/bin and change path to use them, ooo-build doesn't honor CC and CXX [RE] + - fix installation of Gnome stuff to get ucpgvfs1.so, gconfbe1.so and + gnome-set-default-application packaged [RE] * debian/usr/lib/*: add content (wrapper scripts) of java-gcj-compat 1.0.14-0.0ubuntu4 except ../lib/tools.jar until we can build-depend on it in Debian (in NEW...). @@ -24,7 +29,7 @@ and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again Matthias Klose [RE] - -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 14 Mar 2005 18:44:56 +0100 + -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 15 Mar 2005 16:33:48 +0100 openoffice.org2 (1.9.76-0pre) experimental; urgency=low Index: rules =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v retrieving revision 1.214.2.14.2.18 retrieving revision 1.214.2.14.2.19 diff -u -d -r1.214.2.14.2.18 -r1.214.2.14.2.19 --- rules 14 Mar 2005 18:01:20 -0000 1.214.2.14.2.18 +++ rules 15 Mar 2005 16:05:53 -0000 1.214.2.14.2.19 @@ -319,12 +319,12 @@ umask 022 # Copy files placed by ooo-build/bin/package-ooo - for i in calc core draw impress math writer; do \ + for i in calc core draw impress math writer gnome; do \ rm -rf $(PKGDIR)-$$i $(PKGDIR)-$$i.*.debhelper ;\ cp -r --preserve=mode debian/tmp/pkg/openoffice.org-$$i $(PKGDIR)-$$i || exit 1;\ done - for i in "" -kde -gnome -evolution; do \ + for i in "" -kde -evolution; do \ rm -rf $(PKGDIR)$$i $(PKGDIR)$$i.*.debhelper ;\ done @@ -337,6 +337,8 @@ for f in kdefilepicker libfps_kde.so libvclplug_kde[0-9]*.so; do \ mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kde/$(OODIR)/program || exit 1 ;\ done + # only gconfbe1, ucpgvf1.so and gnome-set-default-applications are in gid_Module_Optional_Gnome, + # so we have to move them manually here for now. for f in gnome-open-url.bin libfps_gnome.so libvclplug_gtk[0-9]*.so; do \ mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\ done -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]