[evolvis-commits] r18665: bump to v72~snapshot… as next prereleases and force-regenerate Apache configs

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Sep 28 15:17:40 CEST 2012


Author: mirabilos
Date: 2012-09-28 15:17:39 +0200 (Fri, 28 Sep 2012)
New Revision: 18665

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/packaging/control/160plugin-mediawiki
Log:
bump to v72~snapshot… as next prereleases and force-regenerate Apache configs

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-09-28 13:17:35 UTC (rev 18664)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-09-28 13:17:39 UTC (rev 18665)
@@ -1,4 +1,4 @@
-fusionforge (1:5.1.1+evolvis71) xunstable; urgency=low
+fusionforge (1:5.1.1+evolvis72) xunstable; urgency=low
 
   * [#3203] Integrate MediaWiki 1.19 support (and mediawiki-extensions-math)
     + drop unused sys_use_mwframe
@@ -10,8 +10,11 @@
   * $HTML->_theme now contains the pathname component of the active Theme
   * Add script for easy in-tree regeneration of Apache configuration trees
   * [#2992] SCM: Fix ViewVC XHTML
+  * Force regeneration of vhost-{main,projects}.inc on upgrade from < 71
+    to support moving most of their contents into dpkg-conffiles and bump
+    the version to 72, to facilitate upgrading pre-releases exactly once
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 28 Sep 2012 14:41:35 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 28 Sep 2012 14:59:52 +0200
 
 fusionforge (1:5.1.1+evolvis70.1) unstable; urgency=high
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2012-09-28 13:17:35 UTC (rev 18664)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2012-09-28 13:17:39 UTC (rev 18665)
@@ -55,6 +55,11 @@
 		cat /etc/@OLDPACKAGE@/ssl-cert.pem >/etc/@OLDPACKAGE@/ssl-cert.ca
 	fi
 	
+	test -n "$2" && \
+	    dpkg --compare-versions "$2" lt 1:5.1.1+evolvis71 && \
+	    rm -f /etc/gforge/httpd.conf.d/vhost-main.inc \
+	    /etc/gforge/httpd.conf.d/vhost-projects.inc
+
 	for i in secrets.inc vhost-list.inc vhost-main.inc vhost-projects.inc ; do
 	    if [ ! -e /etc/gforge/httpd.conf.d/$i ] ; then
 		cp /usr/share/gforge/etc/httpd.conf.d-fhs/$i /etc/gforge/httpd.conf.d/$i

Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2012-09-28 13:17:35 UTC (rev 18664)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2012-09-28 13:17:39 UTC (rev 18665)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -web-apache2
 Architecture: all
-Depends: @OLDPACKAGE at -common (>> 1:5.1.1+evolvis70~), @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, libjs-prototype (>= 1.7.0-2.1~tarent), libjs-prototype (<< 1.7.0-2.1~tarenu), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>> 1:5.1.1+evolvis72~), @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, libjs-prototype (>= 1.7.0-2.1~tarent), libjs-prototype (<< 1.7.0-2.1~tarenu), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
 Recommends: locales | locales-all
 Provides: @OLDPACKAGE at -web, evolvisforge-web-apache2
 Conflicts: @OLDPACKAGE at -web

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/packaging/control/160plugin-mediawiki
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/packaging/control/160plugin-mediawiki	2012-09-28 13:17:35 UTC (rev 18664)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/packaging/control/160plugin-mediawiki	2012-09-28 13:17:39 UTC (rev 18665)
@@ -11,7 +11,7 @@
  mediawiki-extensions-graphviz (>= 2.8),
  mediawiki-extensions-math (>= 2:1.0),
  php5-cli, php5-gd,
- @OLDPACKAGE at -plugin-mediawiki (>= 1:5.1.1+evolvis71~),
+ @OLDPACKAGE at -plugin-mediawiki (>= 1:5.1.1+evolvis72~),
  ${misc:Depends}
 Provides: evolvisforge-plugin-mediawiki-ff
 Description: Mediawiki plugin for FusionForge



More information about the evolvis-commits mailing list