Download as
Browse Code »

Commit c35086965a93179bfd39125f3b970482b1ccbf76

Authored by Antonio Terceiro
2 parents 6e4a6911 57881394
Exists in master and in 15 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, web_steps_improvements

Merge branch 'packaging-jessie'

Showing 11 changed files with 29 additions and 11 deletions   Show diff stats
debian/apache2/virtualhost.conf
  Diff comments   View file @c350869
1 DocumentRoot "/usr/share/noosfero/public" 1 DocumentRoot "/usr/share/noosfero/public"
2 <Directory "/var/lib/noosfero/current/public"> 2 <Directory "/var/lib/noosfero/current/public">
3 - Options FollowSymLinks -Indexes 3 + Options +FollowSymLinks -Indexes
4 AllowOverride None 4 AllowOverride None
5 Order Allow,Deny 5 Order Allow,Deny
6 Allow from all 6 Allow from all
debian/changelog
  Diff comments   View file @c350869
  1 +noosfero (1.4~rc0) UNRELEASED; urgency=low
  2 +
  3 + * Noosfero 1.4 RC 0
  4 +
  5 + -- Antonio Terceiro <terceiro@debian.org> Mon, 18 Jan 2016 10:59:57 -0200
  6 +
1 noosfero (1.3) wheezy-test; urgency=low 7 noosfero (1.3) wheezy-test; urgency=low
2 8
3 * Noosfero 1.3 final release 9 * Noosfero 1.3 final release
debian/control
  Diff comments   View file @c350869
@@ -32,8 +32,8 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git @@ -32,8 +32,8 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
32 32
33 Package: noosfero 33 Package: noosfero
34 Architecture: all 34 Architecture: all
35 -Pre-Depends: ruby1.8 (>= 1.8.7.358)  
36 Depends: adduser, 35 Depends: adduser,
  36 + bundler (>= 1.10),
37 dbconfig-common, 37 dbconfig-common,
38 debconf, 38 debconf,
39 exim4 | mail-transport-agent, 39 exim4 | mail-transport-agent,
@@ -51,6 +51,7 @@ Depends: adduser, @@ -51,6 +51,7 @@ Depends: adduser,
51 ruby-dalli, 51 ruby-dalli,
52 ruby-delayed-job, 52 ruby-delayed-job,
53 ruby-delayed-job-active-record, 53 ruby-delayed-job-active-record,
  54 + ruby-diffy,
54 ruby-eita-jrails (>= 0.9.3-5~), 55 ruby-eita-jrails (>= 0.9.3-5~),
55 ruby-eventmachine (>= 0.12.10-4~), 56 ruby-eventmachine (>= 0.12.10-4~),
56 ruby-exception-notification, 57 ruby-exception-notification,
debian/noosfero-apache.postinst
  Diff comments   View file @c350869
@@ -17,7 +17,7 @@ if which update-noosfero-apache &gt;/dev/null; then @@ -17,7 +17,7 @@ if which update-noosfero-apache &gt;/dev/null; then
17 update-noosfero-apache 17 update-noosfero-apache
18 18
19 if [ "$enable_apache_site" = 'true' ]; then 19 if [ "$enable_apache_site" = 'true' ]; then
20 - a2ensite noosfero 20 + a2ensite noosfero.conf
21 invoke-rc.d apache2 reload 21 invoke-rc.d apache2 reload
22 fi 22 fi
23 fi 23 fi
debian/update-noosfero-apache
  Diff comments   View file @c350869
@@ -6,7 +6,14 @@ set -e @@ -6,7 +6,14 @@ set -e
6 # installed 6 # installed
7 if test -x /usr/share/noosfero/script/apacheconf; then 7 if test -x /usr/share/noosfero/script/apacheconf; then
8 8
9 - apache_site='/etc/apache2/sites-available/noosfero' 9 + old_apache_site='/etc/apache2/sites-available/noosfero'
  10 + apache_site='/etc/apache2/sites-available/noosfero.conf'
  11 +
  12 + # migrate from apache 2.2 to 2.4+
  13 + if [ ! -f "$apache_site" -a -f "$old_apache_site" ]; then
  14 + mv "$old_apache_site" "$apache_site"
  15 + fi
  16 +
