Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv8662
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog control control.in rules
Log Message:
- remove Linux/ARM hacks, the path now is going into ooo-build proper
- reenable arm for all packages except -java (FIXME: is there a JDK1.4 for ARM?)
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.19
retrieving revision 1.231.2.20
diff -u -d -r1.231.2.19 -r1.231.2.20
--- rules 31 Oct 2004 16:32:57 -0000 1.231.2.19
+++ rules 4 Nov 2004 17:56:10 -0000 1.231.2.20
@@ -473,13 +473,6 @@
chmod 755 $(OOO_BUILD)/patches/apply.pl
$(OOO_BUILD)/patches/apply.pl
$(CURDIR)/$(OOO_BUILD)/patches/$(PATCH_DIR) $(CURDIR)/$(BUILD_DIR)
--distro=$(PATCHSET) -f
-ifeq "$(ARCH)-linux" "arm-linux"
- if [ ! -f bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s ]; then \
- patch -p0 --dry-run < debian/patches/linux-arm-support.diff && \
- patch -p0 < debian/patches/linux-arm-support.diff; \
- fi
-endif
-
mkdir -p $(STAMP_DIR)
touch $@
@@ -490,13 +483,6 @@
chmod 755 $(OOO_BUILD)/patches/apply.pl
$(OOO_BUILD)/patches/apply.pl
$(CURDIR)/$(OOO_BUILD)/patches/$(PATCH_DIR) $(CURDIR)/$(BUILD_DIR)
--distro=$(PATCHSET) -f -R
rm -f $(STAMP_DIR)/patch.apply
-
-ifeq "$(ARCH)-linux" "arm-linux"
- if [ -f bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s ]; then \
- patch -R -p0 --dry-run < debian/patches/linux-arm-support.diff \
- && patch -R -p0 < debian/patches/linux-arm-support.diff; \
- fi
-endif
mkdir -p $(STAMP_DIR)
touch $@
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.153.2.17
retrieving revision 1.153.2.18
diff -u -d -r1.153.2.17 -r1.153.2.18
--- control.in 1 Nov 2004 18:08:52 -0000 1.153.2.17
+++ control.in 4 Nov 2004 17:56:10 -0000 1.153.2.18
@@ -39,7 +39,7 @@
at http://openoffice.debian.net or join us on IRC #debian-oo.
Package: openoffice.org-bin
-Architecture: i386 powerpc s390 sparc
+Architecture: i386 powerpc s390 sparc arm
Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.2+1.1.3)
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
@@ -90,7 +90,7 @@
bullets (needed for bullets in OOo) and non-latin characters.
Package: openoffice.org-kde
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Depends: ${shlibs:Depends}, openoffice.org-bin (>= 1.1.2+1.1.3)
Section: kde
Enhances: openoffice.org
@@ -102,7 +102,7 @@
KDE/Qt and a KDEish File Picker when running under KDE.
Package: openoffice.org-gtk-gnome
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Depends: ${shlibs:Depends}, openoffice.org-bin (>= 1.1.2+1.1.3)
Suggests: openoffice.org-gnomevfs
Section: gnome
@@ -115,7 +115,7 @@
Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME.
Package: openoffice.org-gnomevfs
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Section: gnome
Depends: ${shlibs:Depends}, openoffice.org-bin
Enhances: openoffice.org-gtk-gnome, openoffice.org
@@ -126,7 +126,7 @@
This package enables OpenOffice.org to access files over GNOME VFS.
Package: openoffice.org-dev
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Section: devel
Depends: ${shlibs:Depends}, openoffice.org-bin (= ${Source-Version}),
${dev-stl-depends}, openoffice.org-debian-files (>> 1.1.2-1.1.3)
Recommends: dmake
@@ -164,7 +164,7 @@
/usr/lib/openoffice/program/jvmconfig after installation.
Package: openoffice.org-evolution
-Architecture: i386 powerpc s390 sparc
+Architecture: i386 powerpc s390 sparc arm
Section: gnome
Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.2+1.1.3)
Recommends: evolution (>> 2.0)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.33
retrieving revision 1.362.2.34
diff -u -d -r1.362.2.33 -r1.362.2.34
--- changelog 1 Nov 2004 18:08:52 -0000 1.362.2.33
+++ changelog 4 Nov 2004 17:56:10 -0000 1.362.2.34
@@ -3,8 +3,13 @@
* debian/control.in:
- evoluton is in Section: gnome so put openoffice.org-evolution there, too
instead of editors [RE]
+ - add arm to Architecture:'s except -java (FIXME: does arm have a
+ JDK 1.4?) (closes: #260435) [RE]
+ * debian/rules:
+ - remove patch apply conditionals on arm, now in ooo-build proper [RE]
+ * debian/patches/linux-arm-support.diff: remove, now in ooo-build proper [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 1 Nov 2004 20:03:44 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 4 Nov 2004 18:49:30 +0100
openoffice.org (1.1.3-1) experimental; urgency=low
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.186.2.19
retrieving revision 1.186.2.20
diff -u -d -r1.186.2.19 -r1.186.2.20
--- control 1 Nov 2004 18:08:52 -0000 1.186.2.19
+++ control 4 Nov 2004 17:56:10 -0000 1.186.2.20
@@ -39,7 +39,7 @@
at http://openoffice.debian.net or join us on IRC #debian-oo.
Package: openoffice.org-bin
-Architecture: i386 powerpc s390 sparc
+Architecture: i386 powerpc s390 sparc arm
Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.2+1.1.3)
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
@@ -90,7 +90,7 @@
bullets (needed for bullets in OOo) and non-latin characters.
Package: openoffice.org-kde
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Depends: ${shlibs:Depends}, openoffice.org-bin (>= 1.1.2+1.1.3)
Section: kde
Enhances: openoffice.org
@@ -102,7 +102,7 @@
KDE/Qt and a KDEish File Picker when running under KDE.
Package: openoffice.org-gtk-gnome
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Depends: ${shlibs:Depends}, openoffice.org-bin (>= 1.1.2+1.1.3)
Suggests: openoffice.org-gnomevfs
Section: gnome
@@ -115,7 +115,7 @@
Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME.
Package: openoffice.org-gnomevfs
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Section: gnome
Depends: ${shlibs:Depends}, openoffice.org-bin
Enhances: openoffice.org-gtk-gnome, openoffice.org
@@ -126,7 +126,7 @@
This package enables OpenOffice.org to access files over GNOME VFS.
Package: openoffice.org-dev
-Architecture: i386 powerpc sparc s390
+Architecture: i386 powerpc sparc s390 arm
Section: devel
Depends: ${shlibs:Depends}, openoffice.org-bin (= ${Source-Version}),
${dev-stl-depends}, openoffice.org-debian-files (>> 1.1.2-1.1.3)
Recommends: dmake
@@ -164,7 +164,7 @@
/usr/lib/openoffice/program/jvmconfig after installation.
Package: openoffice.org-evolution
-Architecture: i386 powerpc s390 sparc
+Architecture: i386 powerpc s390 sparc arm
Section: gnome
Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.2+1.1.3)
Recommends: evolution (>> 2.0)
