Processed: pending
Processing commands for [EMAIL PROTECTED]: tag 294634 + pending Bug#294634: openoffice.org: Use icons for Openoffice.org in start menu There were no tags set. Bug#272240: openoffice.org: Use icons which look more different for the different apps Tags added: pending thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
CVS:oo-deb/debian changelog,1.421,1.422 rules,1.254,1.255
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv15427
Modified Files:
changelog rules
Log Message:
- install and make the GNOME/KDE menus use
ximian-openoffice-{calc,writer,draw,impress,math,template,web}
as icons (closes: #294634) and move the oopadmin entry from Office to
System [RE]
Index: changelog
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -r1.421 -r1.422
--- changelog 8 Feb 2005 11:21:41 - 1.421
+++ changelog 16 Feb 2005 18:23:16 - 1.422
@@ -14,10 +14,14 @@
- link to README.Debian.gz in /usr/share/doc/openoffice.org (provided
by openoffice.org-debian-files) from -kde and -gtk-gnome (it contains
the info that the fpickers are disabled by default) [RE]
+- install and make the GNOME/KDE menus use
+ ximian-openoffice-{calc,writer,draw,impress,math,template,web}
+ as icons (closes: #294634) and move the oopadmin entry from Office to
+ System [RE]
* debian/ttf-opensymbol.postrm.in:
- use rm -f for trying to remove fonts.cache* (closes: #288515) [RE]
- -- Rene Engelhard [EMAIL PROTECTED] Tue, 8 Feb 2005 12:19:46 +0100
+ -- Rene Engelhard [EMAIL PROTECTED] Wed, 16 Feb 2005 19:09:54 +0100
openoffice.org (1.1.3-4) unstable; urgency=low
Index: rules
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- rules 31 Jan 2005 22:36:55 - 1.254
+++ rules 16 Feb 2005 18:23:16 - 1.255
@@ -353,7 +353,7 @@
fi
# we do not need them and they make problem with dpkg-source
- rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
+ rm -f $(OOO_BUILD)/www/*.png \
$(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s* \
$(OOO_BUILD)/www/l10n/*.gif \
$(OOO_BUILD)/src/open*bmp $(OOO_BUILD)/src/file-bug-*.bmp
@@ -437,7 +437,19 @@
touch -r $(OOO_BUILD)/fonts/opens___.ttf.uu
$(OOO_BUILD)/fonts/opens___.ttf ;\
fi
rm -f $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/symbols.xls
-
+
+ # uuencode Ximian desktop icons
+ for i in calc draw impress math template web writer; do \
+ if [ -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \
+ uuencode $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \
+ ximian-openoffice-$$i.png \
+$(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+ touch -r $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+ $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ;\
+ fi; \
+ done
+ rm -f $(OOO_BUILD)/desktop/*.png
+
dh_clean
rm -rf $(STAMP_DIR) $(DEBTREEDIR) stlport-home
@@ -583,6 +595,16 @@
touch -r $(OOO_BUILD)/fonts/opens___.ttf
$(OOO_BUILD)/fonts/opens___.ttf.uu ;\
fi
+ # uuencode Ximian desktop icons
+ for i in calc draw impress math template web writer; do \
+ if [ ! -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \
+ uudecode -o $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \
+ $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu ;\
+ touch -r $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+ $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ;\
+ fi; \
+ done
+
# uudecode libwpd snapshot
if [ ! -s $(SOURCE_TREE)/libwpd/download/$(LIBWPD_VER).tar.gz ]; then \
uudecode -o $(SOURCE_TREE)/libwpd/download/$(LIBWPD_VER).tar.gz \
@@ -1164,11 +1186,16 @@
-e
's,Exec=\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^]*\)\?,Exec=/usr/bin/oo\1$(VER),'
\
-e 's,/oooffice ,/ooffice ,' \
-e 's,Icon=.*/\([^/]*\.png\),Icon=\1,' \
+ -e 's,Icon=ooo_\([cwdimt].*\),Icon=ximian-openoffice-\1,' \
-e 's,\.png,,' \
$$I $$I.new ;\
rm $$I; mv $$I.new $$I ;\
done
+ # move Printeradmin into Application;System;
+ perl -pi -e 's/Application;Office/Application;System/' \
+$(MAINPKGDIR)/usr/share/applications/ooo$(BUILDNUM)printeradmin.desktop
+
# insert NoDisplay=true to force the extra dir not being displayed
# on KDE 3.2
echo NoDisplay=true \
@@ -1205,6 +1232,9 @@
mkdir -p debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
install -m644 $(OOO_BUILD)/fonts/opens___.ttf \
debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
+
+ cp $(OOO_BUILD)/desktop/*.png \
+ $(MAINPKGDIR)/usr/share/icons/hicolor/48x48/apps
touch $@
--
To UNSUBSCRIBE, email to [EMAIL
CVS:oo-deb/debian changelog,1.417.2.7,1.417.2.8 rules,1.253.2.1,1.253.2.2
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv15761/debian
Modified Files:
Tag: OPENOFFICE_ORG_1_1_4
changelog rules
Log Message:
- install and make the GNOME/KDE menus use
ximian-openoffice-{calc,writer,draw,impress,math,template,web}
as icons (closes: #294634) and move the oopadmin entry from Office to
System [RE]
Index: changelog
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.417.2.7
retrieving revision 1.417.2.8
diff -u -d -r1.417.2.7 -r1.417.2.8
--- changelog 2 Feb 2005 17:24:59 - 1.417.2.7
+++ changelog 16 Feb 2005 18:23:39 - 1.417.2.8
@@ -23,13 +23,17 @@
- link to README.Debian.gz in /usr/share/doc/openoffice.org (provided
by openoffice.org-debian-files) from -kde and -gtk-gnome (it contains
the info that the fpickers are disabled by default) [RE]
+- install and make the GNOME/KDE menus use
+ ximian-openoffice-{calc,writer,draw,impress,math,template,web}
+ as icons (closes: #294634) and move the oopadmin entry from Office to
+ System [RE]
* debian/ttf-opensymbol.postrm.in:
- use rm -f for trying to remove fonts.cache* (closes: #288515) [RE]
* debian/scripts/vars: update [RE]
* debian/MANIFEST.*: update [RE]
* debian/openoffice.org.install: update [RE]
- -- Rene Engelhard [EMAIL PROTECTED] Wed, 2 Feb 2005 17:33:14 +0100
+ -- Rene Engelhard [EMAIL PROTECTED] Wed, 16 Feb 2005 19:19:18 +0100
openoffice.org (1.1.3-4) unstable; urgency=low
Index: rules
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.253.2.1
retrieving revision 1.253.2.2
diff -u -d -r1.253.2.1 -r1.253.2.2
--- rules 31 Jan 2005 22:28:11 - 1.253.2.1
+++ rules 16 Feb 2005 18:23:39 - 1.253.2.2
@@ -353,7 +353,7 @@
fi
# we do not need them and they make problem with dpkg-source
- rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
+ rm -f $(OOO_BUILD)/www/*.png \
$(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s* \
$(OOO_BUILD)/www/l10n/*.gif \
$(OOO_BUILD)/src/open*bmp $(OOO_BUILD)/src/file-bug-*.bmp
@@ -437,7 +437,19 @@
touch -r $(OOO_BUILD)/fonts/opens___.ttf.uu
$(OOO_BUILD)/fonts/opens___.ttf ;\
fi
rm -f $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/symbols.xls
-
+
+ # uuencode Ximian desktop icons
+ for i in calc draw impress math template web writer; do \
+ if [ -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \
+ uuencode $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \
+ ximian-openoffice-$$i.png \
+$(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+ touch -r $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+ $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ;\
+ fi; \
+ done
+ rm -f $(OOO_BUILD)/desktop/*.png
+
dh_clean
rm -rf $(STAMP_DIR) $(DEBTREEDIR) stlport-home
@@ -583,6 +595,16 @@
touch -r $(OOO_BUILD)/fonts/opens___.ttf
$(OOO_BUILD)/fonts/opens___.ttf.uu ;\
fi
+ # uuencode Ximian desktop icons
+ for i in calc draw impress math template web writer; do \
+ if [ ! -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \
+ uudecode -o $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \
+ $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu ;\
+ touch -r $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+ $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ;\
+ fi; \
+ done
+
# uudecode libwpd snapshot
if [ ! -s $(SOURCE_TREE)/libwpd/download/$(LIBWPD_VER).tar.gz ]; then \
uudecode -o $(SOURCE_TREE)/libwpd/download/$(LIBWPD_VER).tar.gz \
@@ -1164,11 +1186,16 @@
-e
's,Exec=\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^]*\)\?,Exec=/usr/bin/oo\1$(VER),'
\
-e 's,/oooffice ,/ooffice ,' \
-e 's,Icon=.*/\([^/]*\.png\),Icon=\1,' \
+ -e 's,Icon=ooo_\([cwdimt].*\),Icon=ximian-openoffice-\1,' \
-e 's,\.png,,' \
$$I $$I.new ;\
rm $$I; mv $$I.new $$I ;\
done
+ # move Printeradmin into Application;System;
+ perl -pi -e 's/Application;Office/Application;System/' \
+$(MAINPKGDIR)/usr/share/applications/ooo$(BUILDNUM)printeradmin.desktop
+
# insert NoDisplay=true to force the extra dir not being displayed
# on KDE 3.2
echo NoDisplay=true \
@@ -1205,6 +1232,9 @@
mkdir -p debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
install -m644 $(OOO_BUILD)/fonts/opens___.ttf \
Processed: pending
Processing commands for [EMAIL PROTECTED]: tag 289013 + pending Bug#289013: openoffice.org: cannot show hidden rows anymore Tags were: confirmed Tags added: pending thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
CVS:oo-deb/debian changelog,1.422,1.423
Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv4258 Modified Files: changelog Log Message: mention sc-filter-hide-filteredrows.diff and close bug Index: changelog === RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v retrieving revision 1.422 retrieving revision 1.423 diff -u -d -r1.422 -r1.423 --- changelog 16 Feb 2005 18:23:16 - 1.422 +++ changelog 16 Feb 2005 22:38:36 - 1.423 @@ -3,6 +3,9 @@ * New patches: - libgl-soname.diff: dlopen() libGL.so.1, not libGL.so [RE] - dmake43.diff: fix dmake check in configure.in to allow dmake 4.3 [RE] + * Modified patches: +- sc-filter-hide-filteredrows.diff: fix row unhiding in calc + (closes: #289013) [JB] * Removed patches: - sc-paste-insert-rows.diff (closes: #288708) [MM] * debian/control.in: @@ -21,7 +24,7 @@ * debian/ttf-opensymbol.postrm.in: - use rm -f for trying to remove fonts.cache* (closes: #288515) [RE] - -- Rene Engelhard [EMAIL PROTECTED] Wed, 16 Feb 2005 19:09:54 +0100 + -- Rene Engelhard [EMAIL PROTECTED] Wed, 16 Feb 2005 23:29:54 +0100 openoffice.org (1.1.3-4) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Processed: tagging 293551
Processing commands for [EMAIL PROTECTED]: # Automatically generated email from bts, devscripts version 2.8.10 # Fixed in CVS tags 293551 pending Bug#293551: openoffice.org-bin: Depends on gnomelibs. There were no tags set. Tags added: pending End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
CVS:oo-deb/debian changelog,1.423,1.424 rules,1.255,1.256
Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv6376 Modified Files: changelog rules Log Message: * Mention psprint-nocups-updates and font-substitution-fixups * Merge Ubuntu changes (gnomevfs build fix) Index: changelog === RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v retrieving revision 1.423 retrieving revision 1.424 diff -u -d -r1.423 -r1.424 --- changelog 16 Feb 2005 22:38:36 - 1.423 +++ changelog 16 Feb 2005 22:48:36 - 1.424 @@ -1,8 +1,13 @@ -openoffice.org (1.1.3-4.5pre) unstable; urgency=low +openoffice.org (1.1.3-4.5pre) unstable; urgency=high * New patches: +- psprint-nocupsupdates: Don't try to re-enumerate CUPS queues - the 1.1 + codebase was not ready for this and it causes strange behaviour in some + cases (closes #289715, #284579) [CH] - libgl-soname.diff: dlopen() libGL.so.1, not libGL.so [RE] - dmake43.diff: fix dmake check in configure.in to allow dmake 4.3 [RE] +- font-substitution-fixups: Fix substitution problems, like preferring + fonts without language coverage [DW] * Modified patches: - sc-filter-hide-filteredrows.diff: fix row unhiding in calc (closes: #289013) [JB] @@ -23,8 +28,11 @@ System [RE] * debian/ttf-opensymbol.postrm.in: - use rm -f for trying to remove fonts.cache* (closes: #288515) [RE] + * Ubuntu changes merge: [CH] +- build gnomevfs library sanely + * ooo-build: Branched at debian-1-1-3 for Sarge release [CH] - -- Rene Engelhard [EMAIL PROTECTED] Wed, 16 Feb 2005 23:29:54 +0100 + -- Chris Halls [EMAIL PROTECTED] Wed, 16 Feb 2005 22:44:37 + openoffice.org (1.1.3-4) unstable; urgency=low Index: rules === RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v retrieving revision 1.255 retrieving revision 1.256 diff -u -d -r1.255 -r1.256 --- rules 16 Feb 2005 18:23:16 - 1.255 +++ rules 16 Feb 2005 22:48:36 - 1.256 @@ -105,6 +105,7 @@ USE_JAVA=y JDK_HOME:=$(shell echo $(DEB_BUILD_OPTIONS), | sed -n 's/^.*jdkhome=\([^,]*\),.*/\1/p') SUNJDK_VER:=$(shell $(JDK_HOME)/bin/java -version 21 | sed -n '1s/java version \([0-9._]*\)/\1/p') + # Non-1.4 Jdks need extra jar files ifneq (1.4,$(findstring 1.4,$(SUNJDK_VER))) BUILDCMD+= XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xt.jar:/usr/share/java/xp.jar @@ -172,14 +173,20 @@ IGNORE_MANIFEST_CHANGES=1 export IGNORE_MANIFEST_CHANGES MOZILLA=n - CONFIGURE_FLAGS+= --disable-symbols --disable-mozilla + CONFIGURE_FLAGS+= --disable-symbols else # gcc 3.0 didn't understand -g1, but newer compilers do CONFIGURE_FLAGS+= --enable-symbols=SMALL +endif - ifeq $(MOZILLA) n -CONFIGURE_FLAGS+= --disable-mozilla - endif +ifeq $(DIST) Ubuntu + # Disable mozilla - system moz has a different ABI and interferes + # with build + MOZILLA=n +endif + +ifeq $(MOZILLA) n + CONFIGURE_FLAGS+= --disable-mozilla endif # Auto freetype configuration. If we detect the Woody freetype, we @@ -467,7 +474,7 @@ # Files created in debian directory rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm - rm -rf tools.nongvfs + rm -rf tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro) $(MAKE) -f debian/rules control @@ -495,6 +502,8 @@ build: build-arch build-indep build-arch: $(STAMP_DIR)/instsetoo +build-arch: $(STAMP_DIR)/tools.gnomevfs + build-indep: $(STAMP_DIR)/setupins # All 'important' targets have 2 lines. The one that is run by @@ -624,9 +633,9 @@ build.prepare.artwork: $(STAMP_DIR)/build.prepare.artwork $(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/files.backup $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz.uu $(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/icons.scale +ifneq $(DIST) Ubuntu $(STAMP_DIR)/build.prepare.artwork: debian/openintro_debian.xcf.uu -ifneq $(DIST) Ubuntu # add the splashscreen with the Debian logo uudecode debian/openintro_debian.xcf.uu \ debian/openintro_debian.xcf \ @@ -756,30 +765,7 @@ . $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/instsetoo \ $(BUILDCMD) $(STARTFROM) $(BUILDFLAGS) -- instsetext= $(DMAKEFLAGS) - - ## hack: we need to build tools without that patch for GnomeVFS again - # first, copy the gnomevfs version to .gvfs to backup it... - if [ ! -f solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtk$(BUILDNUM)$(LIBSUFFIX).so.gvfs ] ldd solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so | grep -q gnomevfs; then \ - cp -v \ - solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so \ -
CVS:oo-deb/debian changelog,1.425,1.426
Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv25124 Modified Files: changelog Log Message: missing : Index: changelog === RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v retrieving revision 1.425 retrieving revision 1.426 diff -u -d -r1.425 -r1.426 --- changelog 16 Feb 2005 22:49:27 - 1.425 +++ changelog 16 Feb 2005 22:50:55 - 1.426 @@ -3,7 +3,7 @@ * New patches: - psprint-nocupsupdates: Don't try to re-enumerate CUPS queues - the 1.1 codebase was not ready for this and it causes strange behaviour in some - cases (closes #289715, #284579) [CH] + cases (closes: #289715, #284579) [CH] - libgl-soname.diff: dlopen() libGL.so.1, not libGL.so [RE] - dmake43.diff: fix dmake check in configure.in to allow dmake 4.3 [RE] - font-substitution-fixups: Fix substitution problems, like preferring -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
