[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_2-26-g10553d8

[Stefan Hornburg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  10553d859807d757c7eb80dd0b483700a19b05cd (commit)
       via  c60158438ca54e78b9e675fe7951e5eeeeea2da5 (commit)
      from  f5a17d86642e6b02fb0043b70353056eb109b029 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10553d859807d757c7eb80dd0b483700a19b05cd
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Thu Oct 29 12:08:53 2009 +0100

    added recent changes

commit c60158438ca54e78b9e675fe7951e5eeeeea2da5
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Thu Oct 29 12:07:46 2009 +0100

    moved CSS and image files for UI from /var/www/interchange-5 to
    /usr/share/interchange-ui

-----------------------------------------------------------------------

Summary of changes and diff:
 MANIFEST                      |    2 ++
 README.debian                 |    7 +++++++
 debian/NEWS                   |    8 ++++++++
 debian/changelog              |    7 ++++++-
 debian/interchange-ui.conf    |    1 +
 debian/interchange-ui.install |    3 ++-
 debian/rules                  |    7 +++++--
 7 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 debian/NEWS
 create mode 100644 debian/interchange-ui.conf

diff --git a/MANIFEST b/MANIFEST
index 1ec345d..e4d79b6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -350,6 +350,7 @@ debian/interchange-cat-standard.postinst
 debian/interchange-cat-standard.postrm
 debian/interchange-cat-standard.prerm
 debian/interchange-cat-standard.templates
+debian/interchange-ui.conf
 debian/interchange-ui.config
 debian/interchange-ui.install
 debian/interchange-ui.postinst
@@ -374,6 +375,7 @@ debian/interchange.wrapper
 debian/interchangeconfig
 debian/makecat.cfg
 debian/makecat.wrapper
+debian/NEWS
 debian/po/cs.po
 debian/po/de.po
 debian/po/eu.po
diff --git a/README.debian b/README.debian
index 344b19c..dcd99a9 100644
--- a/README.debian
+++ b/README.debian
@@ -41,6 +41,13 @@ Standard Demo
 For the administration of the standard demo (interchange-cat-standard
 package) a secure webserver (https://) is required.
 
+UI
+==
+
+CSS and image files are installed in /usr/share/interchange-ui.
+A configuration snippet for Apache with a corresponding alias is 
+located in /etc/apache2/conf.d/interchange-ui.conf.
+
 Other Notes
 ===========
 
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..c91e055
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,8 @@
+interchange-ui (5.7.3-1) unstable; urgency=low
+
+  * Moved CSS and image files from /var/www/interchange-5 to
+    /usr/share/interchange-ui.  A configuration snippet for Apache has
+    been added at /etc/apache2/conf.d/interchange-ui.conf.
+
+ -- Stefan Hornburg (Racke) <racke at linuxia.de>  Thu, 29 Oct 2009 11:17:50 +0100
+
diff --git a/debian/changelog b/debian/changelog
index c1919d9..f724a2c 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 interchange (5.7.3-1) unstable; urgency=low
 
   * new upstream release
+  * use virtual host instead of system hostname as server name for the
+    demo catalog if FullUrl is enabled
+  * keep virtual host name supplied by the user
+  * moved CSS and image files for UI from /var/www/interchange-5 to
+    /usr/share/interchange-ui
   * updated translations of Debconf templates 
     - Swedish (Closes: #551948, Martin Bagge <brother at bsnet.se>)
     - German (Closes: #548512, Helge Kreutzmann <debian at helgefjell.de>)
@@ -15,7 +20,7 @@ interchange (5.7.3-1) unstable; urgency=low
     - added -e flag to maintainer scripts
     - create /var/run/interchange at runtime
   
- -- Stefan Hornburg (Racke) <racke at linuxia.de>  Tue, 27 Oct 2009 22:30:11 +0100
+ -- Stefan Hornburg (Racke) <racke at linuxia.de>  Thu, 29 Oct 2009 12:08:31 +0100
 
 interchange (5.7.2-1) unstable; urgency=low
 
diff --git a/debian/interchange-ui.conf b/debian/interchange-ui.conf
new file mode 100644
index 0000000..7f09baa
--- /dev/null
+++ b/debian/interchange-ui.conf
@@ -0,0 +1 @@
+Alias /interchange-5 /usr/share/interchange-ui
\ No newline at end of file
diff --git a/debian/interchange-ui.install b/debian/interchange-ui.install
index db1195f..f64749c 100644
--- a/debian/interchange-ui.install
+++ b/debian/interchange-ui.install
@@ -1,3 +1,4 @@
 usr/lib/interchange/code/UI_Tag
 usr/lib/interchange/lib/UI
-var/www/interchange-5
+usr/share/interchange-ui
+
diff --git a/debian/rules b/debian/rules
index 26c8980..b1cd007 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,9 +99,12 @@ install: build
 	mkdir -p $(TMP)/usr/lib/interchange/src
 	for file in dist/src/*; do if test -f $$file; then cp $$file $(TMP)/usr/lib/interchange/src; fi; done
 # UI images and stuff
-	mkdir -p $(TMP)/var/www/interchange-5
-	for dir in $(TMP)/usr/lib/interchange/share/interchange-5/*; do mv $$dir $(TMP)/var/www/interchange-5; done
+	mkdir -p $(TMP)/usr/share/interchange-ui
+	for dir in $(TMP)/usr/lib/interchange/share/interchange-5/*; do mv $$dir $(TMP)/usr/share/interchange-ui; done
 	rm -r $(TMP)/usr/lib/interchange/share/interchange-5
+# Apache configuration file snippet for interchange-ui package
+	mkdir -p $(TMP)/etc/apache2/conf.d
+	install -m 0644 debian/interchange-ui.conf $(TMP)/etc/apache2/conf.d 
 # remove unneeded stuff
 	rm $(TMP)/usr/lib/interchange/error.log
 	rm $(TMP)/usr/lib/interchange/*.pl


hooks/post-receive
-- 
Interchange