CVS:oo-deb/debian rules,1.139,1.140

[Chris Halls <halls@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6371

Modified Files:
	rules 
Log Message:
* icons.scale _must_ happen before the Ximian icons are copied in,
  thanks to martink for pointing it out
* Remove preserve timestamp from Ximian icons cp command


Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- rules	10 Oct 2003 04:05:00 -0000	1.139
+++ rules	10 Oct 2003 13:08:05 -0000	1.140
@@ -469,6 +469,7 @@
 
 build.prepare.artwork: $(STAMP_DIR)/build.prepare.artwork
 $(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/files.backup $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz.uu
+$(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/icons.scale
 $(STAMP_DIR)/build.prepare.artwork: debian/openintro_debian.xcf.uu
 
 	# add the splashscreen with the Debian logo
@@ -486,7 +487,7 @@
 	rm -f $(OOO_ICONS_VER)/offmgr/res/openabout.bmp
 
 	# Copy new artwork into the tree
-	cp -avf $(SOURCE_TREE)/$(OOO_ICONS_VER)/* $(SOURCE_TREE)
+	cp -dRvf $(SOURCE_TREE)/$(OOO_ICONS_VER)/* $(SOURCE_TREE)
 
 	# Force rebuild of image lists etc.
 	#find $(SOURCE_TREE) -name '*.src' -exec touch {} \;
@@ -495,7 +496,7 @@
 
 # After build preparation, run configure
 configure: $(STAMP_DIR)/configure
-$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare $(STAMP_DIR)/icons.scale
+$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare
 $(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare.artwork
 	dh_testdir
 	$(MAKE) -f debian/rules environment