------------------------------------------------------------
revno: 1852
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Mon 2010-03-15 02:01:37 +0100
message:
actually we need to add $(QUILT_STAMPFN) to config.status instead of build-*
in case we patch (related to) configure
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-03-15 00:52:49 +0000
+++ b/changelog 2010-03-15 01:01:37 +0000
@@ -18,7 +18,7 @@
- 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 <[email protected]> Mon, 15 Mar 2010 01:40:51 +0100
+ -- Rene Engelhard <[email protected]> Mon, 15 Mar 2010 01:59:14 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-03-15 00:52:49 +0000
+++ b/rules 2010-03-15 01:01:37 +0000
@@ -1743,13 +1743,8 @@
.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
@@ -1762,7 +1757,11 @@
# make run the target over.
configure: $(OOO_BUILD_TREE)/config.status
+ifeq "$(DEBSRC_VERSION)" "1.0"
+$(OOO_BUILD_TREE)/config.status: $(QUILT_STAMPFN) $(OOO_BUILD_TREE)/configure
+else
$(OOO_BUILD_TREE)/config.status: $(OOO_BUILD_TREE)/configure
+endif
dh_testdir
# Make sure needed scripts are executable
