[Git][noosfero/noosfero][master] 10 commits: Bump version number for RC0
Antonio Terceiro
gitlab at mg.gitlab.com
Tue Jan 19 11:03:05 BRST 2016
Antonio Terceiro pushed to branch master at Noosfero / noosfero
Commits:
75351dcc by Antonio Terceiro at 2016-01-18T19:02:54-02:00
Bump version number for RC0
- - - - -
e5a47793 by Antonio Terceiro at 2016-01-18T19:02:54-02:00
noosfero:deb: stop creating deprecated vendor/rails
- - - - -
42f3fa97 by Antonio Terceiro at 2016-01-18T19:02:55-02:00
util/debian-install: update to install on jessie
- - - - -
e495c495 by Antonio Terceiro at 2016-01-18T19:02:55-02:00
debian/control: drop pre-dependency on ruby1.8
It is not available yet, and that was only needed during the
squeeze → wheezy upgrade.
- - - - -
c8bcb4ee by Antonio Terceiro at 2016-01-18T19:02:55-02:00
debian/control: add missing dependency on ruby-diffy
- - - - -
0ef46dbf by Antonio Terceiro at 2016-01-18T19:02:55-02:00
Bump bundler dependency
The version in jessie does not work with vendored dependencies
- - - - -
424988e4 by Antonio Terceiro at 2016-01-18T19:02:55-02:00
gettext.rake: explicitly define locales if po/ is not available
That is the case on the Debian package
- - - - -
85259440 by Antonio Terceiro at 2016-01-18T19:02:56-02:00
noosfero-apache: migrate to jessie
- - - - -
57881394 by Antonio Terceiro at 2016-01-18T19:07:54-02:00
debian/apache2/virtualhost.conf: fix syntax for apache 2.4+
- - - - -
c3508696 by Antonio Terceiro at 2016-01-19T11:01:39-02:00
Merge branch 'packaging-jessie'
- - - - -
11 changed files:
- debian/apache2/virtualhost.conf
- debian/changelog
- debian/control
- debian/noosfero-apache.postinst
- debian/update-noosfero-apache
- lib/noosfero/version.rb
- lib/tasks/gettext.rake
- lib/tasks/release.rake
- util/debian-install/README.md
- util/debian-install/Vagrantfile
- util/debian-install/install
Changes:
=====================================
debian/apache2/virtualhost.conf
=====================================
--- a/debian/apache2/virtualhost.conf
+++ b/debian/apache2/virtualhost.conf
@@ -1,6 +1,6 @@
DocumentRoot "/usr/share/noosfero/public"
<Directory "/var/lib/noosfero/current/public">
- Options FollowSymLinks -Indexes
+ Options +FollowSymLinks -Indexes
AllowOverride None
Order Allow,Deny
Allow from all
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+noosfero (1.4~rc0) UNRELEASED; urgency=low
+
+ * Noosfero 1.4 RC 0
+
+ -- Antonio Terceiro <terceiro at debian.org> Mon, 18 Jan 2016 10:59:57 -0200
+
noosfero (1.3) wheezy-test; urgency=low
* Noosfero 1.3 final release
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,8 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
Package: noosfero
Architecture: all
-Pre-Depends: ruby1.8 (>= 1.8.7.358)
Depends: adduser,
+ bundler (>= 1.10),
dbconfig-common,
debconf,
exim4 | mail-transport-agent,
@@ -51,6 +51,7 @@ Depends: adduser,
ruby-dalli,
ruby-delayed-job,
ruby-delayed-job-active-record,
+ ruby-diffy,
ruby-eita-jrails (>= 0.9.3-5~),
ruby-eventmachine (>= 0.12.10-4~),
ruby-exception-notification,
=====================================
debian/noosfero-apache.postinst
=====================================
--- a/debian/noosfero-apache.postinst
+++ b/debian/noosfero-apache.postinst
@@ -17,7 +17,7 @@ if which update-noosfero-apache >/dev/null; then
update-noosfero-apache
if [ "$enable_apache_site" = 'true' ]; then
- a2ensite noosfero
+ a2ensite noosfero.conf
invoke-rc.d apache2 reload
fi
fi
=====================================
debian/update-noosfero-apache
=====================================
--- a/debian/update-noosfero-apache
+++ b/debian/update-noosfero-apache
@@ -6,7 +6,14 @@ set -e
# installed
if test -x /usr/share/noosfero/script/apacheconf; then
- apache_site='/etc/apache2/sites-available/noosfero'
+ old_apache_site='/etc/apache2/sites-available/noosfero'
+ apache_site='/etc/apache2/sites-available/noosfero.conf'
+
+ # migrate from apache 2.2 to 2.4+
+ if [ ! -f "$apache_site" -a -f "$old_apache_site" ]; then
+ mv "$old_apache_site" "$apache_site"
+ fi
+
if ! test -e "$apache_site"; then
echo "Generating apache virtual host ..."
cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site"
=====================================
lib/noosfero/version.rb
=====================================
--- a/lib/noosfero/version.rb
+++ b/lib/noosfero/version.rb
@@ -1,6 +1,6 @@
module Noosfero
PROJECT = 'noosfero'
- VERSION = '1.3'
+ VERSION = '1.4~rc0'
end
root = File.expand_path(File.dirname(__FILE__) + '/../..')
=====================================
lib/tasks/gettext.rake
=====================================
--- a/lib/tasks/gettext.rake
+++ b/lib/tasks/gettext.rake
@@ -16,6 +16,11 @@ GetText::Tools::Task.define do |task|
'public/*.html.erb',
'public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}',
].map { |pattern| Dir.glob(pattern) }.flatten
+
+ # installed, no po/ available
+ if !File.directory?(task.po_base_directory)
+ task.locales = Dir.chdir(task.mo_base_directory) { Dir.glob('*') }
+ end
end
task 'gettext:mo:update' => :symlinkmo
=====================================
lib/tasks/release.rake
=====================================
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -267,7 +267,6 @@ EOF
# base pre-config
mkdir "#{target}/tmp"
- ln_s '../../../vendor/rails', "#{target}/vendor/rails"
cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml"
sh "cd #{target} && dpkg-buildpackage -us -uc -b"
=====================================
util/debian-install/README.md
=====================================
--- a/util/debian-install/README.md
+++ b/util/debian-install/README.md
@@ -28,8 +28,8 @@ $ rm -f pkg/
$ cd utils/debian-install/
$ vagrant destroy
$ rm -f *.deb
-$ REPOSITORY=wheezy vagrant up # install current stable version
+$ REPOSITORY=jessie vagrant up # install current stable version
$ cd ../../
$ make noosfero:deb # build current packages
-$ REPOSITORY=wheezy-next vagrant provision # upgrade
+$ REPOSITORY=jessie-next vagrant provision # upgrade
```
=====================================
util/debian-install/Vagrantfile
=====================================
--- a/util/debian-install/Vagrantfile
+++ b/util/debian-install/Vagrantfile
@@ -27,7 +27,7 @@ else
end
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box = "debian/wheezy64"
+ config.vm.box = "debian/jessie64"
config.vm.provision :shell, path: 'install', args: [ENV['REPOSITORY']].compact
config.vm.provision :shell, path: 'test'
end
=====================================
util/debian-install/install
=====================================
--- a/util/debian-install/install
+++ b/util/debian-install/install
@@ -1,7 +1,7 @@
#!/bin/sh
-DISTRO=wheezy
-REPOSITORY='wheezy-test'
+DISTRO=jessie
+REPOSITORY='jessie-test'
if [ -n "$1" ]; then
REPOSITORY="$1"
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/6e4a69110e62a14c4cf5265ccc4a3719bf5d58bd...c35086965a93179bfd39125f3b970482b1ccbf76
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160119/8dcbfa6b/attachment-0001.html>
More information about the Noosfero-dev
mailing list