CVS:oo-deb/debian rules,1.214.2.14.2.26,1.214.2.14.2.27

[Rene Engelhard <rene@gluck.debian.org>]

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

Modified Files:
      Tag: OPENOFFICE_ORG680
	rules 
Log Message:
move tag and source tree into $(TAG) and $(SOURCE_TREE) variables
remove upstreamclean target, looks oboslete
fix makebinariestar target


Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.26
retrieving revision 1.214.2.14.2.27
diff -u -d -r1.214.2.14.2.26 -r1.214.2.14.2.27
--- rules	24 Mar 2005 01:49:52 -0000	1.214.2.14.2.26
+++ rules	24 Mar 2005 22:17:34 -0000	1.214.2.14.2.27
@@ -36,6 +36,8 @@
 
 SHLIBS_OVERRIDE=-- -Ldebian/shlibs.override.internal
 
+TAG=src680-m$(MILESTONE)
+SOURCE_TREE=ooo-build/build/$(TAG)
 STAMP_DIR=debian/stampdir
 
 # Read in architecture-specific variables of importance.
@@ -50,7 +52,7 @@
 
 # Default flags to pass to configure of ooo-build
 CONFIGURE_FLAGS= --disable-post-install-scripts \
-                 --with-tag=src680-m$(MILESTONE) \
+                 --with-tag=$(TAG) \
 		 --with-system-gcc \
 		 --with-distro=$(PATCHSET) \
 		 --with-vendor=Debian \
@@ -289,7 +291,7 @@
 $(STAMP_DIR)/build: ooo-build/config.status
 	dh_testdir
 	cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) $(MAKE)
-	cd ooo-build/build/src680-m$(MILESTONE)/sysui; . ../*.sh; RPM=rpmbuild PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ../solenv/bin/build.pl
+	cd $(SOURCE_TREE)/sysui; . ../*.sh; RPM=rpmbuild PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ../solenv/bin/build.pl
 
 	touch $@
 
@@ -413,7 +415,7 @@
 	               $(PKGDIR)-core/usr/share/applications
                        
 	# Nasty menu icons hack, urgently needs better version
-	dirname="`cd ooo-build/build/src680-m$(MILESTONE)/sysui/unx*.pro/misc/desktopshare; pwd`" ;\
+	dirname="`cd $(SOURCE_TREE)/sysui/unx*.pro/misc/desktopshare; pwd`" ;\
 	for p in writer calc impress draw math base; do \
 		mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
 	    sed -e 's,Exec=openoffice.org-1.9 \(.*\) %U,Exec=ooffice$(VER) \1 %U,' \
@@ -449,7 +451,7 @@
 
 	mkdir -p debian/python-uno/usr/share/doc/python-uno
 	for i in doc demo; do \
-		cp -r ooo-build/build/src680-m$(MILESTONE)/pyuno/$$i \
+		cp -r $(SOURCE_TREE)/pyuno/$$i \
 		  debian/python-uno/usr/share/doc/python-uno; \
 	done
 	cd debian/python-uno/usr/share/doc/python-uno && \
@@ -495,7 +497,7 @@
 	dh_installdirs -i
 
 	# Icons
-	cd ooo-build/build/src680-m$(MILESTONE)/sysui/unx*.pro/misc/redhat/usr/share/icons &&\
+	cd $(SOURCE_TREE)/sysui/unx*.pro/misc/redhat/usr/share/icons &&\
 	for d in `find -type d`; do \
 	  install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d || exit 1 ;\
 	done &&\
@@ -687,38 +689,20 @@
 	cd debian && cvs -z3 -q update -dP
 	cd ooo-build && cvs -z3 -q update -dP
 
-# Clean all source except for debian and ooo-build directories
-# and re-unpack the source tarball.  The parent direcory name
-# is preserved
-upstreamclean:
-	# Make sure the upstream source tarball is available
-	test -f ../openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz
-
-	mkdir -p $(SOURCE_TREE)/tmp.source.unpack $(SOURCE_TREE)/tmp.oldsource
-	find $(SOURCE_TREE) -maxdepth 1 \
-	                    -not -name ooo-build -not -name debian -not -name $(SOURCE_TREE)\
-			    -not -name tmp.source.unpack -not -name tmp.oldsource \
-	                    -exec mv {} $(SOURCE_TREE)/tmp.oldsource \;
-
-	rm -rf $(SOURCE_TREE)/tmp.oldsource
-	tar -C $(SOURCE_TREE)/tmp.source.unpack -zxf ../openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz
-	mv $(SOURCE_TREE)/tmp.source.unpack/*/* $(SOURCE_TREE)
-	rm -r $(SOURCE_TREE)/tmp.source.unpack
-
 # Take a tarfile of all the non-stripped binaries in solver, for generating backtraces
 # from coredumps.
 makebinariestar:
 ifeq "$(ARCH)" "i386"
-	cd $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR) && \
+	cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo $$UPD)/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT) && \
 	  find bin lib | xargs file | sed -n '/LSB \(executable\|shared object\),.* not stripped/ s/:.*$$//p' | \
 	  tar -T - -jcvf $(CURDIR)/../openoffice.org$(VER)-binaries_$(SOURCE_VERSION)_$(ARCH).tar.bz2
 else
   ifeq "$(ARCH)" "arm"
-	cd $(SOURCE_TREE)/sdolver/$(BUILDNUM)/$(ARCHBUILDDIR) && \
+	cd §(SOURCE_TREE)/solver/$(shell . $(SOURCE_TRE)/*.sh; echo $$UPD)/$(shell . $(SOURCE_TREE/*.sh; echo $$OUTPATH$$PROEXT) && \
 	  find bin lib | xargs file | sed -n '/LSB \(executable\|shared object\),.* not stripped/ s/:.*$$//p' | \
 	  tar -T - -jcvf $(CURDIR)/../openoffice.org$(VER)-binaries_$(SOURCE_VERSION)_$(ARCH).tar.bz2
   else
-	cd $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR) && \
+	cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo $$UPD)/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT) && \
 	  find bin lib | xargs file | sed -n '/MSB \(executable\|shared object\),.* not stripped/ s/:.*$$//p' | \
 	  tar -T - -jcvf $(CURDIR)/../openoffice.org$(VER)-binaries_$(SOURCE_VERSION)_$(ARCH).tar.bz2
   endif