------------------------------------------------------------
revno: 836
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2007-08-08 13:21:18 +0200
message:
m225
renamed:
openoffice.org-reportdesigner.overrides.lintian =>
openoffice.org-report-builder.overrides.lintian
openoffice.org-reportdesigner.postinst.in =>
openoffice.org-report-builder.postinst.in
openoffice.org-reportdesigner.preinst.in =>
openoffice.org-report-builder.preinst.in
openoffice.org-reportdesigner.prerm.in =>
openoffice.org-report-builder.prerm.in
modified:
changelog
control
control.in
rules
openoffice.org-report-builder.overrides.lintian
openoffice.org-report-builder.postinst.in
openoffice.org-report-builder.preinst.in
openoffice.org-report-builder.prerm.in
=== renamed file 'openoffice.org-reportdesigner.overrides.lintian' =>
'openoffice.org-report-builder.overrides.lintian'
--- a/openoffice.org-reportdesigner.overrides.lintian 2007-08-02 11:37:44
+0000
+++ b/openoffice.org-report-builder.overrides.lintian 2007-08-08 11:21:18
+0000
@@ -1,1 +1,1 @@
-openoffice.org-reportdesigner: binary-or-shlib-defines-rpath
+openoffice.org-report-builder: binary-or-shlib-defines-rpath
=== renamed file 'openoffice.org-reportdesigner.postinst.in' =>
'openoffice.org-report-builder.postinst.in'
--- a/openoffice.org-reportdesigner.postinst.in 2007-07-28 11:00:35 +0000
+++ b/openoffice.org-report-builder.postinst.in 2007-08-08 11:21:18 +0000
@@ -2,14 +2,14 @@
set -e
-THIS_PACKAGE=openoffice.org-reportdesigner
+THIS_PACKAGE=openoffice.org-report-builder
THIS_SCRIPT=postinst
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
/usr/lib/openoffice/program/unopkg add --shared \
- /usr/lib/openoffice/share/extension/install/reportdesign.oxt
+
/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt
fi
#DEBHELPER#
=== renamed file 'openoffice.org-reportdesigner.preinst.in' =>
'openoffice.org-report-builder.preinst.in'
--- a/openoffice.org-reportdesigner.preinst.in 2007-07-28 11:00:35 +0000
+++ b/openoffice.org-report-builder.preinst.in 2007-08-08 11:21:18 +0000
@@ -2,9 +2,9 @@
set -e
-# preinst script for openoffice.org-sdbc-reportdesigner
+# preinst script for openoffice.org-report-builder
-THIS_PACKAGE=openoffice.org-reportdesigner
+THIS_PACKAGE=openoffice.org-report-builder
THIS_SCRIPT=preinst
#INCLUDE_SHELL_LIB#
=== renamed file 'openoffice.org-reportdesigner.prerm.in' =>
'openoffice.org-report-builder.prerm.in'
--- a/openoffice.org-reportdesigner.prerm.in 2007-07-28 11:00:35 +0000
+++ b/openoffice.org-report-builder.prerm.in 2007-08-08 11:21:18 +0000
@@ -2,9 +2,9 @@
set -e
-# preinst script for openoffice.org-sdbc-reportdesigner
+# preinst script for openoffice.org-report-builder
-THIS_PACKAGE=openoffice.org-reportdesigner
+THIS_PACKAGE=openoffice.org-report-builder
THIS_SCRIPT=prerm
#INCLUDE_SHELL_LIB#
=== modified file 'changelog'
--- a/changelog 2007-08-07 22:16:52 +0000
+++ b/changelog 2007-08-08 11:21:18 +0000
@@ -1,7 +1,8 @@
-openoffice.org (2.3.0~src680m224-1.2pre) experimental; urgency=low
+openoffice.org (2.3.0~src680m225-0.1pre) experimental; urgency=low
+ * new upstream snapshot (SRC680_m225)
* ooo-build:
- - update (r10010)
+ - update (r10022)
* debian/control.in:
- build-conflict against gjdoc (= 0.7.8-2) [RE]
* debian/rules:
@@ -11,6 +12,8 @@
- enable system-libwpg on sid [RE]
(it's on p.d.o/~rene/libwpg while in NEW)
- fix PRUNE_OOOBUILD conditional [RE]
+ - remove removal of the Sun logo from the BrOffice.org splashs again,
+ upstream now also has nologo versions for them [RE]
* debian/*:
- remove Ubuntu conditionals added in -1 again, it makes
the rules for Debian even harder to read/understand than
@@ -20,8 +23,10 @@
* debian/rules, debian/overrides.lintian:
- fix or override (package depends on package containing the file)
lintians new desktop warnings [RE]
+ * debian/rules, debian/control.in, debian/openoffice.org-report*:
+ component got renamed to sun-report-builder. sigh. adapt [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 7 Aug 2007 12:10:29 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 8 Aug 2007 00:21:30 +0200
openoffice.org (2.3.0~src680m224-1) experimental; urgency=high
=== modified file 'control'
--- a/control 2007-08-07 10:30:53 +0000
+++ b/control 2007-08-08 11:21:18 +0000
@@ -468,16 +468,19 @@
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
-Package: openoffice.org-reportdesigner
+Package: openoffice.org-report-builder
Section: misc
Priority: optional
Architecture: i386 powerpc sparc amd64 ppc64
-Depends: ${shlibs:Depends}, openoffice.org-base (>= 2.3.0~src680m220)
-Description: OpenOffice.org Report Designer extension
+Depends: ${shlibs:Depends}, openoffice.org-base (>= 2.3.0~src680m225)
+Conflicts: openoffice.org-reportdesigner
+Replaces: openoffice.org-reportdesigner
+Provides: openoffice.org-reportdesigner
+Description: OpenOffice.org Report Builder extension
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains a report design extension.
+ This package contains the report builder extension.
Package: openoffice.org-l10n-af
Architecture: all
=== modified file 'control.in'
--- a/control.in 2007-08-06 22:43:37 +0000
+++ b/control.in 2007-08-08 11:21:18 +0000
@@ -711,14 +711,17 @@
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
-Package: openoffice.orgVER-reportdesigner
+Package: openoffice.orgVER-report-builder
Section: misc
Priority: optional
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-base (>= 2.3.0~src680m220)
-Description: OpenOffice.org Report Designer extension
+Depends: ${shlibs:Depends}, openoffice.orgVER-base (>= 2.3.0~src680m225)
+Conflicts: openoffice.org-reportdesigner
+Replaces: openoffice.org-reportdesigner
+Provides: openoffice.org-reportdesigner
+Description: OpenOffice.org Report Builder extension
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains a report design extension.
+ This package contains the report builder extension.
=== modified file 'rules'
--- a/rules 2007-08-07 22:18:52 +0000
+++ b/rules 2007-08-08 11:21:18 +0000
@@ -1815,7 +1815,7 @@
#rm -r $(PKGDIR)-base
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
- perl -pi -e 's/Application;//; s/X-Red-Hat-Base//;
s/X-SuSE-Core-Office//; s/X-MandrivaLinux-Office-Wordprocessors//'
$(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
+ perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//;
s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-Office-Wordprocessors;//;
X-MandrivaLinux-Office-Spreadsheets;//;'
$(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
done
else
# menu files from ooo-build/desktop
@@ -2055,18 +2055,18 @@
install -D -m644 $(SOURCE_TREE)/scsolver/ChangeLog \
$(PKGDIR)-calc/usr/share/doc/openoffice.org$(VER)-calc/changelog.scsolver
- # move rpt stuff into -reportdesigner
- rm -rf $(PKGDIR)-reportdesigner
- mkdir -p $(PKGDIR)-reportdesigner/$(OODIR)/program
+ # move rpt stuff into -report-builder
+ rm -rf $(PKGDIR)-report-builder
+ mkdir -p $(PKGDIR)-report-builder/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
- $(PKGDIR)-reportdesigner/$(OODIR)/program
+ $(PKGDIR)-report-builder/$(OODIR)/program
ifeq "$(ENABLE_JAVA)" "y"
# install this; we need to register this ourselved later in
# the maintainer scripts. This is intended upstream (**rpt* stuff
- # in 2.3 and the actual designer as an extension, without which
+ # in 2.3 and the actual report builde as an extension, without which
# the *rpt* stuff is a no-op.
- install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/reportdesign.oxt \
-
$(PKGDIR)-reportdesigner/$(OODIR)/share/extension/install/reportdesign.oxt
+ install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
+
$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
endif
for i in $(ARCH_DEP_PACKAGES); do \
@@ -2118,15 +2118,12 @@
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
>
debian/broffice.org/usr/share/applications/ooo-template.desktop
if dpkg-parsechangelog | grep urgency | grep -q $(SRCNUM); then \
- gm convert -fill white -draw 'rectangle 0,225,500,500' \
-
$(SOURCE_TREE)/ooo_custom_images/dev_broffice/introabout/intro.bmp \
- debian/broffice.org/$(OODIR)/program/intro.bmp; \
debian/scripts/fix_image_rgb \
- debian/broffice.org/$(OODIR)/program/intro.bmp \
+
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.bmp \
debian/broffice.org/$(OODIR)/program/intro.bmp; \
else \
debian/scripts/fix_image_rgb \
-
$(SOURCE_TREE)/ooo_custom_images/broffice/introabout/intro.bmp \
+
$(SOURCE_TREE)/ooo_custom_images/nologo_broffice/introabout/intro.bmp \
debian/broffice.org/$(OODIR)/program/intro.bmp; \
fi
install -m644
$(SOURCE_TREE)/ooo_custom_images/broffice/introabout/about.bmp \
@@ -2699,7 +2696,7 @@
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
- dh_gencontrol -s -Nopenoffice.org$(VER)-reportdesigner -- \
+ dh_gencontrol -s -Nopenoffice.org$(VER)-report-builder -- \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
@@ -2715,8 +2712,8 @@
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
- dh_gencontrol -popenoffice.org$(VER)-reportdesigner -- \
- -v$(shell grep "<version"
$(SOURCE_TREE)/reportdesign/util/description.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo$(BINARY_VERSION)
+ dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
+ -v$(shell grep "<version"
$(SOURCE_TREE)/reportdesign/util/post.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo$(BINARY_VERSION)
dh_md5sums -s
dh_builddeb -s $(BUILDDEB_OPTIONS)
