[DHG_packages] 14/15: hoogle: Remove embedded copies of JS libraries
Ilias Tsitsimpis
iliastsi-guest at moszumanska.debian.org
Sun Oct 30 16:52:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
iliastsi-guest pushed a commit to branch master
in repository DHG_packages.
commit 4f775af04f89bd7d4e7dcdbd8fb59214c3bb22cf
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date: Sun Oct 30 16:01:02 2016 +0200
hoogle: Remove embedded copies of JS libraries
Remove embedded copies of libjs-jquery-cookie and libjs-chosen.
---
p/haskell-hoogle/debian/changelog | 3 ++-
p/haskell-hoogle/debian/control | 2 ++
p/haskell-hoogle/debian/copyright | 30 +---------------------
p/haskell-hoogle/debian/hoogle.NEWS | 2 +-
p/haskell-hoogle/debian/hoogle.links | 5 +++-
.../debian/patches/remove_embedded_copies | 18 +++++++++++++
p/haskell-hoogle/debian/patches/series | 1 +
p/haskell-hoogle/debian/watch | 1 +
8 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/p/haskell-hoogle/debian/changelog b/p/haskell-hoogle/debian/changelog
index 58a542f..6546f05 100644
--- a/p/haskell-hoogle/debian/changelog
+++ b/p/haskell-hoogle/debian/changelog
@@ -1,4 +1,4 @@
-haskell-hoogle (5.0.1-3) UNRELEASED; urgency=medium
+haskell-hoogle (5.0.1+dfsg1-1) UNRELEASED; urgency=medium
* Remove obsolete d/jquery_1.7.2+dfsg.orig.tar.gz file.
* Remove pre-compiled keyword hoogle database.
@@ -25,6 +25,7 @@ haskell-hoogle (5.0.1-3) UNRELEASED; urgency=medium
* Update hoogle's manpage.
* Remove duplicate packages from build-depends field.
* Remove unused `binary-or-shlib-defines-rpath' lintian override.
+ * Remove embedded copies of libjs-jquery-cookie and libjs-chosen.
-- Ilias Tsitsimpis <i.tsitsimpis at gmail.com> Fri, 28 Oct 2016 13:02:02 +0300
diff --git a/p/haskell-hoogle/debian/control b/p/haskell-hoogle/debian/control
index 3b1813a..a4dc49f 100644
--- a/p/haskell-hoogle/debian/control
+++ b/p/haskell-hoogle/debian/control
@@ -162,6 +162,8 @@ Section: misc
Depends:
ghc-doc,
libjs-jquery,
+ libjs-chosen,
+ libjs-jquery-cookie,
${haskell:Depends},
${misc:Depends},
${shlibs:Depends},
diff --git a/p/haskell-hoogle/debian/copyright b/p/haskell-hoogle/debian/copyright
index 9f061fb..68e4a80 100644
--- a/p/haskell-hoogle/debian/copyright
+++ b/p/haskell-hoogle/debian/copyright
@@ -2,20 +2,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: hoogle
Upstream-Contact: Neil Mitchell <ndmitchell at gmail.com>
Source: http://hackage.haskell.org/package/hoogle
+Files-Excluded: html/plugin
Files: *
Copyright: 2004-2016 Neil Mitchell
License: BSD-3-clause
-Files: html/plugin/jquery-cookie.js
-Copyright: 2006 Klaus Hartl
-License: Expat
-
-Files: html/plugin/chosen-jquery.js
- html/plugin/chosen.css
-Copyright: 2011-2014 Harvest http://getharvest.com
-License: Expat
-
Files: debian/*
Copyright:
2012 Kiwamu Okabe
@@ -53,23 +45,3 @@ License: BSD-3-clause
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/p/haskell-hoogle/debian/hoogle.NEWS b/p/haskell-hoogle/debian/hoogle.NEWS
index 7cc2f54..858a61a 100644
--- a/p/haskell-hoogle/debian/hoogle.NEWS
+++ b/p/haskell-hoogle/debian/hoogle.NEWS
@@ -1,4 +1,4 @@
-haskell-hoogle (5.0.1-3) UNRELEASED; urgency=medium
+haskell-hoogle (5.0.1+dfsg1-1) UNRELEASED; urgency=medium
Hoogle 5 is no longer a CGI binary, served through Apache. Instead,
it implements its own HTTP server using the Haskell Warp library.
diff --git a/p/haskell-hoogle/debian/hoogle.links b/p/haskell-hoogle/debian/hoogle.links
index 255fba3..b89fcba 100644
--- a/p/haskell-hoogle/debian/hoogle.links
+++ b/p/haskell-hoogle/debian/hoogle.links
@@ -1,2 +1,5 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/hoogle/resources/jquery.js
+usr/share/javascript/chosen/chosen.css usr/share/hoogle/html/plugin/chosen.css
+usr/share/javascript/chosen/chosen.jquery.js usr/share/hoogle/html/plugin/chosen-jquery.js
+usr/share/javascript/chosen/chosen-sprite.png usr/share/hoogle/html/plugin/chosen-sprite.png
+usr/share/javascript/jquery-cookie/jquery.cookie.js usr/share/hoogle/html/plugin/jquery-cookie.js
var/lib/hoogle/databases usr/share/hoogle/databases
diff --git a/p/haskell-hoogle/debian/patches/remove_embedded_copies b/p/haskell-hoogle/debian/patches/remove_embedded_copies
new file mode 100644
index 0000000..cd2ca67
--- /dev/null
+++ b/p/haskell-hoogle/debian/patches/remove_embedded_copies
@@ -0,0 +1,18 @@
+Description: Remove embedded copies of JS libraries
+Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
+Forwarded: no, Debian specific
+
+Index: b/hoogle.cabal
+===================================================================
+--- a/hoogle.cabal
++++ b/hoogle.cabal
+@@ -29,9 +29,6 @@ data-files:
+ html/*.css
+ html/*.xml
+ html/*.html
+- html/plugin/*.css
+- html/plugin/*.js
+- html/plugin/*.png
+
+ source-repository head
+ type: git
diff --git a/p/haskell-hoogle/debian/patches/series b/p/haskell-hoogle/debian/patches/series
index 4c3dac8..077f796 100644
--- a/p/haskell-hoogle/debian/patches/series
+++ b/p/haskell-hoogle/debian/patches/series
@@ -1,2 +1,3 @@
generate_from_multiple_sources
global_database
+remove_embedded_copies
diff --git a/p/haskell-hoogle/debian/watch b/p/haskell-hoogle/debian/watch
index 6f2896e..618446f 100644
--- a/p/haskell-hoogle/debian/watch
+++ b/p/haskell-hoogle/debian/watch
@@ -1,2 +1,3 @@
version=3
+opts=repacksuffix=+dfsg1,dversionmangle=s/\+dfsg1\d*$// \
http://hackage.haskell.org/package/hoogle/distro-monitor .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list