diff -u openjade-1.4devel1/debian/control openjade-1.4devel1/debian/control --- openjade-1.4devel1/debian/control +++ openjade-1.4devel1/debian/control @@ -24,10 +24,12 @@ Author: The OpenJade Team Homepage: http://openjade.sourceforge.net/ -Package: libostyle1 +Package: libostyle1c2 Architecture: any Section: libs Depends: ${shlibs:Depends} +Conflicts: libostyle1 +Replaces: libostyle1 Description: Runtime libraries for OpenJade OpenJade's shared libraries, runtime support. Includes libogrove, providing an abstract interface to groves; libospgrove, an interface @@ -39,7 +41,7 @@ Package: libostyle-dev Architecture: any Section: libdevel -Depends: libostyle1 (= ${Source-Version}), libc6-dev, libstdc++-dev +Depends: libostyle1c2 (= ${Source-Version}), libc6-dev, libstdc++-dev Conflicts: openjade (<< 1.4devel1-13) Description: OpenJade libraries, developer support Contains include files and the static library for libogrove, diff -u openjade-1.4devel1/debian/changelog openjade-1.4devel1/debian/changelog --- openjade-1.4devel1/debian/changelog +++ openjade-1.4devel1/debian/changelog @@ -1,3 +1,9 @@ +openjade (1.4devel1-13ubuntu1) breezy; urgency=low + + * CXX transition: Rename libostyle1 to libostyle1c2. + + -- Matthias Klose Thu, 12 May 2005 18:39:59 +0000 + openjade (1.4devel1-13) unstable; urgency=low * Compiled against new libosp4. diff -u openjade-1.4devel1/debian/rules openjade-1.4devel1/debian/rules --- openjade-1.4devel1/debian/rules +++ openjade-1.4devel1/debian/rules @@ -4,7 +4,7 @@ pkg := openjade pkg-openjade := $(pkg) -pkg-libostyle := libostyle1 +pkg-libostyle := libostyle1c2 pkg-libostyle-dev := libostyle-dev # build tool abstraction reverted: --- openjade-1.4devel1/debian/libostyle1.postinst +++ openjade-1.4devel1.orig/debian/libostyle1.postinst @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ]; then - ldconfig -fi - -#DEBHELPER# - -exit 0 reverted: --- openjade-1.4devel1/debian/libostyle1.shlibs +++ openjade-1.4devel1.orig/debian/libostyle1.shlibs @@ -1,3 +0,0 @@ -libostyle 1 libostyle1 (>= 1.4devel1-11) -libogrove 1 libostyle1 (>= 1.4devel1-11) -libospgrove 1 libostyle1 (>= 1.4devel1-11) reverted: --- openjade-1.4devel1/debian/libostyle1.install +++ openjade-1.4devel1.orig/debian/libostyle1.install @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/lib*.so.[0-9].[0-9].[0-0] usr/lib -debian/tmp/usr/lib/lib*.so.[0-9] usr/lib reverted: --- openjade-1.4devel1/debian/libostyle1.dirs +++ openjade-1.4devel1.orig/debian/libostyle1.dirs @@ -1,2 +0,0 @@ -usr/lib -usr/share/doc/libostyle1 only in patch2: unchanged: --- openjade-1.4devel1.orig/debian/libostyle1c2.install +++ openjade-1.4devel1/debian/libostyle1c2.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/lib*.so.[0-9].[0-9].[0-0] usr/lib +debian/tmp/usr/lib/lib*.so.[0-9] usr/lib only in patch2: unchanged: --- openjade-1.4devel1.orig/debian/libostyle1c2.postinst +++ openjade-1.4devel1/debian/libostyle1c2.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- openjade-1.4devel1.orig/debian/libostyle1c2.dirs +++ openjade-1.4devel1/debian/libostyle1c2.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/share/doc/libostyle1c2 only in patch2: unchanged: --- openjade-1.4devel1.orig/debian/libostyle1c2.shlibs +++ openjade-1.4devel1/debian/libostyle1c2.shlibs @@ -0,0 +1,3 @@ +libostyle 1 libostyle1c2 (>= 1.4devel1-11) +libogrove 1 libostyle1c2 (>= 1.4devel1-11) +libospgrove 1 libostyle1c2 (>= 1.4devel1-11)