From 6e1062e8a8cc196647a02a3fb1d26cd5e35207e4 Mon Sep 17 00:00:00 2001 From: ley Date: Fri, 12 Nov 2004 00:51:57 +0000 Subject: [PATCH] Remove all traces of a separate SO Version for gnustep-db. Is now the same as SOPE. git-svn-id: http://svn.opengroupware.org/SOPE/trunk@361 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- debian/changelog | 4 ++-- debian/control.in | 6 +++--- ...-dev.install => libsope-gdl1-_SOPEVER_-dev.install} | 0 ...GDL1VER_.install => libsope-gdl1-_SOPEVER_.install} | 0 debian/rules | 10 ++-------- 5 files changed, 7 insertions(+), 13 deletions(-) rename debian/{libsope-gdl1-_GDL1VER_-dev.install => libsope-gdl1-_SOPEVER_-dev.install} (100%) rename debian/{libsope-gdl1-_GDL1VER_.install => libsope-gdl1-_SOPEVER_.install} (100%) diff --git a/debian/changelog b/debian/changelog index 3570cc06..32be1454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ sope (4.5.0-1) UNRELEASED; urgency=low - * New upstream release + * New upstream release - -- Sebastian Ley Wed, 10 Nov 2004 12:08:56 +0100 + -- Sebastian Ley Fri, 12 Nov 2004 01:50:44 +0100 sope (4.3.9-1) experimental; urgency=low diff --git a/debian/control.in b/debian/control.in index bdb1f369..416fc4a4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -183,12 +183,12 @@ Description: SOPE libraries for iCal handling The SOPE libraries for iCal handling contain classes for iCalendar and vCard objects. -Package: libsope-gdl1-_GDL1VER_-dev +Package: libsope-gdl1-_SOPEVER_-dev Section: libdevel Architecture: any Provides: libsope-gdl1-dev Conflicts: libsope-gdl1-dev -Depends: libsope-gdl1-_GDL1VER_ (= ${Source-Version}) +Depends: libsope-gdl1-_SOPEVER_ (= ${Source-Version}) Description: Development files for the GNUstep database libraries SOPE is a framework for developing web applications and services. The name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE. @@ -196,7 +196,7 @@ Description: Development files for the GNUstep database libraries This package contains the header files for SOPE's fork of the GNUstep database libraries. -Package: libsope-gdl1-_GDL1VER_ +Package: libsope-gdl1-_SOPEVER_ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libsope-gdl1-_GDL1VER_-dev.install b/debian/libsope-gdl1-_SOPEVER_-dev.install similarity index 100% rename from debian/libsope-gdl1-_GDL1VER_-dev.install rename to debian/libsope-gdl1-_SOPEVER_-dev.install diff --git a/debian/libsope-gdl1-_GDL1VER_.install b/debian/libsope-gdl1-_SOPEVER_.install similarity index 100% rename from debian/libsope-gdl1-_GDL1VER_.install rename to debian/libsope-gdl1-_SOPEVER_.install diff --git a/debian/rules b/debian/rules index f7198543..2b72a4b6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ MAKE_FLAGS = messages=yes OPTFLAG=-O0 GNUSTEP_SETUP=/usr/lib/opengroupware.org/System/Library/Makefiles/GNUstep.sh SOPEVER=4.5 -GDL1VER=1.3 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -33,11 +32,6 @@ controlfiles-stamp: debian/rules clean-controlfiles cp $$f $$newname; \ echo $$newname >> controlfiles.tmp; \ done - for f in debian/*_GDL1VER_*; do \ - newname=$$(echo $$f | sed s/_GDL1VER_/$(GDL1VER)/ ); \ - cp $$f $$newname; \ - echo $$newname >> controlfiles.tmp; \ - done mv controlfiles.tmp controlfiles-stamp @@ -56,7 +50,7 @@ clean-controlfiles: fi debian/control: debian/control.in debian/rules - sed -e s/_SOPEVER_/$(SOPEVER)/g -e s/_GDL1VER_/$(GDL1VER)/g < debian/control.in > debian/control + sed -e s/_SOPEVER_/$(SOPEVER)/g < debian/control.in > debian/control build: build-stamp debian/control controlfiles build-stamp: patch-stamp @@ -144,7 +138,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-gdl1-$(GDL1VER) \ + -L libsope-ical$(SOPEVER) -L libsope-ldap$(SOPEVER) -L libsope-gdl1-$(SOPEVER) \ -l debian/tmp/usr/lib dh_gencontrol dh_md5sums -- 2.39.5