Download as
Browse Code »

Commit 1d80ef7afcd8c91aaf4910aba72a84cc64d24752

Authored by Weblate
2 parents 069c4b26 03481d44
Exists in master and in 21 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, news_page, script_to_update, template_mirror_block, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 11 changed files with 124 additions and 7 deletions   Show diff stats
AUTHORS.md
  Diff comments   View file @1d80ef7
... ... @@ -198,6 +198,7 @@ Martín Olivera <molivera@solar.org.ar>
198 198 Moises Machado <moises@colivre.coop.br>
199 199 Naíla Alves <naila@colivre.coop.br>
200 200 Nanda Lopes <nanda.listas+psl@gmail.com>
  201 +Parley Martins <parleypachecomartins@gmail.com>
201 202 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
202 203 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
203 204 Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
... ...
debian/bundle/config
View file @069c4b2
... ... @@ -1,3 +0,0 @@
1   ----
2   -BUNDLE_WITHOUT: test:cucumber
3   -
debian/changelog
  Diff comments   View file @1d80ef7
  1 +noosfero (1.0~rc4) wheezy-test; urgency=low
  2 +
  3 + * Fourth release candidate
  4 +
  5 + -- Antonio Terceiro <vagrant@wheezy-base> Wed, 19 Nov 2014 10:31:16 -0300
  6 +
1 7 noosfero (1.0~rc3) wheezy-test; urgency=low
2 8  
3 9 * Third release candidate to Noosfero 1.0
... ...
debian/filter-gemfile 0 → 100755
  Diff comments   View file @1d80ef7
... ... @@ -0,0 +1,5 @@
  1 +#!/bin/sh
  2 +
  3 +set -e
  4 +
  5 +sed -e '/^group\s*:\(test\|cucumber\)/,/^end/ d' Gemfile
... ...
debian/noosfero.install
  Diff comments   View file @1d80ef7
... ... @@ -7,9 +7,6 @@ util usr/share/noosfero
7 7 Rakefile usr/share/noosfero
8 8 vendor usr/share/noosfero
9 9  
10   -Gemfile usr/share/noosfero
11   -debian/bundle/config usr/share/noosfero/.bundle
12   -
13 10 config/application.rb usr/share/noosfero/config
14 11 config/boot.rb usr/share/noosfero/config
15 12 config/environment.rb usr/share/noosfero/config
... ...
debian/rules
  Diff comments   View file @1d80ef7
... ... @@ -20,6 +20,10 @@ override_dh_link:
20 20 dh_link usr/lib/noosfero/dbinstall usr/share/dbconfig-common/scripts/noosfero/install/$$db; \
21 21 done
22 22  
  23 +override_dh_auto_install:
  24 + dh_auto_install
  25 + debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile
  26 +
23 27 override_dh_installinit:
24 28 dh_installinit -pnoosfero --onlyscripts
25 29  
... ...
lib/noosfero/version.rb
  Diff comments   View file @1d80ef7
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '1.0~rc3'
  3 + VERSION = '1.0~rc4'
4 4 end
... ...
util/debian-install/.gitignore 0 → 100644
  Diff comments   View file @1d80ef7
... ... @@ -0,0 +1 @@
  1 +*.deb
... ...
util/debian-install/README.md 0 → 100644
  Diff comments   View file @1d80ef7
... ... @@ -0,0 +1,3 @@
  1 +This directory contains the basic structure to test the installation of
  2 +Noosfero debian packages, using a fresh Vagrant VM and packages built in
  3 +${NOOSFEROROOT}/pkg/.
... ...
util/debian-install/Vagrantfile 0 → 100644
  Diff comments   View file @1d80ef7
