Versioning: make the lib 8.x; cleanup.

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index c42b37c4ef21f9cfd4b45a75af2e87c5b18e26d9..2ce60149610ad51a503efbf8c7df3778f7d2ad97 100755 (executable)
--- a/libcitadel/configure.in
+++ b/libcitadel/configure.in
@@ -5,7 +5,7 @@ dnl
 dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
 AC_PREREQ(2.52)
 
-AC_INIT(libcitadel, 8.11, http://uncensored.citadel.org)
+AC_INIT(libcitadel, 8.1.1, http://uncensored.citadel.org)
 
 AC_CONFIG_SRCDIR(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)
@@ -22,9 +22,9 @@ dnl
 dnl If the API changes incompatibly set LIBAGE back to 0
 dnl
 
-LIBCURRENT=2
-LIBREVISION=3
-LIBAGE=1
+LIBCURRENT=8
+LIBREVISION=11
+LIBAGE=0
 
 sinclude(conftools/libtool.m4)
 sinclude(conftools/ac_c_bigendian_cross.m4)

diff --git a/libcitadel/debian/control b/libcitadel/debian/control
index d35afe4615438d1e933475bb3a00441f1f0181fd..2b858435191c843343b06a902366bb2b9e07fb79 100644 (file)
--- a/libcitadel/debian/control
+++ b/libcitadel/debian/control
@@ -7,17 +7,17 @@ Build-Depends: debhelper (>= 5), zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://citadel.org
 
-Package: libcitadel2
+Package: libcitadel8
 Architecture: any
 Depends: ${shlibs:Depends}, shared-mime-info
 Description: Citadel toolbox
  This library contains the commonly used routines for the citadel suite.
 
-Package: libcitadel2-dbg
+Package: libcitadel8-dbg
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libcitadel2
-Description: Debugging symbols for libcitadel2
+Depends: ${shlibs:Depends}, libcitadel8
+Description: Debugging symbols for libcitadel8
  This library contains the commonly used routines for the citadel suite.
  .
  This package provides the debugging symbols.
@@ -26,8 +26,8 @@ Package: libcitadel-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, pkg-config,
- libcitadel2 (= ${binary:Version})
-Description: Development files for libcitadel2
+ libcitadel8 (= ${binary:Version})
+Description: Development files for libcitadel8
  This library contains the commonly used routines for the citadel suite.
  .
  This package provides development files and static libraries.

diff --git a/libcitadel/debian/libcitadel1.postinst.debhelper b/libcitadel/debian/libcitadel1.postinst.debhelper
deleted file mode 100644 (file)
index 3d89d3e..0000000
--- a/libcitadel/debian/libcitadel1.postinst.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-       ldconfig
-fi
-# End automatically added section

diff --git a/libcitadel/debian/libcitadel1.postrm.debhelper b/libcitadel/debian/libcitadel1.postrm.debhelper
deleted file mode 100644 (file)
index 7f44047..0000000
--- a/libcitadel/debian/libcitadel1.postrm.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-       ldconfig
-fi
-# End automatically added section

diff --git a/libcitadel/debian/libcitadel1.substvars b/libcitadel/debian/libcitadel1.substvars
deleted file mode 100644 (file)
index 5ba8996..0000000
--- a/libcitadel/debian/libcitadel1.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3), zlib1g (>= 1:1.1.4)

diff --git a/libcitadel/debian/libcitadel2.install b/libcitadel/debian/libcitadel2.install
deleted file mode 100644 (file)
index 093956b..0000000
--- a/libcitadel/debian/libcitadel2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*.so.*

diff --git a/libcitadel/debian/libcitadel8.install b/libcitadel/debian/libcitadel8.install
new file mode 100644 (file)
index 0000000..093956b
--- /dev/null
+++ b/libcitadel/debian/libcitadel8.install
@@ -0,0 +1 @@
+usr/lib/*.so.*

diff --git a/libcitadel/debian/rules b/libcitadel/debian/rules
index 0420dc5a5ce1ded7b4c7039a1250d9ae3b459465..0d7a14405f1609ab31c338f1c28eb61488e9ae90 100755 (executable)
--- a/libcitadel/debian/rules
+++ b/libcitadel/debian/rules
@@ -90,11 +90,11 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir -a
        dh_testroot -a
-       dh_installchangelogs -a -plibcitadel2
+       dh_installchangelogs -a -plibcitadel8
        dh_installdocs -a
        dh_install -a --sourcedir=debian/tmp
        dh_link -a
-       dh_strip -a --dbg-package=libcitadel2-dbg
+       dh_strip -a --dbg-package=libcitadel8-dbg
        dh_compress -a
        dh_fixperms -a
        dh_makeshlibs -a -V