Bug#858218: unblock: openlayers/2.13.1+ds2-4

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package openlayers.

It drops the -doc package which required libjs-jquery-mobile,
see the discussion in #734101.

unblock openlayers/2.13.1+ds2-4

Kind Regards,

Bas
-------------- next part --------------
diff -Nru openlayers-2.13.1+ds2/debian/changelog openlayers-2.13.1+ds2/debian/changelog
--- openlayers-2.13.1+ds2/debian/changelog	2016-05-06 19:03:55.000000000 +0200
+++ openlayers-2.13.1+ds2/debian/changelog	2017-03-19 21:21:01.000000000 +0100
@@ -1,3 +1,10 @@
+openlayers (2.13.1+ds2-4) unstable; urgency=medium
+
+  * Drop libjs-openlayers-doc binary package.
+    See: #734101 (libjs-jquery-mobile not working)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 19 Mar 2017 21:21:01 +0100
+
 openlayers (2.13.1+ds2-3) unstable; urgency=medium
 
   * Update Vcs-Git URL to use HTTPS.
diff -Nru openlayers-2.13.1+ds2/debian/control openlayers-2.13.1+ds2/debian/control
--- openlayers-2.13.1+ds2/debian/control	2016-05-06 19:02:20.000000000 +0200
+++ openlayers-2.13.1+ds2/debian/control	2017-03-19 21:02:41.000000000 +0100
@@ -6,8 +6,7 @@
 Priority: extra
 Build-Depends: debhelper (>= 9),
                python
-Build-Depends-Indep: node-uglify,
-                     naturaldocs
+Build-Depends-Indep: node-uglify
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/openlayers.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/openlayers.git
@@ -25,21 +24,3 @@
  geographic applications, similar to the Google Maps and MSN Virtual
  Earth APIs.
 
-Package: libjs-openlayers-doc
-Architecture: all
-Section: doc
-Depends: libjs-bootstrap,
-         libjs-jquery,
-         libjs-jquery-mobile,
-         ${misc:Depends}
-Recommends: libjs-openlayers
-Description: documentation for OpenLayers
- OpenLayers is a pure JavaScript library for displaying map data in
- most modern web browsers, with no server-side dependencies.
- .
- OpenLayers implements a JavaScript API for building rich web-based
- geographic applications, similar to the Google Maps and MSN Virtual
- Earth APIs.
- .
- This package contains documentation and examples of OpenLayers.
-
diff -Nru openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.doc-base openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.doc-base
--- openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.doc-base	2014-12-26 01:41:51.000000000 +0100
+++ openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.doc-base	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-Document: openlayers
-Title: OpenLayers Documentation
-Author: OpenLayers Contributors
-Abstract: This manual describes what OpenLayers is
- and how it can be used.
-Section: Programming/Javascript
-
-Format: HTML
-Index: /usr/share/doc/libjs-openlayers-doc/html/index.html
-Files: /usr/share/doc/libjs-openlayers-doc/html/*
diff -Nru openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.examples openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.examples
--- openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.examples	2014-12-26 01:41:51.000000000 +0100
+++ openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.examples	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-examples/*
diff -Nru openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.install openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.install
--- openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.install	2015-03-20 15:05:28.000000000 +0100
+++ openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-gendoc/*        /usr/share/doc/libjs-openlayers-doc/html/
-lib/Firebug/    /usr/share/doc/libjs-openlayers-doc/examples/
-notes/          /usr/share/doc/libjs-openlayers-doc/
diff -Nru openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.links openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.links
--- openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.links	2015-12-22 18:09:13.000000000 +0100
+++ openlayers-2.13.1+ds2/debian/libjs-openlayers-doc.links	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/share/javascript/bootstrap     usr/share/doc/libjs-openlayers-doc/examples/bootstrap
-usr/share/javascript/jquery        usr/share/doc/libjs-openlayers-doc/examples/jquery
-usr/share/javascript/jquery-mobile usr/share/doc/libjs-openlayers-doc/examples/jquery-mobile
-usr/share/javascript/openlayers    usr/share/doc/libjs-openlayers-doc/examples/openlayers
diff -Nru openlayers-2.13.1+ds2/debian/rules openlayers-2.13.1+ds2/debian/rules
--- openlayers-2.13.1+ds2/debian/rules	2015-12-22 16:56:07.000000000 +0100
+++ openlayers-2.13.1+ds2/debian/rules	2017-03-19 21:19:40.000000000 +0100
@@ -28,22 +28,12 @@
 	cd build && ./build.py tests.cfg OpenLayers.tests.js
 	uglifyjs -o build/OpenLayers.tests.min.js build/OpenLayers.tests.js
 
-	mkdir gendoc
-	naturaldocs -i lib/ -o HTML gendoc/ -p doc_config/ -s Default OL
-
-override_dh_auto_clean:
-	dh_auto_clean
-	-rm -rf gendoc
-
 override_dh_install:
 	dh_install
 
 	# Remove executable bit
 	chmod 644 debian/*/usr/share/openlayers/img/*.png
 
-	# Remove duplicate license & readme
-	$(RM) debian/*/usr/share/doc/*/examples/Firebug/*.txt
-
 override_dh_compress:
 	dh_compress -Xexamples