From 5560d7707d2952165f699d5e9853f34520d0b115 Mon Sep 17 00:00:00 2001 From: ley Date: Wed, 20 Oct 2004 14:12:00 +0000 Subject: [PATCH] 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 --- debian/control | 3 ++- debian/control.in | 6 +++++- debian/libapache-mod-ngobjweb.postinst | 2 +- debian/rules | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 9fa58909..0de55194 100644 --- 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 d0cc9499..e29fb9f3 100644 --- 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 e0b94cf2..7b6575df 100755 --- 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 093a390f..a93760a2 100755 --- 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 -- 2.39.5