Debian package libyaz++1. Replaces libyaz++.

diff --git a/debian/changelog b/debian/changelog
index 298bdbe..a36a4d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz++ (1.0.0-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 27 Mar 2006 16:50:06 +0200
+
 yaz++ (0.9-1) unstable; urgency=low
 
   * Upstream.

diff --git a/debian/control b/debian/control
index 28261ae..d5fdec6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,24 +2,27 @@ Source: yaz++
 Priority: optional
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Standards-Version: 3.6.0
-Build-Depends: debhelper (>= 4.0.0), docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex, libxml2-dev, libyaz-dev (>= 2.0.9)
+Build-Depends: debhelper (>= 4.0.0), docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex, libxml2-dev, libyaz-dev (>= 2.1.14)
 
-Package: libyaz++
+Package: libyaz++1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libyaz (>= 2.0.9)
+Depends: ${shlibs:Depends}, libyaz (>= 2.1.14)
 Description: YAZ++ and ZOOM library.
  YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM.
 
-Package: libyaz++-dev
+Package: libyaz++1-dev
 Section: devel
 Architecture: any
-Depends: libyaz++ (= ${Source-Version}), libyaz-dev
+Depends: libyaz++1 (= ${Source-Version}), libyaz-dev
+Conflicts: libyaz++-dev
 Description: Development libraries for YAZ++ and ZOOM.
  YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM.
 
-Package: yaz++-doc
+Package: yaz++1-doc
 Section: doc
 Architecture: all
+Conflicts: yaz++-doc
 Description: Documentation for YAZ++.
  YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM.
+

diff --git a/debian/libyaz++-dev.install b/debian/libyaz++-dev.install
deleted file mode 100644 (file)
index 2b94fd7..0000000
--- a/debian/libyaz++-dev.install
+++ /dev/null
@@ -1,9 +0,0 @@
-debian/tmp/usr/include/yaz++/*.h
-debian/tmp/usr/lib/libyazcpp*.a
-debian/tmp/usr/lib/libzoomcpp*.a
-debian/tmp/usr/lib/libyazcpp.so
-debian/tmp/usr/lib/libzoomcpp.so
-debian/tmp/usr/lib/libyazcpp.la
-debian/tmp/usr/lib/libzoomcpp.la
-debian/tmp/usr/bin/yaz++-config
-debian/tmp/usr/share/aclocal/yazpp.m4

diff --git a/debian/libyaz++.install b/debian/libyaz++.install
deleted file mode 100644 (file)
index d15a942..0000000
--- a/debian/libyaz++.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libyazcpp*.so.*
-debian/tmp/usr/lib/libzoomcpp*.so.*

diff --git a/debian/libyaz++1-dev.install b/debian/libyaz++1-dev.install
new file mode 100644 (file)
index 0000000..2b94fd7
--- /dev/null
+++ b/debian/libyaz++1-dev.install
@@ -0,0 +1,9 @@
+debian/tmp/usr/include/yaz++/*.h
+debian/tmp/usr/lib/libyazcpp*.a
+debian/tmp/usr/lib/libzoomcpp*.a
+debian/tmp/usr/lib/libyazcpp.so
+debian/tmp/usr/lib/libzoomcpp.so
+debian/tmp/usr/lib/libyazcpp.la
+debian/tmp/usr/lib/libzoomcpp.la
+debian/tmp/usr/bin/yaz++-config
+debian/tmp/usr/share/aclocal/yazpp.m4

diff --git a/debian/libyaz++1.install b/debian/libyaz++1.install
new file mode 100644 (file)
index 0000000..d15a942
--- /dev/null
+++ b/debian/libyaz++1.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libyazcpp*.so.*
+debian/tmp/usr/lib/libzoomcpp*.so.*

diff --git a/debian/rules b/debian/rules
index fe7095f..f3e4865 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,7 @@ binary-arch: build install
        dh_installchangelogs NEWS
        dh_installdocs
        dh_installexamples
-       mv debian/tmp/usr/share/doc/yaz++ debian/tmp/usr/share/doc/yaz++-doc
+       mv debian/tmp/usr/share/doc/yaz++ debian/tmp/usr/share/doc/yaz++1-doc
        dh_install
 #      dh_installmenu
 #      dh_installdebconf       
@@ -106,9 +106,9 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libyaz++ (>= 0.8)'
+       dh_makeshlibs -V 'libyaz++1 (>= 1.0.0)'
        dh_installdeb
-       dh_shlibdeps -l debian/libyaz++/usr/lib
+       dh_shlibdeps -l debian/libyaz++1/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/debian/yaz++-doc.install b/debian/yaz++-doc.install
deleted file mode 100644 (file)
index 2ef3fa3..0000000
--- a/debian/yaz++-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/yaz++-doc

diff --git a/debian/yaz++1-doc.install b/debian/yaz++1-doc.install
new file mode 100644 (file)
index 0000000..b2a19e3
--- /dev/null
+++ b/debian/yaz++1-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/yaz++1-doc

diff --git a/src/Makefile.am b/src/Makefile.am
index 6d49470..af2eb8f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.29 2005-10-13 09:56:38 adam Exp $
+## $Id: Makefile.am,v 1.30 2006-03-27 15:10:41 adam Exp $
 
 check_PROGRAMS = tstquery
 noinst_PROGRAMS = yaz-my-server yaz-my-client
@@ -9,7 +9,7 @@ TESTS = $(check_PROGRAMS)
 AM_CXXFLAGS = -I$(srcdir)/../include $(YAZINC)
 
 lib_LTLIBRARIES = libyazcpp.la
-libyazcpp_la_LDFLAGS=-version-info 1:0:0
+libyazcpp_la_LDFLAGS=-version-info 2:0:0
 
 DISTCLEANFILES = yaz++-config
 

diff --git a/zoom/Makefile.am b/zoom/Makefile.am
index cd60a48..e813f86 100644 (file)
--- a/zoom/Makefile.am
+++ b/zoom/Makefile.am
@@ -1,4 +1,4 @@
-# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.11 2004-02-11 10:01:54 adam Exp $
+# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.12 2006-03-27 15:10:42 adam Exp $
 
 AM_CXXFLAGS= $(YAZINC) 
 
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libzoomcpp.la
 noinst_PROGRAMS = zclient
 endif
 
-libzoomcpp_la_LDFLAGS=-version-info 1:0:0
+libzoomcpp_la_LDFLAGS=-version-info 2:0:0
 LDADD=libzoomcpp.la $(YAZLALIB)
 
 mirk_sources = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp