Package: release.debian.org
Dear Release Team,
websocketpp actually provides a -doc package, with a jquery symlink.
That symlink can be cause of *bad* documentation as explained on [1] and [2]
I would like to have an unblock for this
Let me know if I can go ahead with an unstable upload.
Have many thanks for your consideration,
following the debdiff
Note: I also added the build of examples and tests, the means for this change as documented in the debdiff is to enable the "build tests", to improve the quality of the debian software.
the debian package *doesn't* change in any ways, because this is a source only library
diff -Nru websocketpp-0.3.0/debian/changelog websocketpp-0.3.0/debian/changelog
--- websocketpp-0.3.0/debian/changelog 2014-10-06 09:39:13.000000000 +0200
+++ websocketpp-0.3.0/debian/changelog 2014-10-30 10:41:40.000000000 +0100
@@ -1,3 +1,12 @@
+websocketpp (0.3.0-2) unstable; urgency=medium
+
+ * Do not symlink jquery from doxygen, this will result in a
+ broken documentation. cfr: 736360.
+ * Fix package description.
+ * Enable examples and tests.
+
+ -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Sat, 25 Oct 2014 19:15:01 +0200
+
websocketpp (0.3.0-1) unstable; urgency=low
* Initial release. Closes: #764177
diff -Nru websocketpp-0.3.0/debian/control websocketpp-0.3.0/debian/control
--- websocketpp-0.3.0/debian/control 2014-10-05 23:36:28.000000000 +0200
+++ websocketpp-0.3.0/debian/control 2014-10-30 11:32:18.000000000 +0100
@@ -2,7 +2,12 @@
Section: libs
Priority: extra
Maintainer: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Build-Depends: cmake, debhelper (>=9), dh-linktree, libjs-jquery
+Build-Depends: cmake,
+ debhelper (>=9),
+ libboost-dev,
+ libboost-random-dev,
+ libboost-system-dev,
+ libboost-thread-dev
Build-Depends-Indep: doxygen
Standards-Version: 3.9.6
Homepage: https://github.com/zaphoyd/websocketpp
@@ -13,7 +18,7 @@
Section: libdevel
Architecture: all
Depends: ${misc:Depends}
-Description: Development files for Websocketpp
+Description: C++/Boost Asio based websocket client/server library. Dev package
WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
Protocol. It allows integrating WebSocket client and server functionality into
C++ programs. It uses interchangeable network transport modules including one
@@ -35,7 +40,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Description: Reference manual for Websocketpp
+Description: C++/Boost Asio based websocket client/server library. Doc package
WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
Protocol. It allows integrating WebSocket client and server functionality into
C++ programs. It uses interchangeable network transport modules including one
diff -Nru websocketpp-0.3.0/debian/copyright websocketpp-0.3.0/debian/copyright
--- websocketpp-0.3.0/debian/copyright 2014-10-05 23:36:28.000000000 +0200
+++ websocketpp-0.3.0/debian/copyright 2014-10-30 11:32:18.000000000 +0100
@@ -14,7 +14,7 @@
Copyright: 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
License: MIT
-Files: ./websocketpp/base64/*
+Files: websocketpp/base64/*
Copyright: 2004-2008 René Nyffenegger
License: Zlib
diff -Nru websocketpp-0.3.0/debian/libwebsocketpp-doc.linktrees websocketpp-0.3.0/debian/libwebsocketpp-doc.linktrees
--- websocketpp-0.3.0/debian/libwebsocketpp-doc.linktrees 2014-10-05 23:37:12.000000000 +0200
+++ websocketpp-0.3.0/debian/libwebsocketpp-doc.linktrees 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-replace usr/share/javascript/jquery/jquery.js usr/share/doc/libwebsocketpp-doc/html/jquery.js
diff -Nru websocketpp-0.3.0/debian/rules websocketpp-0.3.0/debian/rules
--- websocketpp-0.3.0/debian/rules 2014-10-05 23:10:03.000000000 +0200
+++ websocketpp-0.3.0/debian/rules 2014-10-30 10:41:17.000000000 +0100
@@ -4,18 +4,22 @@
#export DH_VERBOSE=1
%:
- dh $@ --with linktree --parallel
+ dh $@ --parallel
override_dh_auto_clean:
dh_auto_clean
rm -rf doxygen
override_dh_auto_configure:
- dh_auto_configure -- #-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON
+ # building examples and tests can spot building problems for programs using this library
+ dh_auto_configure -- -DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON
override_dh_auto_build-indep:
doxygen Doxyfile
override_dh_install-indep:
+ # do now install examples for now, unless somebody asks for them, probably upstream should install them
+ # in a proper location, and include/echo_server seems not the best one
+ rm -rf debian/tmp/usr/include/echo_server/
dh_install -plibwebsocketpp-doc doxygen/html/* usr/share/doc/libwebsocketpp-doc/html
dh_install -plibwebsocketpp-dev debian/tmp/usr/* usr
[1] https://lists.debian.org/debian-devel/2014/10/msg00774.html
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736360
Attachment:
websocketpp.debdiff
Description: Binary data