------------------------------------------------------------
revno: 1367
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Sat 2008-12-27 00:23:08 +0100
message:
fix startcenter.desktop install (was in wrong target)
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-12-26 20:25:03 +0000
+++ b/changelog 2008-12-26 23:23:08 +0000
@@ -25,7 +25,7 @@
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
- -- Rene Engelhard <[email protected]> Mon, 22 Dec 2008 03:03:41 +0100
+ -- Rene Engelhard <[email protected]> Sat, 27 Dec 2008 00:21:49 +0100
openoffice.org (1:3.0.1~rc1-2.3pre) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-12-26 00:09:24 +0000
+++ b/control 2008-12-26 23:23:08 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64] , gij [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i386 sparc amd64
ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3)
[i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64],
cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc
amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , mono-jit (>=
1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) ,
libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev ,
libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev
, libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , bsh (>=
2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64] , gij [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64
ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1)
[i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] ,
mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>=
4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>=
5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2008-12-26 18:41:00 +0000
+++ b/rules 2008-12-26 23:23:08 +0000
@@ -2146,20 +2146,15 @@
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
- for p in writer calc impress draw math base startcenter; do \
- if [ "$$p" = "startcenter" ]; then d=common; else d=$$p; fi; \
- mkdir -p -m755 $(PKGDIR)-$$d/usr/share/applications ;\
+ for p in writer calc impress draw math base; do \
+ mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
-e
's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME}[0123456789]\+,Icon=ooo,' \
-e 's,Name=$${PRODUCTNAME}
$${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
-e 's/ / /' \
< $$dirname/$$p.desktop \
- > $(PKGDIR)-$$d/usr/share/applications/ooo$(VER)-$$p.desktop
|| exit 1 ;\
+ > $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop
|| exit 1 ;\
done
- # use ooo-gulls; above snippet does ooo-startcenter, which doesn't exist
- perl -pi -e 's/ooo-startcenter\.png/ooo-gulls\.png/'
$(PKGDIR)-common//usr/share/applications/ooo$(VER)-startcenter.desktop
- # remove Sun reference
- perl -pi -e 's/ Supported by Sun Microsystems.//'
$(PKGDIR)-common//usr/share/applications/ooo$(VER)-startcenter.desktop
ifeq "$(BUILD_GTK)" "y"
# qstart.desktop is different to the above. Should be handled by
@@ -2604,6 +2599,22 @@
install -m644 $$f $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$f ||
exit 1 ;\
done && cd ../../.. && rm -rf usr etc
+ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
+ # menu files from sysui
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
+ mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
+ sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
+ -e
's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME}[0123456789]\+-startcenter,Icon=ooo-gulls,'
\
+ -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org
$(VER),' \
+ -e 's/ / /' \
+ < $$dirname/startcenter.desktop \
+ >
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-startcenter.desktop || exit 1
+ # remove Sun reference
+ perl -pi -e 's/ Supported by Sun Microsystems.//'
$(PKGDIR)-common//usr/share/applications/ooo$(VER)-startcenter.desktop
+ # invalid, according to lintian. make it shut up.
+ perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//;
s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-startcenter.desktop
+endif
+
# install .applications, .keys, .mime and openoffice.org.xml for
# shared-mime-info
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
@@ -2967,6 +2978,7 @@
$(PKGDIR)-common/usr/share/icons/hicolor/$$i/mimetypes/application-vnd.openofficeorg.extension.png;
\
done
perl -pi -e
"s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/"
$(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
+ # add proper MimeType
perl -pi -e
's,MimeType=,MimeType=application/vnd.openofficeorg.extension,'
$(PKGDIR)-common/usr/share/applications/ooo-startcenter.desktop
endif
