Merge branch 'packaging-jessie'

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