Bug#247781: FTBFS: Includes .orig in zip file
Package: openoffice.org
Version: 1.1.1-2
Severity: serious
Tags: patch
This package fails to build from source:
...
# confirm that the installed file list has not changed
if [ -e debian/MANIFEST.i386 ]; then \
if ! cmp -s debian/MANIFEST.i386 debian/MANIFEST.i386.new; then \
diff -U0 debian/MANIFEST.i386 debian/MANIFEST.i386.new; \
if [ -n "$IGNORE_MANIFEST_CHANGES" ]; then \
echo 'MANIFEST check failed; ignoring problem because \$IGNORE_MANIFEST_CHANGES set' >&2; \
echo 'Please ensure that the package maintainer has an up-to-date version of the' >&2; \
echo 'MANIFEST.i386 file.' >&2; \
else \
echo 'MANIFEST check failed; please see debian/README' >&2; \
exit 1; \
fi; \
fi; \
fi;
--- debian/MANIFEST.i386 2004-05-02 18:09:08.000000000 +0000
+++ debian/MANIFEST.i386.new 2004-05-04 04:56:10.000000000 +0000
@@ -3863,0 +3864 @@
+usr/lib/openoffice/share/gallery/htmltheme.orig
MANIFEST check failed; please see debian/README
make: *** [debian/stampdir/manifest] Error 1
pbuilder: Failed autobuilding of package
...
This file can be excluded from the zip file by passing "-x *.orig"
to zip, as done by the attached patch.
--
Matt Kraai kraai@ftbfs.org http://ftbfs.org/
diff -ru openoffice.org-1.1.1-old/extras/source/gallery/makefile.mk openoffice.org-1.1.1/extras/source/gallery/makefile.mk
--- openoffice.org-1.1.1-old/extras/source/gallery/makefile.mk 2000-09-19 02:03:08.000000000 -0700
+++ openoffice.org-1.1.1/extras/source/gallery/makefile.mk 2004-05-04 08:18:14.000000000 -0700
@@ -74,7 +74,7 @@
ZIP1TARGET = $(GALLERY_ROOT_TARGET)
-ZIP1LIST = * -x makefile.*
+ZIP1LIST = * -x makefile.* -x *.orig
Reply to: