Update debian build for previous changes

7 files changed, 15 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 181d514..e1d0b76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,8 @@ debian/*.log
 debian/*.substvars
 debian/libbmm-common/
 debian/libbmm-dev/
-debian/libbmm0u/
-debian/libbmm0u-dbg/
+debian/libbmm1/
+debian/libbmm*-dbg/
 debian/tmp/
 debian/*.dirs
 debian/*.shlibs
diff --git a/debian/changelog b/debian/changelog
index 63a7d6c..ad38442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+marvell-libbmm (1.1.0) precise; urgency=low
+
+  * Major rework
+
+ -- Russell King <rmk@arm.linux.org.uk>  Mon, 22 Oct 2012 13:58:49 +0100
+
 marvell-libbmm (0.2.0-0ubuntu1~ppa8.rmk2) precise; urgency=low
 
   * Add libbmm-common package to contain the init and udev scripts
diff --git a/debian/control b/debian/control
index 1cd12c6..4a09d42 100644
--- a/debian/control
+++ b/debian/control
@@ -16,23 +16,23 @@ Description: Block/buffer memory management
 Package: libbmm-dev
 Section: libdevel
 Architecture: armel armhf
-Depends: libbmm0u (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libbmm1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Block/buffer memory management
  Header files, static library and unit test case for BMM
 
-Package: libbmm0u
+Package: libbmm1
 Section: libs
 Architecture: armel armhf
 Depends: libbmm-common, ${shlibs:Depends}, ${misc:Depends}
 Description: Block/buffer memory management
  Allocate, manage and share large block of physical continuous memory
 
-Package: libbmm0u-dbg
+Package: libbmm1-dbg
 Section: debug
 Priority: extra
 Architecture: linux-any
 Depends:
- libbmm0u (= ${binary:Version}),
+ libbmm1 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Multi-Arch: same
diff --git a/debian/libbmm-dev.install b/debian/libbmm-dev.install
index 417c3c1..57bfa73 100644
--- a/debian/libbmm-dev.install
+++ b/debian/libbmm-dev.install
@@ -1,4 +1,5 @@
 debian/tmp/usr/include/*.h
 debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.so
 debian/tmp/usr/lib/pkgconfig/*.pc
 debian/tmp/usr/bin/bmm_test
diff --git a/debian/libbmm0u.install b/debian/libbmm0u.install
deleted file mode 100644
index 04bbb6b..0000000
--- a/debian/libbmm0u.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*.so*
diff --git a/debian/libbmm1.install b/debian/libbmm1.install
new file mode 100644
index 0000000..79bbe2f
--- /dev/null
+++ b/debian/libbmm1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*.so.*
diff --git a/debian/rules b/debian/rules
index 87cc2ca..1ab3fdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_strip:
-	dh_strip -plibbmm0u --dbg-package=libbmm0u-dbg
+	dh_strip -plibbmm1 --dbg-package=libbmm1-dbg
 	dh_strip -s --remaining-packages
 
 %: