------------------------------------------------------------
revno: 1287
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-10-14 14:32:38 +0200
message:
merge
modified:
README.Debian-source
changelog
copyright
rules
------------------------------------------------------------
revno: 1022.1.180
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-10-14 14:26:28 +0200
message:
fix -qa-tools install, fix copyright
modified:
README.Debian-source
changelog
rules
------------------------------------------------------------
revno: 1022.1.181
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-10-14 14:28:40 +0200
message:
README.Debian-source, too
modified:
changelog
=== modified file 'README.Debian-source'
--- a/README.Debian-source 2007-12-04 19:35:24 +0000
+++ b/README.Debian-source 2008-10-14 12:32:38 +0000
@@ -1,16 +1,8 @@
The .orig.tar.gz consists of the 5 seperate tarballs from
-http://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/2.3.1rc1 (the stable/2.3.1
ones are exactly the same) of which some non-free stuff has been removed:
-http://download.go-oo.org/OOG680
+http://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/3.0.0rc4 (the stable/3.0.0
ones are exactly the same) of which some non-free stuff has been removed:
* core:
- - external/jars/*: Sun proprietary, binary-only jars
- - odk/pack/copying/*.pdf: non-free doc (XML Spec)
- psprint_config/configuration/ppds/.PS (except SGEN*.PS):
PPDs where "all rights [are] reserved"
- - jfreereport/download/*: The "sources" contain binary-only jars used in
- the build and even ending up in the extension. Removed.
* system:
- dictionaries/{da_DK,en_GB,en_US,nl_NL,ru_RU}/hyph_*.dic:
hyphenation patterns violating licenses/having questionable license
- * sdk_oo:
- - sdk_oo/pack/copying/Dev*: Developers Guide (non-free)
-
=== modified file 'changelog'
--- a/changelog 2008-10-14 11:57:45 +0000
+++ b/changelog 2008-10-14 12:32:38 +0000
@@ -1,3 +1,9 @@
+openoffice.org (1:3.0.0-2.3pre) experimental; urgency=low
+
+ * debian/copyright, debian/READMe.Debian-source: fix
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 14 Oct 2008 14:32:16 +0200
+
openoffice.org (1:3.0.0-2) experimental; urgency=low
* ooo-build:
=== modified file 'copyright'
--- a/copyright 2008-07-16 23:32:03 +0000
+++ b/copyright 2008-10-14 12:32:38 +0000
@@ -1,5 +1,5 @@
Package: OpenOffice.org
-Obtained from: http://download.go-oo.org/DEV300
+Obtained from: http://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/3.0.0rc4
Upstream authors: The OpenOffice.org and go-oo.org teams
Debian package authors: Peter Novodvorsky, Jan Palic, Chris Halls,
Rene Engelhard
=== modified file 'rules'
--- a/rules 2008-10-14 11:57:45 +0000
+++ b/rules 2008-10-14 12:32:38 +0000
@@ -2131,7 +2131,7 @@
mkdir -p -m755 $(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
cp $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/class/OOoRunnerLight.jar \
$(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
- ln -s /usr/share/java/$(OODIRNAME)/OOoRunnerLight.jar \
+ ln -sf /usr/share/java/$(OODIRNAME)/OOoRunnerLight.jar \
$(PKGDIR)-qa-tools/$(OODIR)/program/classes/OOoRunnerLight.jar
endif
