[Pkg-haskell-commits] darcs: gitit: Split separate data package

[KAction at gnu.org]

Fri May 29 16:15:38 UTC 2015  KAction at gnu.org
  * Split separate data package
  

    R ./TODO
    M ./changelog +1
    M ./control -4 +15
    M ./rules -29 +3

Fri May 29 16:15:38 UTC 2015  KAction at gnu.org
  * Split separate data package
  
diff -rN -u old-gitit/TODO new-gitit/TODO
--- old-gitit/TODO	2015-05-29 17:43:41.824042210 +0000
+++ new-gitit/TODO	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
- * enable -prof support as soon as also pandoc has it
- * split out a -data package, shared among gitit and libghc-gitit-dev
diff -rN -u old-gitit/changelog new-gitit/changelog
--- old-gitit/changelog	2015-05-29 17:43:41.824042210 +0000
+++ new-gitit/changelog	2015-05-29 17:43:41.856042957 +0000
@@ -13,6 +13,7 @@
   * Use debian/clean file over manual tinkering in debian/rules
   * Bump standards version (3.9.6)
   * Repack to get rid of jquery in source tarball
+  * Separate -data package
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 21 May 2015 23:42:58 +0200
 
diff -rN -u old-gitit/control new-gitit/control
--- old-gitit/control	2015-05-29 17:43:41.824042210 +0000
+++ new-gitit/control	2015-05-29 17:43:41.856042957 +0000
@@ -12,7 +12,9 @@
  ghc,
  pandoc (>= 1.12.4),
  xsltproc,
- docbook-xsl
+ docbook-xsl,
+ libjs-jquery,
+ libjs-jquery-ui,
 # -dev dependencies
  , libghc-parsec3-dev
  , libghc-pretty-dev
@@ -189,8 +191,7 @@
  ${haskell:Extra-Depends},
  ${misc:Depends},
  ${shlibs:Depends},
- libjs-jquery,
- libjs-jquery-ui,
+ libghc-gitit-data (== ${binary:Version}),
  git | darcs | mercurial
 Recommends: mime-support
 Section: web
@@ -206,7 +207,7 @@
  ${haskell:Extra-Depends},
  ${misc:Depends},
  ${shlibs:Depends},
- gitit (>= ${binary:Version})
+ libghc-gitit-data (>= ${binary:Version})
 Suggests: ${haskell:Suggests}
 Recommends: ${haskell:Recommends}
 Provides: ${haskell:Provides}
@@ -237,6 +238,16 @@
 Suggests: ${haskell:Suggests}
 Recommends: ${haskell:Recommends}
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
+ .
+ ${haskell:Blurb}
+
+Package: libghc-gitit-data
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: ${haskell:Suggests}
+Recommends: ${haskell:Recommends}
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
  ${haskell:LongDescription}
  .
  ${haskell:Blurb}
diff -rN -u old-gitit/rules new-gitit/rules
--- old-gitit/rules	2015-05-29 17:43:41.824042210 +0000
+++ new-gitit/rules	2015-05-29 17:43:41.852042864 +0000
@@ -1,16 +1,14 @@
 #!/usr/bin/make -f
+DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp-inst-ghc
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
 MANPAGES := gitit.1 expireGititCache.1
-DEB_INSTALL_MANPAGES_gitit := $(MANPAGES)
 
 DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl
 XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 
-DEB_GHC_EXTRA_PACKAGES := gitit (>= $(CABAL_VERSION))
-
 ifeq (0,$(shell ghc --info | grep 'Have interpreter.*NO' >/dev/null 2>&1; echo $$?))
 DEB_SETUP_GHC_CONFIGURE_ARGS := --flags=-plugins
 endif
@@ -20,29 +18,5 @@
 
 build/gitit:: $(MANPAGES)
 
-define link_jquery_ui
-	dh_link -pgitit /usr/share/javascript/jquery-ui/ui/jquery.ui.$(1).min.js \
-		usr/share/gitit/data/static/js/jquery.ui.$(1).js
-
-endef
-
-install/gitit:: debian/tmp-inst-ghc debian/extra-depends-ghc
-	cp -av debian/tmp-inst-ghc/usr/bin/* debian/gitit/usr/bin
-	cp -av debian/tmp-inst-ghc/usr/share/gitit debian/gitit/usr/share
-
-	$(foreach mod, core draggable droppable tabs, $(call link_jquery_ui,$(mod)))
-	dh_link -pgitit /usr/share/javascript/jquery/jquery.min.js \
-		usr/share/gitit/data/static/js/jquery.js
-
-	# Unlike other libraries, jquery-hotkeys does not provide minimized
-	# version.
-	dh_link -pgitit /usr/share/javascript/jquery-hotkeys/jquery.hotkeys.js \
-		usr/share/gitit/data/static/js/jquery.hotkeys.js
-
-	# Removes a few files, that are not necessary and make lintian cry
-	rm -f debian/gitit/usr/share/gitit/data/post-update
-	rm -f debian/gitit/usr/share/gitit/BLUETRIP-LICENSE
-	rm -f debian/gitit/usr/share/gitit/YUI-LICENSE
-
-	# Build data packages depends
-	dh_haskell_depends -pgitit
+binary-post-install/libghc-gitit-data::
+	dh_linktree -p$(cdbs_curpkg)