From 83569f419b070aa25fe4cae83798cf734de8935e Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 21 May 2012 21:00:56 +0200
Subject: [PATCH] Versioning: make the lib 8.x; cleanup.

---
 libcitadel/configure.in                              |  8 ++++----
 libcitadel/debian/control                            | 12 ++++++------
 libcitadel/debian/libcitadel1.postinst.debhelper     |  5 -----
 libcitadel/debian/libcitadel1.postrm.debhelper       |  5 -----
 libcitadel/debian/libcitadel1.substvars              |  1 -
 .../{libcitadel2.install => libcitadel8.install}     |  0
 libcitadel/debian/rules                              |  4 ++--
 7 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 libcitadel/debian/libcitadel1.postinst.debhelper
 delete mode 100644 libcitadel/debian/libcitadel1.postrm.debhelper
 delete mode 100644 libcitadel/debian/libcitadel1.substvars
 rename libcitadel/debian/{libcitadel2.install => libcitadel8.install} (100%)

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index c42b37c4e..2ce601496 100755
--- 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 d35afe461..2b8584351 100644
--- 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
index 3d89d3ef6..000000000
--- 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
index 7f4404727..000000000
--- 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
index 5ba89964b..000000000
--- 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/libcitadel8.install
similarity index 100%
rename from libcitadel/debian/libcitadel2.install
rename to libcitadel/debian/libcitadel8.install
diff --git a/libcitadel/debian/rules b/libcitadel/debian/rules
index 0420dc5a5..0d7a14405 100755
--- 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
-- 
2.30.2