From f5c1a6037dd91aeeb3d199181d1d99135d9c2f9e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 6 Apr 2006 22:15:50 +0000
Subject: [PATCH] Disabled integration with Apache 2 since Memories does not
 yet work correctly with it.

---
 debian/changelog         | 7 +++++++
 debian/control           | 2 +-
 debian/memories.postinst | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7013be6..3e6012c 100644
--- 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 4410273..b4174ff 100644
--- 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 c64a337..1d9ef95 100755
--- 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
 
-- 
2.39.5