join the doc package

3 files changed, 8 insertions, 28 deletions

diff --git a/debian/control b/debian/control
index f389dfa..f7882bb 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${python:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${sphinxdoc:Depends}
 Description: Secure Remote Password protocol implementation
  This package provides an implementation of the Secure Remote Password
  protocol (SRP). SRP is a cryptographically strong authentication
@@ -40,16 +41,3 @@ Description: Secure Remote Password protocol implementation
  the authenticated connection. However, successful authentication does
  result in a cryptographically strong shared key that can be used
  for symmetric-key encryption.
-
-Package: python-srp-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Suggests: python-doc
-Description: Secure Remote Password protocol implementation
- This package provides an implementation of the Secure Remote Password
- protocol (SRP). SRP is a cryptographically strong authentication
- protocol for password-based, mutual authentication over an insecure
- network connection.
- .
- This package provides detailed documentation on python-srp usage.
diff --git a/debian/docs b/debian/docs
index 71dfd5b..45f302f 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
 README.txt
+LICENSE
diff --git a/debian/rules b/debian/rules
index 7d4bf07..e6dbf13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ PYVERS := $(shell pyversions -r)
 export DEB_CFLAGS_MAINT_APPEND = -Wl,-z,relro
 
 package=python-srp
-docpkg=python-srp-doc
 
 %:
 	dh $@ --with python2,sphinxdoc --buildsystem=python_distutils
@@ -30,24 +29,16 @@ override_dh_auto_install:
 			--install-layout deb; \
 	done
 
-	# XXX should remove the duplicated doc
-	#rm -rf debian/$(package)/usr/share/pyshared/srp/doc
-	#rm -rf usr/share/pyshared/srp/doc
-	#rm -rf debian/$(package)/usr/share/pyshared/srp/doc
-	#rm -rf debian/$(package)/usr/share/doc
-
 override_dh_install:
-	dh_install -X"srp/doc"
+	dh_install -Xsrp/doc/
 
 override_dh_installdocs:
-	echo "Skipping the docs in the tree, they are installed in -doc package"
+	mkdir -p debian/$(package)/usr/share/doc/$(package)
+	cp debian/copyright debian/$(package)/usr/share/doc/$(package)/
 
 override_dh_sphinxdoc:
-ifneq "$(shell dh_listpackages | grep -- -doc)" ""
-	mkdir -p debian/$(docpkg)/usr/share/doc/$(docpkg)
-	cp -r srp/doc/build/* debian/$(docpkg)/usr/share/doc/$(docpkg)/
-	dh_sphinxdoc usr/share/doc/$(docpkg)/
-endif
+	cp -r srp/doc/build/* debian/$(package)/usr/share/doc/$(package)/
+	dh_sphinxdoc usr/share/doc/$(package)/
 	
 override_dh_auto_clean:
 	dh_auto_clean