[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
- Previous message: [evolvis-commits] r18664: [#3203] wiki-1.19-files pending merges:↵ Thorsten Glaser 2012-09-27 [merge] merge integration branch again↵ Thorsten Glaser 2012-09-27 [#2992] fix (most) invalid XHTML in ViewVC↵ Thorsten Glaser 2012-09-21 regen↵ Thorsten Glaser 2012-09-21 [merge] merge from the integration branch↵ Thorsten Glaser 2012-09-20 update versions for those MW packages that ended up in the repo right...↵ Thorsten Glaser 2012-09-07 [merge] merge integration branch↵ Thorsten Glaser 2012-09-03 [merge] merge integration branch↵ Thorsten Glaser 2012-08-24 [merge] merge the integration branch↵ Thorsten Glaser 2012-08-24 check $argv better↵ Thorsten Glaser 2012-08-07 [merge] merge integration branch↵ Thorsten Glaser 2012-08-03 WHY U BE CENTURD?↵ Thorsten Glaser 2012-08-03 sync with latest possible uploads of MW and MW-extensions↵ Thorsten Glaser 2012-08-03 sanitie #ffErrors CSS handling (now only 2 places instead of 3)↵ Thorsten Glaser 2012-08-03 [merge] sync with integration branch↵ Thorsten Glaser 2012-08-03 deal with the pink-popup in mediawiki↵ Thorsten Glaser 2012-08-02 now add/offload FusionForge-specific CSS↵ Thorsten Glaser 2012-08-02 keep the EvolvisForge bar’s footer part↵ Thorsten Glaser 2012-08-02 get the copyright icon right↵ Thorsten Glaser 2012-08-02 apply the not-CSS part of our next skin attempt↵ Thorsten Glaser 2012-08-02 apply old patch on top of experimental new skin class↵ Thorsten Glaser 2012-08-02 lighter way to create the references, useful for 1.18+ themes only↵ Thorsten Glaser 2012-08-02 sort them files↵ Thorsten Glaser 2012-08-02 kill some of the monobook→fusionforge copying↵ Thorsten Glaser 2012-08-02 experimentally throw out this directory…↵ Thorsten Glaser 2012-08-02 make configs match each other↵ Thorsten Glaser 2012-08-02 since r10331 added a .php file to the list of allowed, nuke all not a...↵ Thorsten Glaser 2012-08-02 [merge] merge integration branch↵ Thorsten Glaser 2012-08-02 another place where we need to hook up new files↵ Thorsten Glaser 2012-08-01 GRAUGH! Wrong config file, again. There are *FIVE* of them.↵ Thorsten Glaser 2012-08-01 another sync for amount of files shipped with MW↵ Thorsten Glaser 2012-08-01 [merge] merge latest state of integration branch↵ Thorsten Glaser 2012-07-26 hum. why does this still not work? nor MonoBook, for that matter…↵ Thorsten Glaser 2012-07-26 drop unnecessary hackery and sys_use_mwframe↵ Thorsten Glaser 2012-07-26 fix the OutputPage wrangling↵ Thorsten Glaser 2012-07-26 merge code to deal with debian-specific MW patch↵ Thorsten Glaser 2012-07-26 regen↵ Thorsten Glaser 2012-07-26 <span dir=…> has no value "auto"↵ Thorsten Glaser 2012-07-26 this remaining hunk seems to be no longer needed↵ Thorsten Glaser 2012-07-26 port another missing patch↵ Thorsten Glaser 2012-07-26 [merge] merge the integration branch↵ Thorsten Glaser 2012-07-26 throw out wildcard rule which hurts me right now↵ Thorsten Glaser 2012-07-26 regenerate↵ Thorsten Glaser 2012-07-26 possibly add the forge’s CSS↵ Thorsten Glaser 2012-07-26 possibly port the extratitle part, cf.↵ Thorsten Glaser 2012-07-26 port disabling some footer links to 1.19 theme↵ Thorsten Glaser 2012-07-26 [merge] merge integration branch↵ Thorsten Glaser 2012-07-03 ensure this branch build is bigger than the rolled-out version↵ Thorsten Glaser 2012-07-02 [merge] merge the integration branch↵ Thorsten Glaser 2012-07-02 pre-PHP5.3 mediawiki unclean code workaround↵ Thorsten Glaser 2012-07-02 begin pimping MonoBook, some things missing↵ Thorsten Glaser 2012-07-02 pimp the main.css↵ Thorsten Glaser 2012-07-02 update the references and links from upstream 1.19 code↵ Thorsten Glaser 2012-07-02 in-situ changes: branch build warning in changelog; unclenched deps↵ Thorsten Glaser 2012-07-02 [merge] wiki pending merges:↵ Thorsten Glaser 2012-07-02 [merge] merge current state of the integration branch↵ Roland Mas 2012-06-15 Revert part of 10302; interwiki table is called just that in Evolvis↵ Roland Mas 2012-06-14 Fixed schema selection for cases where two wikis need to be created in the...↵ Roland Mas 2012-06-14 Only use addIdentifierQuotes if it exists↵ Roland Mas 2012-06-14 Fix interwiki table name↵ Thorsten Glaser 2012-06-06 mwenext call for mediawiki-math in experimental↵ Thorsten Glaser 2012-06-06 mediawik’o↵ Thorsten Glaser 2012-06-06 typo↵ Thorsten Glaser 2012-06-06 update copied files from 1.19↵ Thorsten Glaser 2012-06-06 MessagesEn based on 1.19, with 1.15 compat German layer↵ Thorsten Glaser 2012-06-06 the loadGroups() call is probably unused, and protected/private in 1.19↵ Thorsten Glaser 2012-06-06 DefaultSettings needs Defines loaded↵ Thorsten Glaser 2012-06-06 add even more crazy wrappers, for benefit of the upgrade code↵ Thorsten Glaser 2012-06-06 wrap DatabasePostgres::open() and append public to the search path↵ Thorsten Glaser 2012-06-06 PHP5 OOP constructors are now required↵ Thorsten Glaser 2012-06-06 somehow, this file ends up being included twice… workaround↵ Thorsten Glaser 2012-06-06 MW 1.19 extended DatabaseBase::tableName↵ Thorsten Glaser 2012-06-06 include the AutoLoader earlier, for 1.19 compat
- Next message: [evolvis-commits] r18666: synchronise these two scripts with each other
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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
- Previous message: [evolvis-commits] r18664: [#3203] wiki-1.19-files pending merges:↵ Thorsten Glaser 2012-09-27 [merge] merge integration branch again↵ Thorsten Glaser 2012-09-27 [#2992] fix (most) invalid XHTML in ViewVC↵ Thorsten Glaser 2012-09-21 regen↵ Thorsten Glaser 2012-09-21 [merge] merge from the integration branch↵ Thorsten Glaser 2012-09-20 update versions for those MW packages that ended up in the repo right...↵ Thorsten Glaser 2012-09-07 [merge] merge integration branch↵ Thorsten Glaser 2012-09-03 [merge] merge integration branch↵ Thorsten Glaser 2012-08-24 [merge] merge the integration branch↵ Thorsten Glaser 2012-08-24 check $argv better↵ Thorsten Glaser 2012-08-07 [merge] merge integration branch↵ Thorsten Glaser 2012-08-03 WHY U BE CENTURD?↵ Thorsten Glaser 2012-08-03 sync with latest possible uploads of MW and MW-extensions↵ Thorsten Glaser 2012-08-03 sanitie #ffErrors CSS handling (now only 2 places instead of 3)↵ Thorsten Glaser 2012-08-03 [merge] sync with integration branch↵ Thorsten Glaser 2012-08-03 deal with the pink-popup in mediawiki↵ Thorsten Glaser 2012-08-02 now add/offload FusionForge-specific CSS↵ Thorsten Glaser 2012-08-02 keep the EvolvisForge bar’s footer part↵ Thorsten Glaser 2012-08-02 get the copyright icon right↵ Thorsten Glaser 2012-08-02 apply the not-CSS part of our next skin attempt↵ Thorsten Glaser 2012-08-02 apply old patch on top of experimental new skin class↵ Thorsten Glaser 2012-08-02 lighter way to create the references, useful for 1.18+ themes only↵ Thorsten Glaser 2012-08-02 sort them files↵ Thorsten Glaser 2012-08-02 kill some of the monobook→fusionforge copying↵ Thorsten Glaser 2012-08-02 experimentally throw out this directory…↵ Thorsten Glaser 2012-08-02 make configs match each other↵ Thorsten Glaser 2012-08-02 since r10331 added a .php file to the list of allowed, nuke all not a...↵ Thorsten Glaser 2012-08-02 [merge] merge integration branch↵ Thorsten Glaser 2012-08-02 another place where we need to hook up new files↵ Thorsten Glaser 2012-08-01 GRAUGH! Wrong config file, again. There are *FIVE* of them.↵ Thorsten Glaser 2012-08-01 another sync for amount of files shipped with MW↵ Thorsten Glaser 2012-08-01 [merge] merge latest state of integration branch↵ Thorsten Glaser 2012-07-26 hum. why does this still not work? nor MonoBook, for that matter…↵ Thorsten Glaser 2012-07-26 drop unnecessary hackery and sys_use_mwframe↵ Thorsten Glaser 2012-07-26 fix the OutputPage wrangling↵ Thorsten Glaser 2012-07-26 merge code to deal with debian-specific MW patch↵ Thorsten Glaser 2012-07-26 regen↵ Thorsten Glaser 2012-07-26 <span dir=…> has no value "auto"↵ Thorsten Glaser 2012-07-26 this remaining hunk seems to be no longer needed↵ Thorsten Glaser 2012-07-26 port another missing patch↵ Thorsten Glaser 2012-07-26 [merge] merge the integration branch↵ Thorsten Glaser 2012-07-26 throw out wildcard rule which hurts me right now↵ Thorsten Glaser 2012-07-26 regenerate↵ Thorsten Glaser 2012-07-26 possibly add the forge’s CSS↵ Thorsten Glaser 2012-07-26 possibly port the extratitle part, cf.↵ Thorsten Glaser 2012-07-26 port disabling some footer links to 1.19 theme↵ Thorsten Glaser 2012-07-26 [merge] merge integration branch↵ Thorsten Glaser 2012-07-03 ensure this branch build is bigger than the rolled-out version↵ Thorsten Glaser 2012-07-02 [merge] merge the integration branch↵ Thorsten Glaser 2012-07-02 pre-PHP5.3 mediawiki unclean code workaround↵ Thorsten Glaser 2012-07-02 begin pimping MonoBook, some things missing↵ Thorsten Glaser 2012-07-02 pimp the main.css↵ Thorsten Glaser 2012-07-02 update the references and links from upstream 1.19 code↵ Thorsten Glaser 2012-07-02 in-situ changes: branch build warning in changelog; unclenched deps↵ Thorsten Glaser 2012-07-02 [merge] wiki pending merges:↵ Thorsten Glaser 2012-07-02 [merge] merge current state of the integration branch↵ Roland Mas 2012-06-15 Revert part of 10302; interwiki table is called just that in Evolvis↵ Roland Mas 2012-06-14 Fixed schema selection for cases where two wikis need to be created in the...↵ Roland Mas 2012-06-14 Only use addIdentifierQuotes if it exists↵ Roland Mas 2012-06-14 Fix interwiki table name↵ Thorsten Glaser 2012-06-06 mwenext call for mediawiki-math in experimental↵ Thorsten Glaser 2012-06-06 mediawik’o↵ Thorsten Glaser 2012-06-06 typo↵ Thorsten Glaser 2012-06-06 update copied files from 1.19↵ Thorsten Glaser 2012-06-06 MessagesEn based on 1.19, with 1.15 compat German layer↵ Thorsten Glaser 2012-06-06 the loadGroups() call is probably unused, and protected/private in 1.19↵ Thorsten Glaser 2012-06-06 DefaultSettings needs Defines loaded↵ Thorsten Glaser 2012-06-06 add even more crazy wrappers, for benefit of the upgrade code↵ Thorsten Glaser 2012-06-06 wrap DatabasePostgres::open() and append public to the search path↵ Thorsten Glaser 2012-06-06 PHP5 OOP constructors are now required↵ Thorsten Glaser 2012-06-06 somehow, this file ends up being included twice… workaround↵ Thorsten Glaser 2012-06-06 MW 1.19 extended DatabaseBase::tableName↵ Thorsten Glaser 2012-06-06 include the AutoLoader earlier, for 1.19 compat
- Next message: [evolvis-commits] r18666: synchronise these two scripts with each other
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the evolvis-commits
mailing list