Cleanups:

- Add missing dependencies
- Remove spurious mod_ngobjweb config file

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@285 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/debian/control b/debian/control
index 9fa5890971979047ec859def2b80166cebd7fabf..0de55194023fecbca26ea6cbc97c514a7bcec4b5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Package: libsope-appserver4.3-dev
 Section: libdevel
 Architecture: any
 Provides: libsope-appserver-dev
-Conflicts: libsope-appserver-dev
+Conflicts: libsope-appserver-dev, libsope-dev
+Replaces: libsope-dev
 Depends: libsope-appserver4.3 (= ${Source-Version})
 Description: Development files for the SOPE application server libraries
  SOPE is a framework for developing web applications and services. The

diff --git a/debian/control.in b/debian/control.in
index d0cc9499aa208479d6b14ca70a1cd964c6daaac0..e29fb9f313de124ed019dee8f83f7c3c7b36cb08 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,8 @@ Package: libsope-appserver_SOPEVER_-dev
 Section: libdevel
 Architecture: any
 Provides: libsope-appserver-dev
-Conflicts: libsope-appserver-dev
+Conflicts: libsope-appserver-dev, libsope-dev
+Replaces: libsope-dev
 Depends: libsope-appserver_SOPEVER_ (= ${Source-Version})
 Description: Development files for the SOPE application server libraries
  SOPE is a framework for developing web applications and services. The
@@ -223,6 +224,7 @@ Package: sope_SOPEVER_-stxsaxdriver
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: sope-stxsaxdriver
 Description: Structured Text Parser for SOPE's SAX engine
  SOPE is a framework for developing web applications and services. The
  name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
@@ -233,6 +235,7 @@ Package: sope_SOPEVER_-libxmlsaxdriver
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: sope-libxmlsaxdriver
 Description: XML Parser for SOPE's SAX engine
  SOPE is a framework for developing web applications and services. The
  name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
@@ -243,6 +246,7 @@ Package: sope_SOPEVER_-icalsaxdriver
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: sope-icalsaxdriver
 Description: iCal Parser for SOPE's SAX engine
  SOPE is a framework for developing web applications and services. The
  name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.

diff --git a/debian/libapache-mod-ngobjweb.postinst b/debian/libapache-mod-ngobjweb.postinst
index e0b94cf2458ad04d627ac29b0ceb9f57f39ad84c..7b6575df5583ebb4465eca5c57fb3f3db90d0edf 100755 (executable)
--- a/debian/libapache-mod-ngobjweb.postinst
+++ b/debian/libapache-mod-ngobjweb.postinst
@@ -7,7 +7,7 @@ for i in apache apache-perl apache-ssl; do
         modules-config $i enable mod_ngobjweb
     fi
     if [ -d /etc/$i/conf.d ]; then
-        ucf --three-way /usr/share/opengroupware.org/mod_ngobjweb/mod_ngobjweb.conf /etc/$i/conf.d/mod_ngobjweb
+        ucf --purge /etc/$i/conf.d/mod_ngobjweb
     fi
     if [ -x /usr/sbin/invoke-rc.d ] && [ -x /etc/init.d/$i ]; then
         invoke-rc.d $i force-reload || true

diff --git a/debian/rules b/debian/rules
index 093a390ff23d330e3073292121819b4ba5b8ac36..a93760a236ba676e17537e2c9d39e21f1977d6b3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -144,7 +144,7 @@ binary-arch: build install
        dh_makeshlibs -V
        dh_installdeb
        dh_shlibdeps -L libsope-appserver$(SOPEVER) -L libsope-xml$(SOPEVER) -L libsope-mime$(SOPEVER) \
-               -L libsope-ical$(SOPEVER) -L libsope-ldap$(SOPEVER) -L libsope-gnustep-db$(GDL1VER) \
+               -L libsope-ical$(SOPEVER) -L libsope-ldap$(SOPEVER) -L libsope-gdl1-$(GDL1VER) \
                -l debian/tmp/usr/lib
        dh_gencontrol
        dh_md5sums