[Fusionforge-commits] FusionForge branch master updated. 0b3bb3daeefabca97295764aac5223e9c55b1672

Christian Bayle cbayle at fusionforge.org
Sun Nov 18 00:49:09 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  0b3bb3daeefabca97295764aac5223e9c55b1672 (commit)
      from  1dc62c4f6588b247034972f296e1e3b42bc8c350 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0b3bb3daeefabca97295764aac5223e9c55b1672
Author: Christian Bayle <chris at bayle.eu>
Date:   Sun Nov 18 00:48:16 2012 +0100

    install in repo even if already built

diff --git a/3rd-party/mediawiki/Makefile b/3rd-party/mediawiki/Makefile
index 0dcde76..ee04c87 100644
--- a/3rd-party/mediawiki/Makefile
+++ b/3rd-party/mediawiki/Makefile
@@ -17,9 +17,11 @@ DIST=wheezy
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
 CHANGEFILE=mediawiki_$(VERS)_$(ARCH).changes
 
-$(BUILDRESULT)/$(CHANGEFILE): $(BUILDPLACE)/$(DSCFILE)
+$(BUILDRESULT)/$(CHANGEFILE): $(BUILDPLACE)/$(DSCFILE) dist
 	sudo cowbuilder --configfile $(COWBUILDERCONFIG) --build $(BUILDPLACE)/$(DSCFILE)
-	[ ! -d $(REPOPATH)/debian ] || reprepro -Vb $(REPOPATH)/debian --ignore=wrongdistribution --ignore=missingfile include $(DIST) $@
+
+dist:
+	reprepro -Vb $(REPOPATH)/debian --ignore=wrongdistribution --ignore=missingfile include $(DIST) $(BUILDRESULT)/$(CHANGEFILE)
 
 $(BUILDPLACE)/$(DSCFILE): $(BUILDPLACE)
 	cd $(BUILDPLACE) ; dget -d $(DSCURL)
diff --git a/3rd-party/selenium/Makefile b/3rd-party/selenium/Makefile
index 30db248..34f4139 100644
--- a/3rd-party/selenium/Makefile
+++ b/3rd-party/selenium/Makefile
@@ -12,9 +12,11 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
 DSCFILE=selenium_$(VERS).dsc
 CHANGEFILE=selenium_$(VERS)_$(ARCH).changes
 
-$(BUILDRESULT)/$(CHANGEFILE): $(BUILDPLACE)/$(DSCFILE)
+$(BUILDRESULT)/$(CHANGEFILE): $(BUILDPLACE)/$(DSCFILE) dist
 	sudo cowbuilder --configfile $(COWBUILDERCONFIG) --build $(BUILDPLACE)/$(DSCFILE)
-	[ ! -d $(REPOPATH)/debian ] || reprepro -Vb $(REPOPATH)/debian --ignore=wrongdistribution --ignore=missingfile include $(DIST) $@
+
+dist:
+	reprepro -Vb $(REPOPATH)/debian --ignore=wrongdistribution --ignore=missingfile include $(DIST) $(BUILDRESULT)/$(CHANGEFILE)
 
 $(BUILDPLACE)/$(DSCFILE): $(BUILDPLACE)/selenium/selenium-server.jar
 	cd $(BUILDPLACE) ; dpkg-source -b selenium

-----------------------------------------------------------------------

Summary of changes:
 3rd-party/mediawiki/Makefile |    6 ++++--
 3rd-party/selenium/Makefile  |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list