... ... @@ -0,0 +1,29 @@
  1 +# -*- mode: ruby -*-
  2 +# vi: set ft=ruby :
  3 +
  4 +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
  5 +VAGRANTFILE_API_VERSION = "2"
  6 +
  7 +require 'fileutils'
  8 +debs = `find ../../pkg/ -name '*.deb' | sort -t _ -V | tail -2`.split
  9 +if debs.empty?
  10 + puts "W: no debs built in ../../pkg/; will install local ones, or none at all"
  11 +else
  12 + local_debs = Dir.glob('*.deb')
  13 + debs.each do |f|
  14 + fn = File.basename(f)
  15 + if local_debs.include?(fn)
  16 + local_debs.delete(fn)
  17 + else
  18 + FileUtils::Verbose.ln f, '.'
  19 + end
  20 + end
  21 + local_debs.each do |f|
  22 + FileUtils::Verbose.rm_f f
  23 + end
  24 +end
  25 +
  26 +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  27 + config.vm.box = "debian-wheezy"
  28 + config.vm.provision :shell, path: 'install'
  29 +end
... ...
util/debian-install/install 0 → 100755
  Diff comments   View file @1d80ef7
... ... @@ -0,0 +1,74 @@
  1 +#!/bin/sh
  2 +
  3 +set -e
  4 +sudo apt-get install -qy netcat-traditional
  5 +
  6 +# apt-cacher-ng running on the host
  7 +# 10.0.2.2 = host ip on virtualbox/qemu
  8 +# 192.168.122.1 = host ip on default libvirt bridge
  9 +for ip in 10.0.2.2 192.168.122.1; do
  10 + if nc -z -w 1 $ip 3142; then
  11 + echo "Acquire::http::Proxy \"http://$ip:3142\";" | sudo tee /etc/apt/apt.conf.d/01proxy
  12 + fi
  13 +done
  14 +
  15 +apt-key add - <<EOF
  16 +-----BEGIN PGP PUBLIC KEY BLOCK-----
  17 +Version: GnuPG v1.4.9 (GNU/Linux)
  18 +
  19 +mQGiBE1HCIURBADw6SnRbc1qCHdTV9wD0rxSMIWevzUX+bnDgvV455yudqtVFUhX
  20 +2QYvtlwclllbLWKzRdiM7GsBi+2DyWli4B17xl86A5RBQNdc1v1vWZG3QwURxd4E
  21 +46fC6mR/K09mJl7aD0yq1rFFLt8pq8aCn6geslqqwAkQHR1gXEL8ftqcpwCg7EkU
  22 +n/yivf3qPX03zWBDmdQZog0D/2z0JGdVqLZJHAKjndKHSCuQlP+8d8NF0d27kStN
  23 +hJjX8WcBLFKo9BeZUZnc0Kgq7+6p3wuvI1MzyqSEVEi2YxSB0zXU59HGrXtRQlQ2
  24 +YksppP2Hwe30/qrLgWJnNP4pxmWjv0F3PFSD4Om07hGxJ2ldWdBlfh2mAwOPtSXK
  25 +yYTZA/93+OvQSyneVEBNMH58cCB98tbnFz15VBdinNLRUpbWYMq/UGjDr5HCn54B
  26 +zh/SZOEVRVxgC8LMHsimNkBmpe2b6/5UdRa24CWb0iZV1mHEhNnaVp0PdMq2ljW0
  27 +T43e2pXeDuhfeFeELJyFdaQBRG7NIN+Udnu0tGZH3RonqVPM6LRETm9vc2Zlcm8g
  28 +QXJjaGl2ZSBTaWduaW5nIEtleSA8bm9vc2Zlcm8tZGV2QGxpc3Rhcy5zb2Z0d2Fy
  29 +ZWxpdnJlLm9yZz6IYAQTEQIAIAUCTUcIhQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B
  30 +AheAAAoJELpeS0yfHm2nWpQAoNA5o6KDy8WUcXUHTfhmm5LYzPlQAJ91Ar/zaMdY
  31 +9g/5zr9/Quy8NIUpwLkEDQRNRwiFEBAAmtDGneyUvMU6HHA3sd9rgfa+EXHzGSwG
  32 +NvpREyAhxijnfPx4AUOCCOnh2Cf6jrwbxNNsWzgYVMdsO7yS/h1BHkO4t+RiPrYg
  33 +nEggQFU2SNff+TZPYci7aeXPTs9/K4IyKQ/+whYpO8R8LFGECz7b7F1vyPzCHGbs
  34 +Ki7mrNyinRFYVlpnmML7hBfrSFItSdefe59RL9Tu2kvr+vUvk60yvbdu93OrY5J7
  35 +ADAMN+NGPyPr/Y3Q9cXREmIRr5EV7U0IFBSDybMyvYODUc1gt25y+Byh3Yz7EyEZ
  36 +N+0Oh3A1CydWkjrWUwpuNe/Eni6B8awu4nYq9ow4VMMZLE3ruhMeMj5YX74qg3Fl
  37 +mOUODM5ffWbfiGaD2r4I+ZuH1VWvgPWWSLHHt8UI7eQLMxPWOoKVpKPPeme/27Rj
  38 +qXljFWZpuhsmVuGN32R79T5jCnZUKAaciwvYN9ucZ3RazdhynpX1izmSCWkZEaCb
  39 ++YNF3w/Wc9DqB9Ai78cVJzGqe7O11P4xtSI4T8oCx7oWlxHxlXUWD3Oa1b2yrXuL
  40 +hDmF8uyUFRSKSVtP8et2SbCozF/wK90DCy55FqUdraDahyAt8kFgM3CQR9mRh56p
  41 +EWorsDpd08puRFoPevEGe99+McZ29pR6f3RbrcFe2ws7lw2w8AJbHgelXRbeEie+
  42 +x/4Nfu/UATsAAwUP+gN2nSgLAS2Md3awg9mBI6VufflMbsuZJxjemJ9Phdyx5PR2
  43 +PvRvyZffaqZltTbBxPiOA1wAIpeWNVJehCpiZgXih93HMTrucBvYyLlbxr7Or7ex
  44 +t1/K7TZo5Si+yJ6zNCNXewPimZCV1oUWE8P2uy8iyMUhgpFc7q7xeQCOkvqYphlA
  45 +bUT8BcD6Coo4s98gOfgetch0fgCdiCYTNbT0+7jOw8sTx7DmlQHKSmQ6NXOZypI7
  46 +lk3OwZIGB6t+Os2Q8uLYxoWzK6fqc8CSSgQPpL4wd4w9/etwzav3/SiZJN3NE0UL
  47 +RoayneyD0bC83w2HAEcYb8qDsF85pPkjXSXZdlXulTZC89/4yq8h6hJODOQ7hKTx
  48 +TvEE5i3LmAYj+uTbuoauYBJMiU2oXrqfCGR+tmxz5V7QSwLdy0d95w0F/Rj1sesO
  49 +SfBRGyxqSqQsO9KDMJdmi/FyjiPBVKE3i9YFWsePLnHs3JNCRehDt3xpap3YrjBW
  50 +MAMb36KpZ9M6Cj2nRjB4pfVNno0hmsQ3+8So2vBW/UAbHUW/izQPRFVp+HXVxDf6
  51 +xjIi9gyocstFCkKrD7NFL/7u6fWginUNXIjYAdqbqRIihzfW7Et2QiPL4tnQrQey
  52 +4P8Y7+gThn0CWeJw4leCueYr/yYUJ7lelYCd9q2uphC/2KinUxBSInKjQ7+8iEkE
  53 +GBECAAkFAk1HCIUCGwwACgkQul5LTJ8ebae2qgCeOMvYOOVDVtchTRhD56VlYKOi
  54 +FPQAoNmiMgP6zGF9rgOEWMEiFEryayrz
  55 +=70DR
  56 +-----END PGP PUBLIC KEY BLOCK-----
  57 +EOF
  58 +
  59 +cat > /etc/apt/sources.list.d/noosfero.list <<EOF
  60 +deb http://download.noosfero.org/debian/wheezy ./
  61 +deb-src http://download.noosfero.org/debian/wheezy ./
  62 +deb http://download.noosfero.org/debian/wheezy-test ./
  63 +deb-src http://download.noosfero.org/debian/wheezy-test ./
  64 +EOF
  65 +
  66 +export DEBIAN_FRONTEND=noninteractive
  67 +
  68 +apt-get update
  69 +apt-get dist-upgrade -qy
  70 +apt-get install -qy postgresql ruby1.8
  71 +
  72 +dpkg --unpack /vagrant/noosfero_*.deb /vagrant/noosfero-apache_*.deb
  73 +apt-cache policy noosfero
  74 +apt-get install -qyf
... ...