noosfero | 6 new commits pushed to repository
Antonio Terceiro
gitlab at gitlab.com
Mon Mar 9 12:53:34 BRT 2015
Antonio Terceiro pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>
Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/0cd8f0eb959dcd17a2a16a5d34198b77868aea22">0cd8f0eb</a> by Antonio Terceiro
Updating authors file
- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/b982d5e8a930693fc0edd181cbda552be5ab433c">b982d5e8</a> by Antonio Terceiro
Noosfero::VERSION: normalize RC versions from git tags
- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/a5f1436cd95e9a52f70277c2966d598843ce58b7">a5f1436c</a> by Antonio Terceiro
Add release-related tasks to alternative Rakefile
- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/48942667b8ef1f01daa8562926f4c10e47b737ef">48942667</a> by Antonio Terceiro
release: get distribution from latest changelog entry
- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/affcaaea70e172ea1e886e695c50921f2f831f37">affcaaea</a> by Antonio Terceiro
release: use git diff --color
- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/666420f7bfa9864a1ab5b6d11e604c77e522852d">666420f7</a> by Antonio Terceiro
Bumping version 1.1~rc2
- - - - -
Changes:
=====================================
AUTHORS.md
=====================================
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -127,12 +127,14 @@ Eduardo Tourinho Edington <eduardo.edington at serpro.gov.br>
Evandro Jr <evandrojr at gmail.com>
Evandro Junior <evandrojr at gmail.com>
Fabio Teixeira <fabio1079 at gmail.com>
+FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial at gmail.com>
Fernanda Lopes <nanda.listas+psl at gmail.com>
Francisco Marcelo A. Lima Júnior <francisco.lima-junior at serpro.gov.br>
Francisco Marcelo de Araujo Lima Junior <79350259591 at serpro-1457614.(none)>
Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior at serpro.gov.br>
Francisco Marcelo de Araújo Lima Júnior <maljunior at gmail.com>
Gabriela Navarro <navarro1703 at gmail.com>
+Gonzalo Exequiel Pedone <hipersayan.x at gmail.com>
Grazieno Pellegrino <grazieno at gmail.com>
Gust <darksshades at hotmail.com>
Hebert Douglas <hebertdougl at gmail.com>
@@ -200,10 +202,12 @@ Marcos <marcos.rpj2 at gmail.com>
Marcos Ramos <ms.ramos at outlook.com>
Martín Olivera <molivera at solar.org.ar>
Maurilio Atila <cabelotaina at gmail.com>
+M for Momo <mo at rtnp.org>
Michal Čihař <michal at cihar.com>
Moises Machado <moises at colivre.coop.br>
Naíla Alves <naila at colivre.coop.br>
Nanda Lopes <nanda.listas+psl at gmail.com>
+Niemand Jedermann <predatorix at web.de>
Parley Martins <parleypachecomartins at gmail.com>
Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo at softwarelivre.org>
Paulo Meirelles + Alessandro Palmeira <paulo at softwarelivre.org>
@@ -244,6 +248,7 @@ Tallys Martins <tallysmartins at yahoo.com.br>
tallys <tallys at tallys>
tallys <tallys at tallys.(none)>
Thiago Zoroastro <thiago.zoroastro at bol.com.br>
+Tuux <tuxa at galaxie.eu.org>
Valessio Brito <contato at valessiobrito.com.br>
Valessio Brito <contato at valessiobrito.info>
Valessio Brito <valessio at gmail.com>
=====================================
Rakefile.translations → Rakefile.release
=====================================
--- a/Rakefile.translations
+++ b/Rakefile.release
@@ -1,11 +1,18 @@
# This Rakefile is intentionally independent from Rails to it can be used to
-# handle translations without having to load the entire Rails environment
-# (which is slow, requires a database connection and several other
+# handle release-related tasks without having to load the entire Rails
+# environment (which is slow, requires a database connection and several other
# inconveniences).
$: << 'lib'
+require 'noosfero'
+require 'noosfero/version'
+
load 'lib/tasks/gettext.rake'
load 'lib/tasks/doc.rake'
+load 'lib/tasks/error_messages.rake'
load 'lib/tasks/translation.rake'
+load 'lib/tasks/package.rake'
+load 'lib/tasks/release.rake'
+
task :default => 'noosfero:translations:compile'
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+noosfero (1.1~rc2) wheezy; urgency=low
+
+ * Second release candidate for Noosfero 1.1
+
+ -- Antonio Terceiro <terceiro at colivre.coop.br> Mon, 09 Mar 2015 12:47:39 -0300
+
noosfero (1.1~rc1) wheezy; urgency=low
* First release candidate for Noosfero 1.1
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -33,4 +33,4 @@ override_dh_clean:
override_dh_auto_build:
dh_auto_build
- rake noosfero:translations:compile > /dev/null
+ rake -f Rakefile.release > /dev/null
=====================================
lib/noosfero/version.rb
=====================================
--- a/lib/noosfero/version.rb
+++ b/lib/noosfero/version.rb
@@ -1,9 +1,9 @@
module Noosfero
PROJECT = 'noosfero'
- VERSION = '1.1~rc1'
+ VERSION = '1.1~rc2'
end
root = File.expand_path(File.dirname(__FILE__) + '/../..')
if File.exist?(File.join(root, '.git'))
- Noosfero::VERSION.clear << Dir.chdir(root) { `git describe --tags`.strip }
+ Noosfero::VERSION.clear << Dir.chdir(root) { `git describe --tags`.strip.sub('-rc', '~rc') }
end
=====================================
lib/tasks/error_messages.rake
=====================================
--- a/lib/tasks/error_messages.rake
+++ b/lib/tasks/error_messages.rake
@@ -1,4 +1,5 @@
-templates = Dir.glob(Rails.root.join('public', '*.html.erb'))
+root = Pathname(File.dirname(__FILE__)).join('../../').expand_path
+templates = Dir.glob(root.join('public', '*.html.erb'))
targets = []
templates.each do |template|
target = template.gsub(/.erb$/, '')
@@ -16,6 +17,6 @@ end
namespace :noosfero do
namespace 'error-pages' do
desc 'Translates Noosfero error pages'
- task :translate => [:environment] + targets
+ task :translate => targets
end
end
=====================================
lib/tasks/package.rake
=====================================
--- a/lib/tasks/package.rake
+++ b/lib/tasks/package.rake
@@ -1,4 +1,3 @@
-
desc "Generate source tarball"
task :package => 'package:clobber' do
require_dependency 'noosfero'
=====================================
lib/tasks/release.rake
=====================================
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -1,6 +1,5 @@
# encoding: UTF-8
-require 'noosfero/version'
$version = Noosfero::VERSION
namespace :noosfero do
@@ -132,13 +131,13 @@ EOF
if target =~ /-test$/
if new_version =~ /~rc\d+/
- new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" }
+ new_version.sub!(/\~rc([0-9]+).*/) { "~rc#{$1.to_i + 1}" }
else
new_version += '~rc1'
end
else
- if new_version =~ /~rc\d+/
- new_version.sub!(/~rc[0-9]+/, '')
+ if new_version =~ /~rc\d+.*/
+ new_version.sub!(/~rc[0-9]+.*/, '')
else
components = new_version.split('.').map(&:to_i)
if components.size < 3
@@ -158,9 +157,10 @@ EOF
sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{new_version}'/\" lib/noosfero/version.rb"
ENV['DEBFULLNAME'] ||= `git config user.name`.strip
ENV['DEBEMAIL'] ||= `git config user.email`.strip
- sh "dch --newversion #{new_version} --distribution #{target} --force-distribution '#{release_message}'"
+ distribution = `dpkg-parsechangelog | sed '/Distribution:/!d; s/^.*:\s*//'`.strip
+ sh "dch --newversion #{new_version} --distribution #{distribution} --force-distribution '#{release_message}'"
- sh 'git diff debian/changelog lib/noosfero/version.rb'
+ sh 'git diff --color debian/changelog lib/noosfero/version.rb'
if confirm("Commit version bump to #{new_version} on #{target} distribution")
sh 'git add debian/changelog lib/noosfero/version.rb'
sh "git commit -m 'Bumping version #{new_version}'"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150309/398c510c/attachment-0001.html>
More information about the Noosfero-dev
mailing list