------------------------------------------------------------
revno: 1118
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-05-30 14:55:35 +0200
message:
use upstreams tarballs; minor description and comment fix
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-05-30 08:59:49 +0000
+++ b/changelog 2008-05-30 12:55:35 +0000
@@ -3,8 +3,10 @@
* OpenOffice.org 2.4.1 rc2 (OOH680_m17)
* ooo-build:
- update (r12720)
+ * debian/control.in:
+ - s/meta package/metapackage/
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 30 May 2008 10:58:25 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 30 May 2008 13:42:13 +0200
openoffice.org (1:2.4.1~rc1-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-05-27 08:18:35 +0000
+++ b/control 2008-05-30 12:55:35 +0000
@@ -71,7 +71,7 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- OpenOffice.org is called BrOffice.org in Brazil and this meta package
+ OpenOffice.org is called BrOffice.org in Brazil and this metapackage
changes an OpenOffice.org installation into a BrOffice.org branded one once
installed.
=== modified file 'control.in'
--- a/control.in 2008-05-23 10:27:03 +0000
+++ b/control.in 2008-05-30 12:55:35 +0000
@@ -150,7 +150,7 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- OpenOffice.org is called BrOffice.org in Brazil and this meta package
+ OpenOffice.org is called BrOffice.org in Brazil and this metapackage
changes an OpenOffice.org installation into a BrOffice.org branded one once
installed.
=== modified file 'rules'
--- a/rules 2008-05-30 08:59:49 +0000
+++ b/rules 2008-05-30 12:55:35 +0000
@@ -62,8 +62,8 @@
# For SRC680 milestones, use only ~mX
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2)
MILESTONE=m17
-TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
-#TAG=$(MWS)_$(MILESTONE)
+#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
+TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-2-4-1
ifeq "" "$(OOO_BUILD_BRANCH)"
OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/trunk
@@ -2818,7 +2818,7 @@
cat debian/shlibs.override.stdlibs >> debian/shlibs.local
endif
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
- # /usr/lib/libgcj-bc.so when specifying -l/usr/lib/$(GCJ_JAWT_DIR)
+ # /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
