[Pkg-haskell-commits] darcs: haskell-devscripts: Do not truncate existing lintian overrides file

[KAction at gnu.org]

Tue Mar 10 13:19:57 UTC 2015  KAction at gnu.org
  * Do not truncate existing lintian overrides file

    M ./debian/changelog -1 +2
    M ./debian/control -1 +2
    M ./hlibrary.mk -2 +10

Tue Mar 10 13:19:57 UTC 2015  KAction at gnu.org
  * Do not truncate existing lintian overrides file
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog	2015-03-10 13:26:51.491301592 +0000
+++ new-haskell-devscripts/debian/changelog	2015-03-10 13:26:51.495301593 +0000
@@ -1,6 +1,7 @@
 haskell-devscripts (0.9.3) UNRELEASED; urgency=medium
 
-  *  Fix hardening-no-relro lintian warning
+  * Fix hardening-no-relro lintian warning
+  * Do not truncate existing lintian overrides file
 
  -- Dmitry Bogatov <KAction at gnu.org>  Tue, 10 Mar 2015 15:27:10 +0300
 
diff -rN -u old-haskell-devscripts/debian/control new-haskell-devscripts/debian/control
--- old-haskell-devscripts/debian/control	2015-03-10 13:26:51.491301592 +0000
+++ new-haskell-devscripts/debian/control	2015-03-10 13:26:51.495301593 +0000
@@ -4,6 +4,7 @@
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Marco Silva <marcot at debian.org>, Joachim Breitner <nomeata at debian.org>
          , Louis Bettens <louis at bettens.info>
+	 , Dmitry Bogatov <KAction at gnu.org>
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: perl
 Standards-Version: 3.9.5
@@ -19,7 +20,7 @@
   , cdbs
   , ${misc:Depends}
   , html-xml-utils
-  , hscolour 
+  , hscolour
   , ghc-haddock
 Description: Tools to help Debian developers build Haskell packages
  This package provides a collection of scripts to help build Haskell
diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk	2015-03-10 13:26:51.491301592 +0000
+++ new-haskell-devscripts/hlibrary.mk	2015-03-10 13:26:51.503301595 +0000
@@ -101,7 +101,11 @@
 	rm -rf debian/tmp-inst-ghc
 	rm -f debian/extra-depends
 	rm -f debian/libghc-$(CABAL_PACKAGE)-doc.links
-	rm -f debian/libghc-$(CABAL_PACKAGE)-dev.lintian-overrides
+	if [ -f $(DEB_LINTIAN_OVERRIDES_FILE) ] ; then					\
+	    sed -i '/binary-or-shlib-defines-rpath/ d' $(DEB_LINTIAN_OVERRIDES_FILE) ;	\
+	    find $(DEB_LINTIAN_OVERRIDES_FILE) -empty -delete;				\
+	fi
+
 	rm -f $(MAKEFILE)
 	rm -rf debian/dh_haskell_shlibdeps
 
@@ -161,6 +165,8 @@
 		dh_haskell_extra_depends $$pkg_config ; \
 		rm $$pkg_config
 
+DEB_LINTIAN_OVERRIDES_FILE = debian/libghc-$(CABAL_PACKAGE)-dev.lintian-overrides
+
 install/libghc-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghc debian/extra-depends
 	cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
 		\( ! -name "*_p.a" ! -name "*.p_hi" \) \
@@ -173,7 +179,9 @@
 		mkdir -p debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages; \
 		echo '$(DEB_GHC_EXTRA_PACKAGES)' > debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages/$(CABAL_PACKAGE)-$(CABAL_VERSION) ; \
 	fi
-	echo binary-or-shlib-defines-rpath > debian/libghc-$(CABAL_PACKAGE)-dev.lintian-overrides
+
+	grep -s binary-or-shlib-defines-rpath $(DEB_LINTIAN_OVERRIDES_FILE) \
+	     || echo binary-or-shlib-defines-rpath >> $(DEB_LINTIAN_OVERRIDES_FILE)
 	dh_haskell_provides -p$(notdir $@)
 	dh_haskell_depends -p$(notdir $@)
 	dh_haskell_shlibdeps -p$(notdir $@)