From 568ea135699a47a3286106356fb9928ad10adc5f Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Mon, 20 Jul 2009 02:41:10 +0000
Subject: [PATCH] Added compiling-from-source directions.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@854 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 web/doc/index.php             | 19 +++++++----
 web/doc/install-src/index.php | 64 +++++++++++++++++++++++++++++++++++
 web/download/index.php        | 27 ++++++++++-----
 web/index.php                 | 29 ++++++++++++++--
 web/links/index.php           |  1 +
 web/news/index.php            | 29 ++++++++++++++--
 6 files changed, 148 insertions(+), 21 deletions(-)
 create mode 100755 web/doc/install-src/index.php

diff --git a/web/doc/index.php b/web/doc/index.php
index 1293ceda..59053f75 100644
--- a/web/doc/index.php
+++ b/web/doc/index.php
@@ -7,6 +7,18 @@
 
 
 
+<h2>Installing gLabels from source</h2>
+<p>
+The easiest way to install glabels is to use you distribution's package repository.  However, if the version
+offered by your distribution is not the latest stable version, you may wish to install it manually from
+source.
+</p>
+<ul>
+  <li><?a("install-src/","Installing gLabels from Source");?></li>
+</ul>
+
+
+
 <h2>Customizing</h2>
 <p>
 gLabels knows about a small universe of label/card stationery. You may create new templates by using the <i>Template Designer</i> under the <i>File</i> menu.
@@ -17,12 +29,7 @@ If for some reason you wish to manually create templates, please read the approp
 for possible inclusion in future releases of gLabels. 
 </p>
 <ul>
-  <li>
-    <div class="latest">
-      <?a("templates-2.2/","Designing Custom Templates for gLabels 2.2.x");?>
-    </div>
-  </li>
-
+  <li><?a("templates-2.2/","Designing Custom Templates for gLabels 2.2.x");?></li>
 </ul>
 
 
diff --git a/web/doc/install-src/index.php b/web/doc/install-src/index.php
new file mode 100755
index 00000000..5ef4227c
--- /dev/null
+++ b/web/doc/install-src/index.php
@@ -0,0 +1,64 @@
+<?php include "../../common_php.inc"; ?>
+
+<?php gLabelsHeader("docs"); ?>
+
+<h1 class="doc">Installing gLabels from Source</h1>
+
+<p>
+The following outlines how to install glabels from source on various GNU/Linux distributions.
+</p>
+
+
+<h2>Prerequisites</h2>
+
+<p>
+Dependencies will need to be installed as root.
+Although dependecies can be installed using your distribution's graphical package manager, the directions below use command line tools because it is easier to convey.
+</p>
+
+<h4>Fedora and similar distributions</h4>
+<div class="codebox">$ su
+Password:
+# yum groupinstall "Development Tools"
+# yum groupinstall "GNOME Software Development"
+</div>
+
+<h4>Ubuntu and similar distributions</h4>
+<div class="codebox">$ sudo apt-get install libgtk2.0-dev libgnomeui-dev libxml2-dev libglade2-dev
+$ sudo apt-get install libebook1.2-dev <i>(optional)</i>
+</div>
+
+<p>
+The exact dependencies and their names may vary with different distributions and versions.  There may also be additional dependencies depending on the baseline configuation of your distribution.  If <tt>./configure</tt> in the following step complains, you may need to return to this step and install additional dependencies.
+</p>
+
+
+<h2>Unpack and Build</h2>
+
+<p>This step should not vary with distribution.</p>
+
+<div class="codebox">$ tar xvfz glabels-2.2.x.tar.gz
+$ cd glabels-2.2.x
+$ ./configure
+$ make
+</div>
+
+
+<h2>Install</h2>
+
+<p>
+Installation will need to be done as root.
+</p>
+
+<h4>Fedora and similar distributions</h4>
+<div class="codebox">$ su
+Password:
+# make install
+</div>
+
+<h4>Ubuntu and similar distributions</h4>
+<div class="codebox">$ sudo make install
+</div>
+
+
+<?php gLabelsFooter(); ?>
diff --git a/web/download/index.php b/web/download/index.php
index c3e1e9dd..a6a3e31f 100644
--- a/web/download/index.php
+++ b/web/download/index.php
@@ -7,7 +7,6 @@
 
 
 
-
 <h2>System Requirements</h2>
 <p>
 gLabels is designed to run on <i>GNOME 2.16+</i>, but more specifically it requires the following libraries or newer.
@@ -30,9 +29,10 @@ Just having the base library packages installed is not enough.
 <ul>
   <li>
     <div class="latest">
-      <?a_sfdownload("glabels-2.2.4.tar.gz");?> (latest version)
+      <?a_sfdownload("glabels-2.2.5.tar.gz");?> (latest version)
     </div>
   </li>
+  <li><?a_sfdownload("glabels-2.2.4.tar.gz");?></li>
   <li><?a_sfdownload("glabels-2.2.3.tar.gz");?></li>
   <li><?a_sfdownload("glabels-2.2.2.tar.gz");?></li>
   <li><?a_sfdownload("glabels-2.2.1.tar.gz");?></li>
@@ -45,16 +45,19 @@ Just having the base library packages installed is not enough.
 
 <h2>Third party packages</h2>
 <p>
