From b9ca645482fda7f7ae99dfdded1bc4b3eb5b6acf Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@debian.org>
Date: Tue, 1 Oct 2013 21:47:55 +0100
Subject: debian: Rename -1.7.1 packages to 1.7.1

---
 debian/changelog                  |  2 ++
 debian/control                    | 12 ++++++------
 debian/libsbuild-1.7.1.install.in |  1 -
 debian/libsbuild1.7.1.install.in  |  1 +
 debian/rules                      |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 debian/libsbuild-1.7.1.install.in
 create mode 100644 debian/libsbuild1.7.1.install.in

diff --git a/debian/changelog b/debian/changelog
index 2886f026..cfab5abb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ schroot (1.7.1-1) UNRELEASED; urgency=low
     - Add cmake and gtest build dependencies.
     - Drop autotools-dev and cppunit build dependencies.
     - Upgrade to Standards-Version 3.9.4 (no changes).
+    - Change library package suffix from -1.7.1 to 1.7.1 to match
+      cmake library versioning.
   * debian/rules:
     - Replace configure usage with cmake and convert logic for
       configure options to use the cmake equivalents.
diff --git a/debian/control b/debian/control
index efbe37f2..1b5d0bd9 100644
--- a/debian/control
+++ b/debian/control
@@ -39,13 +39,13 @@ Description: common files for schroot
  This package provides translations for localisation of schroot
  programs.
 
-Package: libsbuild-1.7.1
+Package: libsbuild1.7.1
 Architecture: any
 Section: libs
 Pre-Depends: multiarch-support
 Depends:
  ${shlibs:Depends}, ${misc:Depends},
-Suggests: libsbuild-1.7.1-dbg
+Suggests: libsbuild1.7.1-dbg
 Description: shared library for the Debian source builder
  libsbuild provides facilities to manage and access chroots, as part of
  schroot.
@@ -65,10 +65,10 @@ Architecture: any
 Section: libdevel
 Depends:
  ${misc:Depends},
- libsbuild-1.7.1 (= ${binary:Version}),
+ libsbuild1.7.1 (= ${binary:Version}),
  pkg-config (>= 0.14.0)
 Suggests:
- libsbuild-1.7.1-dbg,
+ libsbuild1.7.1-dbg,
  libsbuild-doc
 Description: development files for the Debian source builder
  libsbuild provides facilities to manage and access chroots, as part of
@@ -85,13 +85,13 @@ Description: development files for the Debian source builder
  This package contains the header files needed to develop applications
  which make use of sbuild.
 
-Package: libsbuild-1.7.1-dbg
+Package: libsbuild1.7.1-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends:
  ${misc:Depends},
- libsbuild-1.7.1 (= ${binary:Version}),
+ libsbuild1.7.1 (= ${binary:Version}),
 Conflicts:
  schroot-dbg
 Description: Debugging symbols for the Debian source builder
diff --git a/debian/libsbuild-1.7.1.install.in b/debian/libsbuild-1.7.1.install.in
deleted file mode 100644
index 11230bde..00000000
--- a/debian/libsbuild-1.7.1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-debian/install/@LIBDIR@/libsbuild.so.*  @LIBDIR@
diff --git a/debian/libsbuild1.7.1.install.in b/debian/libsbuild1.7.1.install.in
new file mode 100644
index 00000000..11230bde
--- /dev/null
+++ b/debian/libsbuild1.7.1.install.in
@@ -0,0 +1 @@
+debian/install/@LIBDIR@/libsbuild.so.*  @LIBDIR@
diff --git a/debian/rules b/debian/rules
index c8d110fd..32d07c05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,6 +127,6 @@ override_dh_installinit:
 	dh_installinit --no-start --update-rcd-params='defaults'
 
 override_dh_strip:
-	dh_strip --dbg-package=libsbuild-1.7.1-dbg
+	dh_strip --dbg-package=libsbuild1.7.1-dbg
 
 .PHONY: override_dh_auto_configure override_dh_auto_clean override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installchangelogs override_dh_installinit override_dh_strip install-arch install-indep
-- 
cgit v1.2.3