[DHG_packages] 01/05: gitit: Use dh_link instead of dh_linktree

Ilias Tsitsimpis iliastsi-guest at moszumanska.debian.org
Thu Jun 23 11:02:13 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 12fc8ac921d22631c3a6292bafd1bf472dc21622
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Thu Jun 23 12:36:30 2016 +0300

    gitit: Use dh_link instead of dh_linktree
    
    dh_linktree imposes a strong dependency against libjs-jquery. This
    means that every time a new version of libjs-jquery gets uploaded,
    libghc-gitit-data will have broken dependencies.
    
    This seems to be a known problem:
        https://bugs.debian.org/676455
        https://bugs.debian.org/784859
        https://bugs.debian.org/820879
    
    We already replace the jquery shipped by gitit with the much newer
    version available to the archive without validating if they are
    compatible, so there is no reason to impose strict dependencies against
    newer versions of libjs-jquery.
    
    Use dh_link instead of dh_linktree to create the symlinks and avoid
    continuous uploading of the package:
        https://bugs.debian.org/796809
---
 p/gitit/debian/changelog                   | 8 ++++++++
 p/gitit/debian/control                     | 1 -
 p/gitit/debian/libghc-gitit-data.links     | 4 ++++
 p/gitit/debian/libghc-gitit-data.linktrees | 4 ----
 p/gitit/debian/rules                       | 1 -
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/p/gitit/debian/changelog b/p/gitit/debian/changelog
index e55e8a6..187b032 100644
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@ -1,3 +1,11 @@
+gitit (0.12.1.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Use dh_link instead of dh_linktree
+    dh_linktree imposes a strong dependency against libjs-jquery. Use dh_link
+    to create the symlinks and avoid continuous uploading of the package.
+
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Thu, 23 Jun 2016 12:31:30 +0300
+
 gitit (0.12.1.1+dfsg-1) unstable; urgency=medium
 
   [ Dmitry Bogatov ]
diff --git a/p/gitit/debian/control b/p/gitit/debian/control
index 5b04fb8..4797f92 100644
--- a/p/gitit/debian/control
+++ b/p/gitit/debian/control
@@ -6,7 +6,6 @@ Section: haskell
 Build-Depends: debhelper (>= 9),
  haskell-devscripts (>= 0.10.2.3),
  cdbs,
- dh-linktree,
  xsltproc,
  pandoc,
  docbook-xsl,
diff --git a/p/gitit/debian/libghc-gitit-data.links b/p/gitit/debian/libghc-gitit-data.links
new file mode 100644
index 0000000..ba5b395
--- /dev/null
+++ b/p/gitit/debian/libghc-gitit-data.links
@@ -0,0 +1,4 @@
+/usr/share/javascript/jquery/jquery.min.js usr/share/gitit/data/static/js/jquery.min.js
+/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/gitit/data/static/js/jquery-ui.min.js
+/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css usr/share/gitit/data/static/css/jquery-ui.min.css
+/usr/share/javascript/jquery-hotkeys/jquery.hotkeys.js usr/share/gitit/data/static/js/jquery.hotkeys.js
diff --git a/p/gitit/debian/libghc-gitit-data.linktrees b/p/gitit/debian/libghc-gitit-data.linktrees
deleted file mode 100644
index 039e23d..0000000
--- a/p/gitit/debian/libghc-gitit-data.linktrees
+++ /dev/null
@@ -1,4 +0,0 @@
-embed /usr/share/javascript/jquery/jquery.min.js usr/share/gitit/data/static/js/jquery.min.js
-embed /usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/gitit/data/static/js/jquery-ui.min.js
-embed /usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css usr/share/gitit/data/static/css/jquery-ui.min.css
-embed /usr/share/javascript/jquery-hotkeys/jquery.hotkeys.js usr/share/gitit/data/static/js/jquery.hotkeys.js
diff --git a/p/gitit/debian/rules b/p/gitit/debian/rules
index 9ad3c81..cdb30f7 100755
--- a/p/gitit/debian/rules
+++ b/p/gitit/debian/rules
@@ -24,4 +24,3 @@ install/libghc-gitit-data::
 
 binary-post-install/libghc-gitit-data::
 	chmod +x debian/libghc-gitit-data/usr/share/gitit/data/post-update
-	dh_linktree -plibghc-gitit-data

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