10 if ! test -e "$apache_site"; then 17 if ! test -e "$apache_site"; then
11 echo "Generating apache virtual host ..." 18 echo "Generating apache virtual host ..."
12 cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site" 19 cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site"
lib/noosfero/version.rb
  Diff comments   View file @c350869
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '1.3' 3 + VERSION = '1.4~rc0'
4 end 4 end
5 5
6 root = File.expand_path(File.dirname(__FILE__) + '/../..') 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
lib/tasks/gettext.rake
  Diff comments   View file @c350869
@@ -16,6 +16,11 @@ GetText::Tools::Task.define do |task| @@ -16,6 +16,11 @@ GetText::Tools::Task.define do |task|
16 'public/*.html.erb', 16 'public/*.html.erb',
17 'public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}', 17 'public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}',
18 ].map { |pattern| Dir.glob(pattern) }.flatten 18 ].map { |pattern| Dir.glob(pattern) }.flatten
  19 +
  20 + # installed, no po/ available
  21 + if !File.directory?(task.po_base_directory)
  22 + task.locales = Dir.chdir(task.mo_base_directory) { Dir.glob('*') }
  23 + end
19 end 24 end
20 25
21 task 'gettext:mo:update' => :symlinkmo 26 task 'gettext:mo:update' => :symlinkmo
lib/tasks/release.rake
  Diff comments   View file @c350869
@@ -267,7 +267,6 @@ EOF @@ -267,7 +267,6 @@ EOF
267 267
268 # base pre-config 268 # base pre-config
269 mkdir "#{target}/tmp" 269 mkdir "#{target}/tmp"
270 - ln_s '../../../vendor/rails', "#{target}/vendor/rails"  
271 cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml" 270 cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml"
272 271
273 sh "cd #{target} && dpkg-buildpackage -us -uc -b" 272 sh "cd #{target} && dpkg-buildpackage -us -uc -b"
util/debian-install/README.md
  Diff comments   View file @c350869
@@ -28,8 +28,8 @@ $ rm -f pkg/ @@ -28,8 +28,8 @@ $ rm -f pkg/
28 $ cd utils/debian-install/ 28 $ cd utils/debian-install/
29 $ vagrant destroy 29 $ vagrant destroy
30 $ rm -f *.deb 30 $ rm -f *.deb
31 -$ REPOSITORY=wheezy vagrant up # install current stable version 31 +$ REPOSITORY=jessie vagrant up # install current stable version
32 $ cd ../../ 32 $ cd ../../
33 $ make noosfero:deb # build current packages 33 $ make noosfero:deb # build current packages
34 -$ REPOSITORY=wheezy-next vagrant provision # upgrade 34 +$ REPOSITORY=jessie-next vagrant provision # upgrade
35 ``` 35 ```
util/debian-install/Vagrantfile
  Diff comments   View file @c350869
@@ -27,7 +27,7 @@ else @@ -27,7 +27,7 @@ else
27 end 27 end
28 28
29 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 29 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
30 - config.vm.box = "debian/wheezy64" 30 + config.vm.box = "debian/jessie64"
31 config.vm.provision :shell, path: 'install', args: [ENV['REPOSITORY']].compact 31 config.vm.provision :shell, path: 'install', args: [ENV['REPOSITORY']].compact
32 config.vm.provision :shell, path: 'test' 32 config.vm.provision :shell, path: 'test'
33 end 33 end
util/debian-install/install
  Diff comments   View file @c350869
1 #!/bin/sh 1 #!/bin/sh
2 2
3 -DISTRO=wheezy  
4 -REPOSITORY='wheezy-test' 3 +DISTRO=jessie
  4 +REPOSITORY='jessie-test'
5 5
6 if [ -n "$1" ]; then 6 if [ -n "$1" ]; then
7 REPOSITORY="$1" 7 REPOSITORY="$1"