Fix debian packaging

* add separate -doc packages
* fix dh_install override
* add conflict with previous version

Change-Id: I2781c800d39923c5541bac00f00cb128f4acf008

4 files changed, 23 insertions, 1 deletions

diff --git a/debian/control b/debian/control
index f4c94bb..bf403e5 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Package: libosmonetif3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libosmonetif2
 Multi-Arch: same
 Description: Common/shared code regarding network interface for OpenBSC
  The libosmo-netif library is one of the libraries needed by the
@@ -47,6 +48,19 @@ Description: Development headers for Osmocom network interface
  This package contains the development files needed for developing with
  the libosmo-netif library.
 
+Package: libosmo-netif-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+         libosmonetif3,
+         libjs-jquery
+Description: Documentation for the Osmo network interface library
+ The libosmo-netif library is one of the libraries needed by the
+ OpenBSC GSM infrastructure software. This library in particular implements
+ the shared code for network interfaces.
+ .
+ This package contains the documentation for the libosmo-netif library.
+
 Package: libosmo-netif-dbg
 Section: debug
 Architecture: any
diff --git a/debian/libosmo-netif-doc.doc-base b/debian/libosmo-netif-doc.doc-base
new file mode 100644
index 0000000..ce8aa50
--- /dev/null
+++ b/debian/libosmo-netif-doc.doc-base
@@ -0,0 +1,7 @@
+Document: libosmo-netif-doc
+Title: Documentation for the libosmo-netif library
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libosmo-netif/html/index.html
+Files: /usr/share/doc/libosmo-netif/html/*.html
diff --git a/debian/libosmo-netif-doc.install b/debian/libosmo-netif-doc.install
new file mode 100644
index 0000000..d199687
--- /dev/null
+++ b/debian/libosmo-netif-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libosmo-netif/*
diff --git a/debian/rules b/debian/rules
index f398831..ce5c618 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ override_dh_autoreconf:
 	dh_autoreconf
 
 override_dh_install:
-	dh_install
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+	dh_install
 
 override_dh_clean:
 	dh_clean