gnomeweb-wml r6439 - in trunk: . www.gnome.org www.gnome.org/press/releases www.gnome.org/press/releases/2.12 www.gnome.org/press/releases/2.12/docbook www.gnome.org/press/releases/2.14 www.gnome.org/press/releases/2.14/docbook www.gnome.org/start www.gnome.org/start/2.12/press_release www.gnome.org/start/2.14/press_release



Author: murrayc
Date: Mon Nov  3 15:30:49 2008
New Revision: 6439
URL: http://svn.gnome.org/viewvc/gnomeweb-wml?rev=6439&view=rev

Log:
2008-11-03  Murray Cumming  <murrayc murrayc com>

* configure.in:
* www.gnome.org/start/Makefile.am:
* www.gnome.org/start/2.12/press_release/: Moved to:
* www.gnome.org/press/releases/2.12/
* www.gnome.org/start/2.14/press_release/: Moved to:
* www.gnome.org/press/releases/2.14/

* www.gnome.org/htaccess: Redirected appropriately.

Added:
   trunk/www.gnome.org/press/releases/2.12/   (props changed)
      - copied from r6431, /trunk/www.gnome.org/start/2.12/press_release/
   trunk/www.gnome.org/press/releases/2.14/   (props changed)
      - copied from r6431, /trunk/www.gnome.org/start/2.14/press_release/
Removed:
   trunk/www.gnome.org/start/2.12/press_release/
   trunk/www.gnome.org/start/2.14/press_release/
   trunk/www.gnome.org/start/schedule-2.17.ics
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/www.gnome.org/htaccess
   trunk/www.gnome.org/press/releases/2.12/Makefile.am
   trunk/www.gnome.org/press/releases/2.12/docbook/Makefile.am
   trunk/www.gnome.org/press/releases/2.14/Makefile.am
   trunk/www.gnome.org/press/releases/2.14/docbook/Makefile.am
   trunk/www.gnome.org/press/releases/Makefile.am
   trunk/www.gnome.org/start/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Nov  3 15:30:49 2008
@@ -33,11 +33,6 @@
 www.gnome.org/mobile/Makefile
 www.gnome.org/support/Makefile
 www.gnome.org/start/Makefile
-www.gnome.org/start/2.12/press_release/Makefile
-www.gnome.org/start/2.12/press_release/docbook/Makefile
-www.gnome.org/start/2.14/Makefile
-www.gnome.org/start/2.14/press_release/Makefile
-www.gnome.org/start/2.14/press_release/docbook/Makefile
 www.gnome.org/projects/Makefile
 www.gnome.org/projects/accessibility/Makefile
 www.gnome.org/projects/accessibility/images/Makefile
@@ -286,6 +281,10 @@
 www.gnome.org/learn/Makefile
 www.gnome.org/press/Makefile
 www.gnome.org/press/releases/Makefile
+www.gnome.org/press/releases/2.12/Makefile
+www.gnome.org/press/releases/2.12/docbook/Makefile
+www.gnome.org/press/releases/2.14/Makefile
+www.gnome.org/press/releases/2.14/docbook/Makefile
 www.gnome.org/faqs/Makefile
 www.gnome.org/contact/Makefile
 www.gnome.org/softwaremap/Makefile

Modified: trunk/www.gnome.org/htaccess
==============================================================================
--- trunk/www.gnome.org/htaccess	(original)
+++ trunk/www.gnome.org/htaccess	Mon Nov  3 15:30:49 2008
@@ -5,13 +5,14 @@
 Redirect /start/unstable/schedule.ics    http://www.gnome.org/start/schedule-unstable.ics
 Redirect /start/unstable                 http://live.gnome.org/TwoPointTwentyfive
 # For old release notes (2.12 and 2.14 are handled separately because they have a press release):
+RedirectMatch ^/start/(2\.12])/press_release   /press/releases/2.12
+RedirectMatch ^/start/(2\.14])/press_release   /press/releases/2.14
 RedirectMatch ^/start/(2\.[13579])       /start/unstable/
 RedirectMatch ^/start/(2\.1[13579])      /start/unstable/
-RedirectMatch ^/start/(2\.1[24])/notes   http://library.gnome.org/misc/release-notes/$1
-RedirectMatch ^/start/(2\.1[024])/?$     http://library.gnome.org/misc/release-notes/$1
-RedirectMatch ^/start/(2\.1[68])         http://library.gnome.org/misc/release-notes/$1
-RedirectMatch ^/start/(2\.2[024])        http://library.gnome.org/misc/release-notes/$1
+RedirectMatch ^/start/(2\.2[13579])      /start/unstable/
 RedirectMatch ^/start/(2\.[02468])       http://library.gnome.org/misc/release-notes/$1
+RedirectMatch ^/start/(2\.1[02468])/?$     http://library.gnome.org/misc/release-notes/$1
+RedirectMatch ^/start/(2\.2[02468])        http://library.gnome.org/misc/release-notes/$1
 
 # Press
 RedirectMatch /pressreleases.html$      /press/

Modified: trunk/www.gnome.org/press/releases/2.12/Makefile.am
==============================================================================
--- /trunk/www.gnome.org/start/2.12/press_release/Makefile.am	(original)
+++ trunk/www.gnome.org/press/releases/2.12/Makefile.am	Mon Nov  3 15:30:49 2008
@@ -1,7 +1,7 @@
 
 SUBDIRS = docbook
 
-urlpath = /start/2.12/press_release
+urlpath = /press/releases/2.12
 
 page_SCRIPTS=
 page_DATA =
@@ -10,7 +10,7 @@
 
 
 # Get DOC_INCLUDES and DOC_LINGUAS
-include $(top_srcdir)/www.gnome.org/start/2.12/press_release/docbook/Makefile_shared.am_fragment
+include $(top_srcdir)/www.gnome.org/press/releases/2.12/docbook/Makefile_shared.am_fragment
 
 
 VERSION = 2.12

Modified: trunk/www.gnome.org/press/releases/2.12/docbook/Makefile.am
==============================================================================
--- /trunk/www.gnome.org/start/2.12/press_release/docbook/Makefile.am	(original)
+++ trunk/www.gnome.org/press/releases/2.12/docbook/Makefile.am	Mon Nov  3 15:30:49 2008
@@ -1,10 +1,10 @@
 PKG_CONFIG=pkg-config
-include $(top_srcdir)/www.gnome.org/start/2.12/press_release/docbook/gnome-doc-utils.make
+include $(top_srcdir)/www.gnome.org/press/releases/2.12/docbook/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = press_release
 
 # Get DOC_INCLUDES and DOC_LINGUAS
-include $(top_srcdir)/www.gnome.org/start/2.12/press_release/docbook/Makefile_shared.am_fragment
+include $(top_srcdir)/www.gnome.org/press/releases/2.12/docbook/Makefile_shared.am_fragment
 
 SUBDIRS = 

Modified: trunk/www.gnome.org/press/releases/2.14/Makefile.am
==============================================================================
--- /trunk/www.gnome.org/start/2.14/press_release/Makefile.am	(original)
+++ trunk/www.gnome.org/press/releases/2.14/Makefile.am	Mon Nov  3 15:30:49 2008
@@ -1,7 +1,7 @@
 
 SUBDIRS = docbook
 
-urlpath = /start/2.14/press_release
+urlpath = /press/releases/2.14
 
 page_SCRIPTS=
 page_DATA =
@@ -10,7 +10,7 @@
 
 
 # Get DOC_INCLUDES and DOC_LINGUAS
-include $(top_srcdir)/www.gnome.org/start/2.14/press_release/docbook/Makefile_shared.am_fragment
+include $(top_srcdir)/www.gnome.org/press/releases/2.14/docbook/Makefile_shared.am_fragment
 
 
 VERSION = 2.14

Modified: trunk/www.gnome.org/press/releases/2.14/docbook/Makefile.am
==============================================================================
--- /trunk/www.gnome.org/start/2.14/press_release/docbook/Makefile.am	(original)
+++ trunk/www.gnome.org/press/releases/2.14/docbook/Makefile.am	Mon Nov  3 15:30:49 2008
@@ -1,10 +1,10 @@
 PKG_CONFIG=pkg-config
-include $(top_srcdir)/www.gnome.org/start/2.14/press_release/docbook/gnome-doc-utils.make
+include $(top_srcdir)/www.gnome.org/press/releases/2.14/docbook/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = press_release
 
 # Get DOC_INCLUDES and DOC_LINGUAS
-include $(top_srcdir)/www.gnome.org/start/2.14/press_release/docbook/Makefile_shared.am_fragment
+include $(top_srcdir)/www.gnome.org/press/releases/2.14/docbook/Makefile_shared.am_fragment
 
 SUBDIRS = 

Modified: trunk/www.gnome.org/press/releases/Makefile.am
==============================================================================
--- trunk/www.gnome.org/press/releases/Makefile.am	(original)
+++ trunk/www.gnome.org/press/releases/Makefile.am	Mon Nov  3 15:30:49 2008
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = 2.12 2.14
 
 urlpath = /press/releases
 

Modified: trunk/www.gnome.org/start/Makefile.am
==============================================================================
--- trunk/www.gnome.org/start/Makefile.am	(original)
+++ trunk/www.gnome.org/start/Makefile.am	Mon Nov  3 15:30:49 2008
@@ -1,8 +1,3 @@
-## Ancient SUBDIRS that we don't want included because regenerating
-## release notes every freakin' build really, really sucks; they
-## should just be considered static.
-STATIC_SUBDIRS = 2.12 2.14
-
 ## SUBDIRS we want to still be regenerated
 SUBDIRS = 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]