./packages/openofficeorg/3.2/unstable r1851: - fix build with 1.0 source format. Add missing uuencode for the extra
------------------------------------------------------------
revno: 1851
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-03-15 01:52:49 +0100
message:
- fix build with 1.0 source format. Add missing uuencode for the extra
"3.0 (quilt)" components. Use "normal" quilt for patching, add build-dep
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-03-13 16:58:41 +0000
+++ b/changelog 2010-03-15 00:52:49 +0000
@@ -13,9 +13,12 @@
handle MYSQLC_STATUS suffix
* debian/patches/branch_directly_to_cpp_vtable_call_on_arm.diff: add
ARM bridges fix from issue 105359
- * debian/rules: re-enable armel
+ * debian/rules:
+ - re-enable armel
+ - fix build with 1.0 source format. Add missing uuencode for the extra
+ "3.0 (quilt)" components. Use "normal" quilt for patching, add build-dep
- -- Rene Engelhard <rene@debian.org> Sat, 13 Mar 2010 15:24:28 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Mar 2010 01:40:51 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-03-13 14:36:00 +0000
+++ b/rules 2010-03-15 00:52:49 +0000
@@ -58,6 +58,9 @@
export DH_OPTIONS
export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr:.git
#export DH_VERBOSE=1
+# quilt
+export QUILT_PATCHES=debian/patches
+export QUILT_OPTIONS=-p1
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
unexport LS_COLORS
@@ -544,7 +547,11 @@
endif
ifeq "$(DEBSRC_VERSION)" "3.0"
+ ifeq "$(LENNY_BACKPORT)" "y"
+ BUILD_DEPS += , dpkg-dev (>= 1.14.27)
+ else
BUILD_DEPS += , dpkg-dev (>= 1.15.1)
+ endif
else
ifeq "$(NEW_DPKG_SHLIBDEPS)" "y"
# new dpkg-dev whcih works - in contrast to 1.4.9 and .10 -
@@ -553,6 +560,10 @@
endif
endif
+ifeq "$(DEBSRC_VERSION)" "1.0"
+ BUILD_DEPS += , quilt
+endif
+
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
BUILD_DEPS += , libgl1-mesa-dev [$(OOO_OGLTRANS_ARCHS)], libglu1-mesa-dev [$(OOO_OGLTRANS_ARCHS)]
endif
@@ -1254,7 +1265,15 @@
dh_testdir
find $(SOURCE_TREE) -maxdepth 2 -name $(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT) -type d -exec rm -rf {} \;
+ifeq "$(DEBSRC_VERSION)" "1.0"
+include /usr/share/quilt/quilt.make
+endif
+
+ifeq "$(DEBSRC_VERSION)" "1.0"
+clean: unpatch
+else
clean:
+endif
dh_testroot
dh_testdir
@@ -1421,6 +1440,22 @@
rm -f $$f ; \
fi ; \
done
+ set -e; \
+ for i in `cat debian/source/components | grep -v ^$(OOO_BUILD_TREE)` ; do \
+ cd $$i && \
+ for f in \
+ *.bz2 \
+ *.gz \
+ *.zip \
+ ; do \
+ if [ -s $$f ]; then \
+ uuencode $$f $$f > $$f.uu.tmp && \
+ ../debian/scripts/move-if-change $$f.uu.tmp $$f.uu; \
+ touch -r $$f $$f.uu ; \
+ rm -f $$f ; \
+ fi ; done; \
+ cd ..; \
+ done
endif
dh_clean
@@ -1708,8 +1743,13 @@
.DELETE_ON_ERROR: debian/control
build: build-arch build-indep
+ifeq "$(DEBSRC_VERSION)" "1.0"
+build-arch: $(QUILT_STAMPFN) $(STAMP_DIR)/build
+build-indep: $(QUILT_STAMPFN) $(STAMP_DIR)/build
+else
build-arch: $(STAMP_DIR)/build
build-indep: $(STAMP_DIR)/build
+endif
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
Reply to: