./packages/openofficeorg/3.0/experimental r1074: various pdf import fixes, pdf-import -> pdfimport to sync with rules
------------------------------------------------------------
revno: 1074
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2008-05-13 13:20:38 +0200
message:
various pdf import fixes, pdf-import -> pdfimport to sync with rules
renamed:
openoffice.org-pdf-import.postinst.in => openoffice.org-pdfimport.postinst.in
openoffice.org-pdf-import.preinst.in => openoffice.org-pdfimport.preinst.in
openoffice.org-pdf-import.prerm.in => openoffice.org-pdfimport.prerm.in
openoffice.org-pdf-import.script.bug => openoffice.org-pdfimport.script.bug
modified:
control.pdfimport.in
rules
------------------------------------------------------------
revno: 1065.1.1
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2008-05-04 00:29:27 +0200
message:
merge 2.4.0-6
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1065.1.2
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2008-05-04 15:01:41 +0200
message:
merge
modified:
changelog
copyright
rules
------------------------------------------------------------
revno: 1065.1.3
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2008-05-04 15:13:53 +0200
message:
merge
modified:
changelog
copyright
------------------------------------------------------------
revno: 1065.1.4
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2008-05-05 23:29:33 +0200
message:
URE is now one layer of the three-layer office; make -core depend on the URE, remove PACKAGE_URE stuff
modified:
control.in
rules
------------------------------------------------------------
revno: 1065.1.5
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2008-05-05 23:30:00 +0200
message:
VER:=3
modified:
rules
------------------------------------------------------------
revno: 1065.1.6
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2008-05-06 00:24:49 +0200
message:
fix changelog
modified:
changelog
=== modified file 'control.pdfimport.in'
--- a/control.pdfimport.in 2008-04-30 06:32:57 +0000
+++ b/control.pdfimport.in 2008-05-13 11:20:38 +0000
@@ -1,4 +1,4 @@
-Package: openoffice.orgVER-pdf-import
+Package: openoffice.orgVER-pdfimport
Section: misc
Priority: extra
Architecture: %OOO_ARCHS%
=== renamed file 'openoffice.org-pdf-import.postinst.in' => 'openoffice.org-pdfimport.postinst.in'
=== renamed file 'openoffice.org-pdf-import.preinst.in' => 'openoffice.org-pdfimport.preinst.in'
=== renamed file 'openoffice.org-pdf-import.prerm.in' => 'openoffice.org-pdfimport.prerm.in'
=== renamed file 'openoffice.org-pdf-import.script.bug' => 'openoffice.org-pdfimport.script.bug'
=== modified file 'rules'
--- a/rules 2008-05-11 23:30:54 +0000
+++ b/rules 2008-05-13 11:20:38 +0000
@@ -2298,7 +2298,7 @@
ifeq "$(ENABLE_PDFIMPORT)" "y"
rm -rf $(PKGDIR)-pdfimport
install -D -m644 $(SOURCE_TREE)/filter/pdfimport/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/pdfimport.oxt \
- $(PKGDIR)-wiki-publisher/$(OODIR)/share/extension/install/pdfimport.oxt
+ $(PKGDIR)-pdfimport/$(OODIR)/share/extension/install/pdfimport.oxt
endif
for i in $(ARCH_DEP_PACKAGES); do \
install -D -m644 debian/presubj \
@@ -2867,7 +2867,7 @@
dpkg-shlibdeps -O \
$(SOURCE_TREE)/xpdf/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/xpdfimport \
$(SOURCE_TREE)/filter/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/pdfimport.uno.so
- > debian/openoffice.org$(VER)-presenter-screen.substvars
+ > debian/openoffice.org$(VER)-pdfimport.substvars
endif
@@ -2883,6 +2883,7 @@
-Nopenoffice.org$(VER)-presentation-minimizer \
-Nopenoffice.org$(VER)-presenter-screen \
-Nopenoffice.org$(VER)-wiki-publisher \
+ -Nopenoffice.org$(VER)-pdfimport \
-Nopenoffice.org$(VER)-sdbc-postgresql -- \
-V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2` \
-V'base-version=$(BASE_VERSION)' \
@@ -2925,7 +2926,7 @@
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
dh_gencontrol -popenoffice.org$(VER)-pdfimport -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/filter/pdfimport/config/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')++OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v$(shell grep "<version" $(SOURCE_TREE)/filter/pdfimport/config/description.xml | perl -pi -e 's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')++OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
dh_gencontrol -popenoffice.org$(VER)-presentation-minimizer -- \
Reply to: