Disabled integration with Apache 2 since Memories does not yet work correctly with it.

diff --git a/debian/changelog b/debian/changelog
index 7013be653c310f7a34a19c981b3f2b8f2021da5b..3e6012c2455ff3cdcde956cf63cfde7c5f05305f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+memories (1.2-4) unstable; urgency=low
+
+  * Disabled integration with Apache 2 since Memories does not yet work
+    correctly with it
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Thu,  6 Apr 2006 23:14:45 +0100
+
 memories (1.2-3) unstable; urgency=low
 
   * Fixed and overrode linda and lintian warnings as appropriate

diff --git a/debian/control b/debian/control
index 441027398cab6abcc9d30709cf0245eec8b85b52..b4174ff31473416d28665a22bb259e3e41ef07b5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.2
 Package: memories
 Architecture: all
 Depends: ${perl:Depends}, libapache-session-perl, libcache-cache-perl, libcalendar-simple-perl, libclass-dbi-mysql-perl, libclass-dbi-perl, libclass-dbi-plugin-pager-perl, libdbd-mysql-perl, libhtml-tagcloud-perl, libimage-exiftool-perl, libimage-imlib2-perl, libimage-info-perl, libmaypole-perl, libmaypole-plugin-authentication-usersessioncookie-perl, libmaypole-plugin-upload-perl, libtime-piece-perl, libxml-rss-perl
-Recommends: libapache-mod-perl | libapache2-mod-perl2
+Recommends: libapache-mod-perl
 Description: a web-based photo sharing application
  Memories allows multiple users to browse and share photos.  Each
  user's photos can be seen in blog format or as albums.  Each photo can

diff --git a/debian/memories.postinst b/debian/memories.postinst
index c64a337a0f911c01344a4460e5afadd2ce0529ab..1d9ef95c2d1852065ace17d2eb2e45b7df8c52e8 100755 (executable)
--- a/debian/memories.postinst
+++ b/debian/memories.postinst
@@ -15,10 +15,10 @@ if [ "x$1" = xconfigure ]; then
             invoke-rc.d $server force-reload
         fi
     done
-    # Module configuration is different in the apache2 package.
-    if [ -e /etc/apache2/mods-enabled/perl.load -a \
-         \! -e /etc/apache2/conf.d/memories ]; then
-        ln -s ../../memories/apache.conf /etc/apache2/conf.d/memories
+
+    # Disable currently broken integration with Apache 2
+    if [ -L /etc/apache2/conf.d/memories ]; then
+        rm /etc/apache2/conf.d/memories
         invoke-rc.d apache2 force-reload
     fi