[DHG_packages] 04/04: gitit: drop javascript dependencies

Dmitry Bogatov kaction-guest at moszumanska.debian.org
Tue Jan 19 01:37:02 UTC 2016


This is an automated email from the git hooks/post-receive script.

kaction-guest pushed a commit to branch master
in repository DHG_packages.

commit d0ba818d0d7654235544a9915a9b5bbedb5425f1
Author: Dmitry Bogatov <KAction at gnu.org>
Date:   Tue Jan 19 04:23:45 2016 +0300

    gitit: drop javascript dependencies
    
    At least since 0.6.3 javascript initialization code is commended out
    (see src/Network/Gitit/Initialize.hs). As long as maintainer do not
    actually use javascript (anymore?), there is no reason to bother
    outself with dh-linktree.
---
 p/gitit/debian/changelog                           |  1 +
 p/gitit/debian/control                             |  4 ---
 .../patches/use-debian-packaged-jquery.patch       | 39 ----------------------
 p/gitit/debian/rules                               |  1 -
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/p/gitit/debian/changelog b/p/gitit/debian/changelog
index 8fd2f65..23371dc 100644
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@ -5,6 +5,7 @@ gitit (0.12.0.1-1) UNRELEASED; urgency=medium
   * Relax dependency on hoauth2 (houth2-0.5 in LTS-4.0)
   * Install forgotten `data/post-update' hook
   * Update and refactor `debian/copyright'
+  * Drop javascript dependencies
 
  -- Dmitry Bogatov <KAction at gnu.org>  Sat, 09 Jan 2016 22:09:53 +0300
 
diff --git a/p/gitit/debian/control b/p/gitit/debian/control
index 7a33279..99edc53 100644
--- a/p/gitit/debian/control
+++ b/p/gitit/debian/control
@@ -5,16 +5,12 @@ Priority: extra
 Section: haskell
 Build-Depends: debhelper (>= 9),
  haskell-devscripts (>= 0.9),
- dh-linktree,
  cdbs,
  xsltproc,
  pandoc,
  docbook-xsl,
  ghc,
  ghc-prof,
- libjs-jquery,
- libjs-jquery-ui,
- libjs-jquery-hotkeys,
  libghc-configfile-dev (>= 1),
  libghc-configfile-dev (<< 1.2),
  libghc-configfile-prof,
diff --git a/p/gitit/debian/patches/use-debian-packaged-jquery.patch b/p/gitit/debian/patches/use-debian-packaged-jquery.patch
deleted file mode 100644
index d5da822..0000000
--- a/p/gitit/debian/patches/use-debian-packaged-jquery.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/src/Network/Gitit/Layout.hs
-+++ b/src/Network/Gitit/Layout.hs
-@@ -78,7 +78,9 @@ filledPageTemplate base' cfg layout html
-                            'h':'t':'t':'p':_  -> x
-                            _                  -> base' ++ "/js/" ++ x
-
--      scripts  = ["jquery-1.2.6.min.js", "jquery-ui-combined-1.6rc2.min.js", "footnotes.js"] ++ pgScripts layout
-+      scripts  = ["jquery.js", "jquery.ui.core.js", "jquery.ui.draggable.js",
-+                  "jquery.ui.droppable.js", "jquery.ui.tabs",
-+                  "jquery.hotkeys.js", "footnotes.js"] ++ pgScripts layout
-       scriptLink x = script ! [src (prefixedScript x),
-         thetype "text/javascript"] << noHtml
-       javascriptlinks = renderHtmlFragment $ concatHtml $ map scriptLink scripts
---- a/gitit.cabal
-+++ b/gitit.cabal
-@@ -42,21 +42,14 @@ maintainer:          jgm at berkeley.edu
- bug-reports:         http://github.com/jgm/gitit/issues
- homepage:            http://gitit.net
- stability:           experimental
--extra-source-files:  data/static/js/jquery-1.2.6.js
--                     data/static/js/jquery.hotkeys-0.7.9.js
--                     data/static/js/jquery-ui.core-1.6rc2.js
--                     data/static/js/jquery-ui.droppable-1.6rc2.js
--                     data/static/js/jquery-ui.draggable-1.6rc2.js
--                     data/static/js/jquery-ui.tabs-1.6rc2.js
- data-files:          data/static/css/screen.css, data/static/css/print.css,
-                      data/static/css/ie.css, data/static/css/hk-pyg.css,
-                      data/static/css/reset-fonts-grids.css,
-                      data/static/css/custom.css,
-                      data/static/img/logo.png, data/static/img/icons/feed.png,
-                      data/static/img/icons/folder.png, data/static/img/icons/page.png,
--                     data/static/js/dragdiff.js, data/static/js/jquery-1.2.6.min.js,
--                     data/static/js/uploadForm.js, data/static/js/jquery-ui-combined-1.6rc2.min.js,
--                     data/static/js/jquery.hotkeys-0.7.9.min.js,
-+                     data/static/js/dragdiff.js,
-+                     data/static/js/uploadForm.js,
-                      data/static/js/preview.js, data/static/js/search.js,
-                      data/static/js/MathMLinHTML.js, data/static/js/footnotes.js,
-                      data/static/robots.txt,
diff --git a/p/gitit/debian/rules b/p/gitit/debian/rules
index b17b5e7..efa671f 100755
--- a/p/gitit/debian/rules
+++ b/p/gitit/debian/rules
@@ -19,5 +19,4 @@ endif
 build/gitit:: $(MANPAGES)
 
 binary-post-install/libghc-gitit-data::
-	dh_linktree -p$(cdbs_curpkg)
 	chmod +x debian/libghc-gitit-data/usr/share/gitit/data/post-update

-- 
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