[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 1dc97910a0eb26b546a6fecd55c3a016996eb5b7
Sylvain B
beuc at fusionforge.org
Mon Apr 21 21:03:03 CEST 2014
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, Branch_5_3 has been updated
via 1dc97910a0eb26b546a6fecd55c3a016996eb5b7 (commit)
via ebb1b25942d0104665f4b402de78f52b719aec33 (commit)
via f98d1d32be0c6fed3b47a5705a776eeccfb107e3 (commit)
via b0333b2815b0a529b901d08f91685e9103b797a0 (commit)
via f0a3017803363d74b6dc0ac3a7c6f834d7abd408 (commit)
via 53625798bbbcf76b0d2e28d306cc5aa40addc5c7 (commit)
from fc321c1ab4be7e3b826e185abcf87b9ed98524aa (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 1dc97910a0eb26b546a6fecd55c3a016996eb5b7
Author: Christian Bayle <chris at bayle.eu>
Date: Sat Feb 15 10:32:46 2014 +0100
Build the tarball required by quilt source format
diff --git a/3rd-party/selenium/Makefile b/3rd-party/selenium/Makefile
index f5774cc..226c174 100644
--- a/3rd-party/selenium/Makefile
+++ b/3rd-party/selenium/Makefile
@@ -12,7 +12,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
DSCFILE=selenium_$(VERS).dsc
CHANGEFILE=selenium_$(VERS)_$(ARCH).changes
-default: clean $(BUILDRESULT)/$(CHANGEFILE) dist
+default: $(BUILDRESULT)/$(CHANGEFILE) dist
$(BUILDRESULT)/$(CHANGEFILE): $(BUILDPLACE)/$(DSCFILE)
sudo cowbuilder --configfile $(COWBUILDERCONFIG) --build $(BUILDPLACE)/$(DSCFILE)
@@ -20,7 +20,7 @@ $(BUILDRESULT)/$(CHANGEFILE): $(BUILDPLACE)/$(DSCFILE)
dist:
reprepro -Vb $(REPOPATH)/debian --ignore=wrongdistribution --ignore=missingfile include $(DIST) $(BUILDRESULT)/$(CHANGEFILE)
-$(BUILDPLACE)/$(DSCFILE): $(BUILDPLACE)/selenium/selenium-server.jar
+$(BUILDPLACE)/$(DSCFILE): $(BUILDPLACE)/selenium_$(MAJOR).orig.tar.gz
cd $(BUILDPLACE) ; dpkg-source -b selenium
$(BUILDPLACE)/selenium/selenium-server.jar: $(BUILDPLACE)/selenium/debian selenium.include
@@ -29,5 +29,8 @@ $(BUILDPLACE)/selenium/selenium-server.jar: $(BUILDPLACE)/selenium/debian seleni
$(BUILDPLACE)/selenium/debian:
[ -d $@ ] || cp -r selenium $(BUILDPLACE)
+$(BUILDPLACE)/selenium_$(MAJOR).orig.tar.gz: $(BUILDPLACE)/selenium/selenium-server.jar
+ [ -d $@ ] || (cd $(BUILDPLACE) ; tar cvzf $@ selenium/selenium-server.jar)
+
clean:
[ ! -d $(BUILDPLACE)/selenium ] || rm -rf $(BUILDPLACE)/selenium
commit ebb1b25942d0104665f4b402de78f52b719aec33
Author: Christian Bayle <chris at bayle.eu>
Date: Sat Feb 15 02:08:47 2014 +0100
Switch debian source format to quilt
diff --git a/3rd-party/selenium/selenium.include b/3rd-party/selenium/selenium.include
index 57645b2..12bde27 100644
--- a/3rd-party/selenium/selenium.include
+++ b/3rd-party/selenium/selenium.include
@@ -13,7 +13,5 @@ MAJOR=2.35.0
MINOR=1
SELENIUMURL=http://selenium.googlecode.com/files/selenium-server-standalone-$(MAJOR).jar
-#VERS=$(MAJOR)-$(MINOR)
-# Now native package
-VERS=$(MAJOR)
+VERS=$(MAJOR)-$(MINOR)
diff --git a/3rd-party/selenium/selenium/debian/changelog b/3rd-party/selenium/selenium/debian/changelog
index 0b52d87..97ebc96 100644
--- a/3rd-party/selenium/selenium/debian/changelog
+++ b/3rd-party/selenium/selenium/debian/changelog
@@ -1,4 +1,4 @@
-selenium (2.35.0) unstable; urgency=low
+selenium (2.35.0-1) unstable; urgency=low
* Initial release
diff --git a/3rd-party/selenium/selenium/debian/source/format b/3rd-party/selenium/selenium/debian/source/format
index 89ae9db..163aaf8d 100644
--- a/3rd-party/selenium/selenium/debian/source/format
+++ b/3rd-party/selenium/selenium/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
commit f98d1d32be0c6fed3b47a5705a776eeccfb107e3
Author: Christian Bayle <chris at bayle.eu>
Date: Sat Feb 15 01:26:13 2014 +0100
Remove minor as package is declared native
diff --git a/3rd-party/selenium/selenium.include b/3rd-party/selenium/selenium.include
index 12bde27..57645b2 100644
--- a/3rd-party/selenium/selenium.include
+++ b/3rd-party/selenium/selenium.include
@@ -13,5 +13,7 @@ MAJOR=2.35.0
MINOR=1
SELENIUMURL=http://selenium.googlecode.com/files/selenium-server-standalone-$(MAJOR).jar
-VERS=$(MAJOR)-$(MINOR)
+#VERS=$(MAJOR)-$(MINOR)
+# Now native package
+VERS=$(MAJOR)
diff --git a/3rd-party/selenium/selenium/debian/changelog b/3rd-party/selenium/selenium/debian/changelog
index 97ebc96..0b52d87 100644
--- a/3rd-party/selenium/selenium/debian/changelog
+++ b/3rd-party/selenium/selenium/debian/changelog
@@ -1,4 +1,4 @@
-selenium (2.35.0-1) unstable; urgency=low
+selenium (2.35.0) unstable; urgency=low
* Initial release
commit b0333b2815b0a529b901d08f91685e9103b797a0
Author: Christian Bayle <chris at bayle.eu>
Date: Sat Feb 15 00:47:06 2014 +0100
Really hope this will clean selenium
diff --git a/3rd-party/selenium/Makefile b/3rd-party/selenium/Makefile
index 080d29c..f5774cc 100644
--- a/3rd-party/selenium/Makefile
+++ b/3rd-party/selenium/Makefile
@@ -12,7 +12,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
DSCFILE=selenium_$(VERS).dsc
CHANGEFILE=selenium_$(VERS)_$(ARCH).changes
-default: $(BUILDRESULT)/$(CHANGEFILE) dist
+default: clean $(BUILDRESULT)/$(CHANGEFILE) dist
$(BUILDRESULT)/$(CHANGEFILE): $(BUILDPLACE)/$(DSCFILE)
sudo cowbuilder --configfile $(COWBUILDERCONFIG) --build $(BUILDPLACE)/$(DSCFILE)
@@ -27,5 +27,7 @@ $(BUILDPLACE)/selenium/selenium-server.jar: $(BUILDPLACE)/selenium/debian seleni
[ -d $@ ] || wget -O - $(SELENIUMURL) > $@
$(BUILDPLACE)/selenium/debian:
- [ ! -d $(BUILDPLACE)/selenium ] || rm -rf $(BUILDPLACE)/selenium
[ -d $@ ] || cp -r selenium $(BUILDPLACE)
+
+clean:
+ [ ! -d $(BUILDPLACE)/selenium ] || rm -rf $(BUILDPLACE)/selenium
commit f0a3017803363d74b6dc0ac3a7c6f834d7abd408
Author: Christian Bayle <chris at bayle.eu>
Date: Fri Feb 14 23:59:30 2014 +0100
Force selenimum to be rebuilt
diff --git a/3rd-party/selenium/Makefile b/3rd-party/selenium/Makefile
index c410f93..080d29c 100644
--- a/3rd-party/selenium/Makefile
+++ b/3rd-party/selenium/Makefile
@@ -27,4 +27,5 @@ $(BUILDPLACE)/selenium/selenium-server.jar: $(BUILDPLACE)/selenium/debian seleni
[ -d $@ ] || wget -O - $(SELENIUMURL) > $@
$(BUILDPLACE)/selenium/debian:
+ [ ! -d $(BUILDPLACE)/selenium ] || rm -rf $(BUILDPLACE)/selenium
[ -d $@ ] || cp -r selenium $(BUILDPLACE)
commit 53625798bbbcf76b0d2e28d306cc5aa40addc5c7
Author: Roland Mas <lolando at debian.org>
Date: Fri Feb 14 21:17:55 2014 +0100
Fixed changelog for selenium package
diff --git a/3rd-party/selenium/selenium/debian/changelog b/3rd-party/selenium/selenium/debian/changelog
index 9854704..97ebc96 100644
--- a/3rd-party/selenium/selenium/debian/changelog
+++ b/3rd-party/selenium/selenium/debian/changelog
@@ -1,5 +1,5 @@
-selenium (2.21.0-1) unstable; urgency=low
+selenium (2.35.0-1) unstable; urgency=low
* Initial release
- -- Christian Bayle <bayle at debian.org> Tue, 02 Oct 2012 00:41:34 +0200
+ -- Roland Mas <lolando at debian.org> Fri, 14 Feb 2014 17:13:35 +0100
-----------------------------------------------------------------------
Summary of changes:
3rd-party/selenium/Makefile | 8 +++++++-
3rd-party/selenium/selenium/debian/changelog | 4 ++--
3rd-party/selenium/selenium/debian/source/format | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list