[Pkg-haskell-commits] darcs: darcs: Convert to CDBS with hlibrary.mk and build darcs library packages

laney at debian.org laney at debian.org
Sun Sep 25 10:59:45 UTC 2011


Sun Sep 25 09:31:38 UTC 2011  laney at debian.org
  * Convert to CDBS with hlibrary.mk and build darcs library packages 
  Ignore-this: 2682420ad0aaf9be2da28d1532c7d2e7

    M ./changelog +1
    M ./control -3 +81
    A ./darcs.install
    A ./darcs.manpages
    M ./rules -18 +13

Sun Sep 25 09:31:38 UTC 2011  laney at debian.org
  * Convert to CDBS with hlibrary.mk and build darcs library packages 
  Ignore-this: 2682420ad0aaf9be2da28d1532c7d2e7
diff -rN -u old-darcs//changelog new-darcs//changelog
--- old-darcs//changelog	2011-09-25 10:59:45.698331163 +0000
+++ new-darcs//changelog	2011-09-25 10:59:45.794334490 +0000
@@ -13,6 +13,7 @@
     cherry-picked from upstream. (Closes: #642710)
   * Explicitly use /bin/bash for tests; works around failure on buildds with
     dash (Closes: #632494)
+  * Convert to CDBS with hlibrary.mk and build darcs library packages 
 
  -- Erik de Castro Lopo <erikd at mega-nerd.com>  Sun, 10 Jul 2011 11:05:58 +1000
 
diff -rN -u old-darcs//control new-darcs//control
--- old-darcs//control	2011-09-25 10:59:45.691831971 +0000
+++ new-darcs//control	2011-09-25 10:59:45.722335586 +0000
@@ -1,5 +1,5 @@
 Source: darcs
-Section: vcs
+Section: haskell
 Priority: optional
 Maintainer: Erik de Castro Lopo <merikd at mega-nerd.com>
 Uploaders: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>,
@@ -7,9 +7,12 @@
 DM-Upload-Allowed: yes
 # I don't specify lower bounds that can't be violated in Debian.
 # Note that ghc (>= 6.10.4) excludes Lenny libs built against 6.8.
-Build-Depends: debhelper (>= 7.0.50~), ghc,
+Build-Depends: cdbs, debhelper (>= 7), haskell-devscripts (>= 0.8),
+ ghc,
+ ghc-prof,
  bash-completion (>= 1:1.1),
  libcurl4-gnutls-dev (>= 7.19.1),
+ libghc-filepath-dev,
  libghc-hashed-storage-dev,
  libghc-haskeline-dev,
  libghc-html-dev,
@@ -22,7 +25,40 @@
  libghc-tar-dev,
  libghc-terminfo-dev,
  libghc-text-dev,
- libghc-zlib-dev
+ libghc-unix-dev,
+ libghc-zlib-dev,
+ libghc-filepath-prof,
+ libghc-hashed-storage-prof,
+ libghc-haskeline-prof,
+ libghc-html-prof,
+ libghc-http-prof,
+ libghc-mmap-prof,
+ libghc-mtl-prof,
+ libghc-network-prof,
+ libghc-parsec3-prof,
+ libghc-regex-compat-prof,
+ libghc-tar-prof,
+ libghc-terminfo-prof,
+ libghc-text-prof,
+ libghc-unix-prof,
+ libghc-zlib-prof
+Build-Depends-Indep:
+ ghc-doc,
+ libghc-filepath-doc,
+ libghc-hashed-storage-doc,
+ libghc-haskeline-doc,
+ libghc-html-doc,
+ libghc-http-doc,
+ libghc-mmap-doc,
+ libghc-mtl-doc,
+ libghc-network-doc,
+ libghc-parsec3-doc,
+ libghc-regex-compat-doc,
+ libghc-tar-doc,
+ libghc-terminfo-doc,
+ libghc-text-doc,
+ libghc-unix-doc,
+ libghc-zlib-doc
 Build-Conflicts:
  libghc-parsec2-dev,
 Homepage: http://darcs.net/
@@ -31,6 +67,7 @@
 Standards-Version: 3.9.2
 
 Package: darcs
+Section: vcs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: default-mta | mail-transport-agent
@@ -50,3 +87,44 @@
     based on a unique algebra of patches. This smartness lets you
     respond to changing demands in ways that would otherwise not be
     possible.
+
+Package: libghc-darcs-dev
+Architecture: any
+Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: distributed, interactive, smart revision control system; library
+ This package provides a library for the Haskell programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ This library provides an interface to the Darcs distributed revision control
+ system.
+
+Package: libghc-darcs-prof
+Architecture: any
+Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: distributed, interactive, smart revision control system; profiling libraries
+ This package provides a library for the Haskell programming language
+ compiled for profiling.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ This library provides an interface to the Darcs distributed revision control
+ system.
+
+Package: libghc-darcs-doc
+Section: doc
+Architecture: all
+Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Description: distributed, interactive, smart revision control system; documentation
+ This package provides the documentation for a library for the Haskell
+ programming language.  See http://www.haskell.org/ for more information on
+ Haskell.
+ .
+ This library provides an interface to the Darcs distributed revision control
+ system.
diff -rN -u old-darcs//darcs.install new-darcs//darcs.install
--- old-darcs//darcs.install	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs//darcs.install	2011-09-25 10:59:45.706333561 +0000
@@ -0,0 +1 @@
+dist-ghc/build/darcs/darcs usr/bin
diff -rN -u old-darcs//darcs.manpages new-darcs//darcs.manpages
--- old-darcs//darcs.manpages	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs//darcs.manpages	2011-09-25 10:59:45.710336740 +0000
@@ -0,0 +1 @@
+dist-ghc/build/darcs/darcs.1
diff -rN -u old-darcs//rules new-darcs//rules
--- old-darcs//rules	2011-09-25 10:59:45.635830134 +0000
+++ new-darcs//rules	2011-09-25 10:59:45.770334305 +0000
@@ -1,25 +1,20 @@
 #!/usr/bin/make -f
-# Work around #481592 (Closes: #485631).  Remove when #481592 closes!
-CFLAGS := $(filter-out -g,$(CFLAGS))
 
-%:
-	+dh --with bash-completion $@
-override_dh_auto_build: Setup
-	./Setup build
-override_dh_auto_clean: Setup
-	./Setup clean
-override_dh_auto_configure: Setup
-	./Setup configure --prefix=/usr -fcurl-pipelining $(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded) -f-library --ghc-options="+RTS -V0 -RTS"
-override_dh_auto_install: Setup
-	./Setup copy --destdir=$(CURDIR)/debian/darcs
-override_dh_auto_test: Setup
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
+
+DEB_INSTALL_CHANGELOGS_ALL=NEWS
+DEB_INSTALL_DOCS=-XNEWS
+
+DEB_SETUP_GHC_CONFIGURE_ARGS=-fcurl-pipelining $(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded) -flibrary --ghc-options="+RTS -V0 -RTS"
+
+build/libghc-darcs-dev::
 ifneq (nocheck,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	./Setup test
+	$(DEB_SETUP_BIN_NAME) --builddir=dist-ghc test
 endif
-Setup:
-	ghc --make Setup
-override_dh_installchangelogs:	# http://bugs.debian.org/589368
-	dh_installchangelogs -- NEWS
+
+binary-post-install/darcs::
+	dh_bash-completion
 
 # After checking out the debian/ repo, untar the associated upstream
 # tarball over the top of it.





More information about the Pkg-haskell-commits mailing list