please unblock openoffice.org 1:2.4.1-8
Hi,
Rene Engelhard wrote:
> as talked about (and tenitatively approved already) on Debconf, here's the
> unblock request for openoffice.org 1:2.4.1-7. I needed to make a few more
> fixes for the building (lintian, version of the binary package).
>
> The ChangeLog* files removed is just svn conflict copies which errorneously
> went into 2.4.1-6.
>
> Diff attached.
>
> Please unblock it so it can go in when all archs have been built and uploaded
> (in around 1 week if nothing goes wrong)
I needed to fix #496361, too, so please unblock 1:2.4.1-8. I also added
the Homepage: http://www.go-oo.org fix which I forgot to merge back in
-7.
The diff from 1:2.4.1-7 to 1:2.4.1-8 is attached.
Regards,
Rene
diff -u openoffice.org-2.4.1/debian/changelog openoffice.org-2.4.1/debian/changelog
--- openoffice.org-2.4.1/debian/changelog
+++ openoffice.org-2.4.1/debian/changelog
@@ -1,3 +1,13 @@
+openoffice.org (1:2.4.1-8) unstable; urgency=high
+
+ * debian/control.in:
+ - Homepage: http://www.go-oo.org, thanks Renato Yamane
+ * debian/rules:
+ - remove leftover debugging echos to /tmp/log.obr.$$ in senddoc
+ (closes: #496361)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 25 Aug 2008 12:57:33 +0200
+
openoffice.org (1:2.4.1-7) unstable; urgency=medium
* ooo-build:
diff -u openoffice.org-2.4.1/debian/control openoffice.org-2.4.1/debian/control
--- openoffice.org-2.4.1/debian/control
+++ openoffice.org-2.4.1/debian/control
@@ -9,7 +9,7 @@
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4.1/unstable
Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/branches/debian-2-4-1
-Homepage: http://www.openoffice.org
+Homepage: http://www.go-oo.org
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
diff -u openoffice.org-2.4.1/debian/rules openoffice.org-2.4.1/debian/rules
--- openoffice.org-2.4.1/debian/rules
+++ openoffice.org-2.4.1/debian/rules
@@ -2767,6 +2767,11 @@
done
endif
+ # remove leftover debugging echos
+ TMP=`mktemp -q`; \
+ grep -v obr $(PKGDIR)-common/$(OODIR)/senddoc > $$TMP && \
+ mv $$TMP $(PKGDIR)-common/$(OODIR)/senddoc
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
diff -u openoffice.org-2.4.1/debian/control.in openoffice.org-2.4.1/debian/control.in
--- openoffice.org-2.4.1/debian/control.in
+++ openoffice.org-2.4.1/debian/control.in
@@ -54,7 +54,7 @@
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4.1/unstable
Vcs-Svn: %OOO_BUILD_SVN%
-Homepage: http://www.openoffice.org
+Homepage: http://www.go-oo.org
Package: openoffice.orgVER
Architecture: %OOO_ARCHS%
Reply to: