[Pkg-haskell-commits] darcs: gitit: Using Debian packages for jQuery and jQuery UI

[mascellani at poisson.phc.unipi.it]

Fri Aug  6 14:49:45 UTC 2010  mascellani at poisson.phc.unipi.it
  * Using Debian packages for jQuery and jQuery UI
  Ignore-this: ac2c39360a3b2bf51c2768376157d3

    M ./control -1 +3
    M ./copyright +4
    M ./rules -4 +7

Fri Aug  6 14:49:45 UTC 2010  mascellani at poisson.phc.unipi.it
  * Using Debian packages for jQuery and jQuery UI
  Ignore-this: ac2c39360a3b2bf51c2768376157d3
diff -rN -u old-gitit/control new-gitit/control
--- old-gitit/control	2010-08-28 08:07:16.529089274 +0000
+++ new-gitit/control	2010-08-28 08:07:16.537089705 +0000
@@ -69,7 +69,9 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- ${gitit:Depends}
+ ${gitit:Depends},
+ libjs-jquery,
+ libjs-jquery-ui
 Description: Wiki engine backed by a git or darcs filestore
  Gitit is a wiki backed by a git or darcs filestore. Pages and uploaded files
  can be modified either directly via the VCS’s command-line tools or through
diff -rN -u old-gitit/copyright new-gitit/copyright
--- old-gitit/copyright	2010-08-28 08:07:16.529089274 +0000
+++ new-gitit/copyright	2010-08-28 08:07:16.533089490 +0000
@@ -54,6 +54,8 @@
  On Debian systems, the text of the GPL-2 license can be found in the
  file `/usr/share/common-licenses/GPL-2'.
 X-Origin: http://jquery.com/
+X-Comment: jQuery is already packaged in Debian: this embedded copy isn't
+ used by gitit, a symbolic link to the Debian package is made instead.
 
 Files: data/static/js/jquery-ui.packed.js
 Copyright: © 2008-2010, Paul Bakaus
@@ -84,6 +86,8 @@
  On Debian systems, the text of the GPL-2 license can be found in the
  file `/usr/share/common-licenses/GPL-2'.
 X-Origin: http://jqueryui.com/
+X-Comment: jQuery UI is already packaged in Debian: this embedded copy isn't
+ used by gitit, a symbolic link to the Debian package is made instead.
 
 Files: data/static/js/jquery.hotkeys-0.7.9.min.js
 Copyright: © 2010, John Resig
diff -rN -u old-gitit/rules new-gitit/rules
--- old-gitit/rules	2010-08-28 08:07:16.529089274 +0000
+++ new-gitit/rules	2010-08-28 08:07:16.537089705 +0000
@@ -7,11 +7,14 @@
 FILESTORE_DEP := $(shell dpkg -p libghc6-filestore-data | grep ^Version: | cut -d' ' -f2)
 
 install/gitit:: debian/tmp-inst-ghc6
-	mv debian/tmp-inst-ghc6/usr/bin/* debian/gitit/usr/bin
-	mv debian/tmp-inst-ghc6/usr/share/gitit-$(CABAL_VERSION) debian/gitit/usr/share
+	cp -av debian/tmp-inst-ghc6/usr/bin/* debian/gitit/usr/bin
+	cp -av debian/tmp-inst-ghc6/usr/share/gitit-$(CABAL_VERSION) debian/gitit/usr/share
 
-	# Generate dependencies against data packages
-	echo "gitit:Depends=pandoc (= ${PANDOC_DEP}), libghc6-filestore-data (= ${FILESTORE_DEP})" >> debian/gitit.substvars
+	# Don't use embedded copies of jQuery and jQuery UI; instead, make symlinks
+	rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery.min.js \
+		debian/gitit/usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery-ui.packed.js
+	dh_link -pgitit /usr/share/javascript/jquery/jquery.min.js usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery.min.js
+	dh_link -pgitit /usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery-ui.packed.js
 
 install/libghc6-gitit-dev:: debian/tmp-inst-ghc6
 	# Generate dependencies against data packages