Update of /cvs/debian-openoffice/oo-debian-files/debian
In directory gluck:/tmp/cvs-serv12576/debian
Modified Files:
Tag: OPENOFFICE_ORG680
changelog control dirs postinst rules
Log Message:
Updated packaging for oo2
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/rules,v
retrieving revision 1.27
retrieving revision 1.27.4.1
diff -u -d -r1.27 -r1.27.4.1
--- rules 23 Dec 2004 12:23:46 -0000 1.27
+++ rules 1 Apr 2005 10:08:37 -0000 1.27.4.1
@@ -5,7 +5,7 @@
HOOKDIR=$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/share/openoffice.org$(VER)-debian-files/hooks
# Version suffix - blank for stable packages
-VER=
+VER=2
configure: configure-stamp
configure-stamp:
@@ -33,25 +33,25 @@
dh_installdirs
# install wrapper scripts
- install -m755 bin/openoffice\
-
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/openoffice$(VER)
- install -m755 bin/regcomp\
-
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/regcomp$(VER)
- install -m755 bin/spadmin \
-
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/oopadmin$(VER)
+ #install -m755 bin/openoffice\
+ #
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/openoffice$(VER)
+ #install -m755 bin/regcomp\
+ #
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/regcomp$(VER)
+ #install -m755 bin/spadmin \
+ #
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/oopadmin$(VER)
- if [ ! -d
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/`dpkg-architecture
-qDEB_HOST_GNU_SYSTEM`/bin ]; then \
- mkdir -p
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/`dpkg-architecture
-qDEB_HOST_GNU_SYSTEM`/bin; \
- fi
- for i in cppumaker idlc idlcpp javamaker rdbmaker regmerge \
- regview uno xml2cmp; do \
- install -m755 bin/sdk-wrapper \
-
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/linux/bin/$$i;
\
- done
+ #if [ ! -d
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/`dpkg-architecture
-qDEB_HOST_GNU_SYSTEM`/bin ]; then \
+ # mkdir -p
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/`dpkg-architecture
-qDEB_HOST_GNU_SYSTEM`/bin; \
+ #fi
+ #for i in cppumaker idlc idlcpp javamaker rdbmaker regmerge \
+ # regview uno xml2cmp; do \
+ # install -m755 bin/sdk-wrapper \
+ #
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/linux/bin/$$i;
\
+ #done
# install prelink script
install -m755 bin/oooprelink \
- $(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/sbin
+
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/sbin/oooprelink1.9
# install hook script
install -m755 share/install-hook \
@@ -83,6 +83,11 @@
install -m755 share/dictionaries $(HOOKDIR)/$$script.d/; \
done
+ # no longer needed for m72 - install hooks for configimport --spool call
+ #for script in postinst postrm prerm; do \
+ # install -m755 share/configimport $(HOOKDIR)/$$script.d/; \
+ #done
+
# install lintian overrides
install -m644 debian/openoffice.org-debian-files.lintian-overrides \
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/share/lintian/overrides/openoffice.org$(VER)-debian-files
@@ -93,9 +98,9 @@
dh_testdir
dh_testroot
dh_installdocs
- dh_installmenu
- dh_installmime
- dh_installman
+ #dh_installmenu
+ #dh_installmime
+ #dh_installman
dh_installchangelogs
dh_link
dh_compress
Index: postinst
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/postinst,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -d -r1.4 -r1.4.12.1
--- postinst 23 Sep 2003 13:41:24 -0000 1.4
+++ postinst 1 Apr 2005 10:08:37 -0000 1.4.12.1
@@ -3,8 +3,8 @@
set -e
# Call hook scripts
-VER=
-/usr/share/openoffice.org-debian-files${VER}/install-hook postinst
openoffice.org-debian-files "$@"
+VER=2
+/usr/share/openoffice.org${VER}-debian-files/install-hook postinst
openoffice.org-debian-files "$@"
#DEBHELPER#
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/changelog,v
retrieving revision 1.115
retrieving revision 1.115.2.1
diff -u -d -r1.115 -r1.115.2.1
--- changelog 9 Jan 2005 21:13:02 -0000 1.115
+++ changelog 1 Apr 2005 10:08:37 -0000 1.115.2.1
@@ -1,3 +1,16 @@
+openoffice.org2-debian-files (1.9.72-0pre) experimental; urgency=low
+
+ * New upstream milestone
+ * Remove configimport hook, no longer needed
+
+ -- Chris Halls <[EMAIL PROTECTED]> Fri, 21 Jan 2005 23:11:04 +0000
+
+openoffice.org2-debian-files (1.9.64-0pre) experimental; urgency=low
+
+ * New packaging for 2.0 series
+
+ -- Chris Halls <[EMAIL PROTECTED]> Wed, 12 Jan 2005 23:34:07 +0000
+
openoffice.org-debian-files (1.1.3-5+0.1pre) unstable; urgency=low
* update dictionary, thesauri and help section in README.Debian
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/control,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -d -r1.29 -r1.29.2.1
--- control 23 Dec 2004 12:23:46 -0000 1.29
+++ control 1 Apr 2005 10:08:37 -0000 1.29.2.1
@@ -1,17 +1,14 @@
-Source: openoffice.org-debian-files
+Source: openoffice.org2-debian-files
Section: editors
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
-Uploaders: Rene Engelhard <[EMAIL PROTECTED]>, Chris Halls <[EMAIL
PROTECTED]>, Jan-Hendrik Palic <[EMAIL PROTECTED]>
+Uploaders: Rene Engelhard <[EMAIL PROTECTED]>, Chris Halls <[EMAIL PROTECTED]>
Build-Depends-Indep: debhelper (>> 4.0.0)
Standards-Version: 3.6.1
-Package: openoffice.org-debian-files
+Package: openoffice.org2-debian-files
Architecture: all
-Conflicts: openoffice.org1.1-debian-files, openoffice.org (<= 1.0.1-5)
-Replaces: openoffice.org1.1-debian-files
-Provides: openoffice.org1.1-debian-files
-Depends: openoffice.org (>> 1.1.2+1.1.3), debianutils (>= 1.16),
openoffice.org-bin (>> 1.1.2+1.1.3)
+Depends: openoffice.org2-core (>> 1.9.64), debianutils (>= 1.16)
Description: Debian specific parts of OpenOffice.org
This is part of the packaging of OpenOffice.org for Debian.
.
Index: dirs
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/dirs,v
retrieving revision 1.10
retrieving revision 1.10.12.1
diff -u -d -r1.10 -r1.10.12.1
--- dirs 30 Aug 2003 19:45:31 -0000 1.10
+++ dirs 1 Apr 2005 10:08:37 -0000 1.10.12.1
@@ -1,10 +1,10 @@
usr/bin
usr/sbin
-usr/share/doc/openoffice.org
+usr/share/doc/openoffice.org2
etc/openoffice
usr/share/lintian/overrides
-usr/share/openoffice.org-debian-files/hooks
-usr/share/openoffice.org-debian-files/hooks/preinst.d
-usr/share/openoffice.org-debian-files/hooks/prerm.d
-usr/share/openoffice.org-debian-files/hooks/postinst.d
-usr/share/openoffice.org-debian-files/hooks/postrm.d
+usr/share/openoffice.org2-debian-files/hooks
+usr/share/openoffice.org2-debian-files/hooks/preinst.d
+usr/share/openoffice.org2-debian-files/hooks/prerm.d
+usr/share/openoffice.org2-debian-files/hooks/postinst.d
+usr/share/openoffice.org2-debian-files/hooks/postrm.d
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
