rev 9379 - kde-extras/kio-locate/trunk/debian

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-02-10 02:07:37 +0000 (Sun, 10 Feb 2008)
New Revision: 9379

Modified:
   kde-extras/kio-locate/trunk/debian/rules
Log:
Make DEB_REAL_UPSTREAM_VERSION contain the real upstream version, fixing the get-orig-source target
Only call scons -c when SConstruct is present so 'making' the clean target works on the debian/-only svn 
layout


Modified: kde-extras/kio-locate/trunk/debian/rules
===================================================================
--- kde-extras/kio-locate/trunk/debian/rules	2008-02-09 20:04:02 UTC (rev 9378)
+++ kde-extras/kio-locate/trunk/debian/rules	2008-02-10 02:07:37 UTC (rev 9379)
@@ -17,6 +17,7 @@
 DEB_COMPRESS_EXCLUDE=.docbook
 DEB_SCONS_PREFIX=/usr
 SCONS_CMD=scons
+DEB_REAL_UPSTREAM_VERSION=$(shell echo "$(DEB_UPSTREAM_VERSION)" | sed 's/\+ds//')
 
 CONFIG_STATUS=$(DEB_BUILDDIR)/config.status
 
@@ -29,6 +30,7 @@
 common-build-arch common-build-indep:: common-build-impl
 common-build-impl::
 	$(SCONS_CMD)
+	# workaround to "fix" a dependencies loop:
 	$(RM) doc/en/index.cache.bz2
 
 common-install-arch common-install-indep:: common-install-impl
@@ -36,30 +38,30 @@
 	$(SCONS_CMD) install
 
 clean::
-	$(SCONS_CMD) -c
+	[ ! -f SConstruct ] || $(SCONS_CMD) -c
 	$(RM) -r build cache
 	$(RM) admin/*.pyc $(CONFIG_STATUS)
 	$(RM) -r debian/get-orig-source
 
 .PHONY: get-orig-source
-get-orig-source: ../kio-locate_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+get-orig-source: ../kio-locate_$(DEB_REAL_UPSTREAM_VERSION).orig.tar.gz
 
-../kio-locate_$(DEB_UPSTREAM_VERSION).orig.tar.gz: debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	cp -a debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).orig.tar.gz ../
+../kio-locate_$(DEB_REAL_UPSTREAM_VERSION).orig.tar.gz: debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).orig.tar.gz
+	cp -a debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).orig.tar.gz ../
 
-debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).orig.tar.gz: debian/get-orig-source/kio-locate-$(DEB_UPSTREAM_VERSION)
+debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).orig.tar.gz: debian/get-orig-source/kio-locate-$(DEB_REAL_UPSTREAM_VERSION)
 	# only repackage if necessary:
-	[ ! -d debian/get-orig-source/kio-locate-$(DEB_UPSTREAM_VERSION)/debian ] && cp -a debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz ../ && exit 0 || true	
-	$(RM) -r debian/get-orig-source/kio-locate-$(DEB_UPSTREAM_VERSION)/debian
-	cd debian/get-orig-source; tar -cvvf kio-locate_$(DEB_UPSTREAM_VERSION).orig.tar kio-locate-$(DEB_UPSTREAM_VERSION)
-	gzip -9 debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).orig.tar
+	[ ! -d debian/get-orig-source/kio-locate-$(DEB_REAL_UPSTREAM_VERSION)/debian ] && cp -a debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz ../ && exit 0 || true	
+	$(RM) -r debian/get-orig-source/kio-locate-$(DEB_REAL_UPSTREAM_VERSION)/debian
+	cd debian/get-orig-source; tar -cvvf kio-locate_$(DEB_REAL_UPSTREAM_VERSION).orig.tar kio-locate-$(DEB_REAL_UPSTREAM_VERSION)
+	gzip -9 debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).orig.tar
 
-debian/get-orig-source/kio-locate-$(DEB_UPSTREAM_VERSION): debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz
-	cd debian/get-orig-source; tar --atime-preserve -xvvzf kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz
+debian/get-orig-source/kio-locate-$(DEB_REAL_UPSTREAM_VERSION): debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz
+	cd debian/get-orig-source; tar --atime-preserve -xvvzf kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz
 
-debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz:
+debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz:
 	mkdir -p debian/get-orig-source/
-	wget -Odebian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz.new http://arminstraub.com/downloads/kio-locate/kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz
-	mv debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz.new debian/get-orig-source/kio-locate_$(DEB_UPSTREAM_VERSION).tar.gz
+	wget -Odebian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz.new http://arminstraub.com/downloads/kio-locate/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz
+	mv debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz.new debian/get-orig-source/kio-locate_$(DEB_REAL_UPSTREAM_VERSION).tar.gz
 
 DEB_INSTALL_DOCS_kio-locate := -XREADME -XNEWS -XTODO -XAUTHORS