-gLabels is currently available for most popular GNU/Linux distributions through
-their associated repositories, including the following repositories:
+If you are not up to <?a("/doc/install-src/", "building and installing gLabels from source");?>, you may be able to use a third party package.  gLabels is currently available for many popular GNU/Linux and BSD distributions through
+their associated repositories, including the following distributions and repositories:
 </p>
 <ul>
-  <li>Debian</li>
-  <li>Fedora Extras</li>
-  <li><?a("http://www.getdeb.net/app/gLabels","Getdeb for Ubuntu (and derived) GNU/Linux distributions");?></li>
+	  <li>Debian</li>
+	  <li>Fedora</li>
+	  <li>Ubuntu</li>
+	  <li>Gentoo</li>
+	  <li><?a("http://www.getdeb.net/app/gLabels","Getdeb for Ubuntu (and derived) GNU/Linux distributions");?></li>
 </ul>
-<p></p>
-
+<p>
+Some of these packages are more up to date than others.  If you experience bugs or problems with a third party package that is not based on the most recent stable version, please contact the package maintainer and urge them to update as soon as possible.
+</p>
 
 
 
@@ -97,6 +100,12 @@ the following command.
 <div class="codebox">$  svn co https://glabels.svn.sourceforge.net/svnroot/glabels/trunk/glabels2
 </div>
 <p>
+The latest snapshot of the gLabels stable branch also can be checked out through subversion with
+the following command.
+</p>
+<div class="codebox">$  svn co https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2/glabels2
+</div>
+<p>
 More information can be found at the <?a("http://sourceforge.net/svn/?group_id=46122","gLabels subversion page at Sourceforge");?>.
 </p>
 <ul>
diff --git a/web/index.php b/web/index.php
index d494d5a3..96917f20 100644
--- a/web/index.php
+++ b/web/index.php
@@ -19,6 +19,32 @@ you'll find at most office supply stores. gLabels is free software and is distri
 
 
 
+<div class="newsitem">
+<div class="newsdate">30 April 2009</div>
+<div class="newstitle">Release 2.2.5 (Stable)</div>
+<p>
+Packagers:  please update to this version as soon as possible.  This release fixes a set of problems
+that made glabels unusable on the latest distributions which use Gnome 2.26/Gtk 2.16.
+</p>
+<p>
+Changes/fixes since 2.2.4 include
+</p>
+<ul>
+<li>Fixed spinbutton/adjustment bugs that made glabels unusable with Gtk 2.16.</li>
+<li>Fixed default preview colors in color combos.</li>
+<li>Updated german translation (Mario Blättermann).</li>
+<li>New templates.</li>
+</ul>
+<p>
+<?a("/download/","Download here");?>.
+</p>
+</div>
+
+
+
+
+
+
 <div class="newsitem">
 <div class="newsdate">22 December 2008</div>
 <div class="newstitle">Release 2.2.4 (Stable)</div>
@@ -33,9 +59,6 @@ Changes/fixes since 2.2.3 include
 <li>Fixed performacne problem when many objects are selected.</li>
 <li>New templates.</li>
 </ul>
-<p>
-<?a("/download/","Download here");?>.
-</p>
 </div>
 
 
diff --git a/web/links/index.php b/web/links/index.php
index 9a49f080..348d93b4 100644
--- a/web/links/index.php
+++ b/web/links/index.php
@@ -22,6 +22,7 @@
       <ul>
         <li><?a("http://sourceforge.net/projects/glabels","gLabels Sourceforge Project Page");?></li>
         <li><?a("http://freshmeat.net/projects/glabels","gLabels Freshmeat Project Page");?></li>
+        <li><?a("http://www.ohloh.net/p/glabels","gLabels Ohloh Project Page");?></li>
 	<li><?a("http://gnomefiles.org/app.php?soft_id=254", "gLabels GNOME Files Page");?></li>
 	<li><?a("http://lists.sourceforge.net/lists/listinfo/glabels-devel","gLabels Developers Mail List");?></li>
 	<li><?a("http://lists.sourceforge.net/lists/listinfo/glabels-templates","gLabels Templates Mail List");?></li>
diff --git a/web/news/index.php b/web/news/index.php
index da69a784..9135a062 100644
--- a/web/news/index.php
+++ b/web/news/index.php
@@ -7,6 +7,32 @@
 
 
 
+<div class="newsitem">
+<div class="newsdate">30 April 2009</div>
+<div class="newstitle">Release 2.2.5 (Stable)</div>
+<p>
+Packagers:  please update to this version as soon as possible.  This release fixes a set of problems
+that made glabels unusable on the latest distributions which use Gnome 2.26/Gtk 2.16.
+</p>
+<p>
+Changes/fixes since 2.2.4 include
+</p>
+<ul>
+<li>Fixed spinbutton/adjustment bugs that made glabels unusable with Gtk 2.16.</li>
+<li>Fixed default preview colors in color combos.</li>
+<li>Updated german translation (Mario Blättermann).</li>
+<li>New templates.</li>
+</ul>
+<p>
+<?a("/download/","Download here");?>.
+</p>
+</div>
+
+
+
+
+
+
 <div class="newsitem">
 <div class="newsdate">22 December 2008</div>
 <div class="newstitle">Release 2.2.4 (Stable)</div>
@@ -21,9 +47,6 @@ Changes/fixes since 2.2.3 include
 <li>Fixed performacne problem when many objects are selected.</li>
 <li>New templates.</li>
 </ul>
-<p>
-<?a("/download/","Download here");?>.
-</p>
 </div>
 
 
-- 
2.39.5