2 files changed, 18 insertions, 28 deletions
diff --git a/p/haskell-diff/debian/changelog b/p/haskell-diff/debian/changelog
index 4d299bd24..1a29da54d 100644
--- a/p/haskell-diff/debian/changelog
+++ b/p/haskell-diff/debian/changelog
@@ -2,6 +2,7 @@ haskell-diff (0.3.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Reformat debian/changelog according to dep5
+  * Use X-Descriptions and blurbs to avoid duplication
 
  -- Dmitry Bogatov <KAction@gnu.org>  Sat, 27 Jun 2015 20:05:51 +0300
 
diff --git a/p/haskell-diff/debian/control b/p/haskell-diff/debian/control
index 0be84e2fc..d3c91bd8c 100644
--- a/p/haskell-diff/debian/control
+++ b/p/haskell-diff/debian/control
@@ -16,6 +16,14 @@ Standards-Version: 3.9.6
 Homepage: http://hackage.haskell.org/package/Diff
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-diff
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-diff
+X-Description: GHC libraries for the Haskell O(ND) diff algorithm library
+ This is a Haskell library providing an implementation of the O(ND) diff
+ algorithm described in "An O(ND) Difference Algorithm and Its Variations"
+ (1986) by Eugene W. Myers. It is O(mn) in space.
+ .
+ Whilst the algorithm is the same one used by standared Unix diff, the
+ assumption is that users of this library will want to diff over interesting
+ things or perform interesting tasks with the results.
 
 Package: libghc-diff-dev
 Architecture: any
@@ -25,16 +33,10 @@ Depends: ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
-Description: GHC libraries for the Haskell O(ND) diff algorithm library
- This is a Haskell library providing an implementation of the O(ND) diff
- algorithm described in "An O(ND) Difference Algorithm and Its Variations"
- (1986) by Eugene W. Myers. It is O(mn) in space.
- .
- Whilst the algorithm is the same one used by standared Unix diff, the
- assumption is that users of this library will want to diff over interesting
- things or perform interesting tasks with the results.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- This package contains the libraries compiled for GHC.
+ ${haskell:Blurb}
 
 Package: libghc-diff-prof
 Architecture: any
@@ -44,17 +46,10 @@ Depends: ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
-Description: GHC profiling libraries for the Haskell O(ND) diff algorithm library
- This is a Haskell library providing an implementation of the O(ND) diff
- algorithm described in "An O(ND) Difference Algorithm and Its Variations"
- (1986) by Eugene W. Myers. It is O(mn) in space.
- .
- Whilst the algorithm is the same one used by standared Unix diff, the
- assumption is that users of this library will want to diff over interesting
- things or perform interesting tasks with the results.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- This package contains additional GHC profiling libraries which can be used with
- libghc-diff-dev
+ ${haskell:Blurb}
 
 Package: libghc-diff-doc
 Section: doc
@@ -62,13 +57,7 @@ Architecture: all
 Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
-Description: GHC libraries for the Haskell O(ND) diff algorithm library (documentation)
- This is a Haskell library providing an implementation of the O(ND) diff
- algorithm described in "An O(ND) Difference Algorithm and Its Variations"
- (1986) by Eugene W. Myers. It is O(mn) in space.
- .
- Whilst the algorithm is the same one used by standared Unix diff, the
- assumption is that users of this library will want to diff over interesting
- things or perform interesting tasks with the results.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- This package contains library documentation.
+ ${haskell:Blurb}