Package: drift
Version: 2.2.3-2.2
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
NOTE: Local changes to original sources were moved to patch 01. These
original upstream files were restored:
src/DataP.lhs
src/DrIFT.hs
src/ParseLib2.hs
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From c62605c28f01162d7d0f2473a4868fd03d710cba Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 18 May 2013 20:07:08 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 15 ++++++
debian/control | 5 +-
debian/patches/00list | 1 -
debian/patches/01-local-changes.patch | 49 ++++++++++++++++++++
...ghc-7.4-fixes.dpatch => 02-ghc-7.4-fixes.patch} | 8 ++--
debian/patches/series | 2 +
debian/rules | 25 ++++++++--
src/DataP.lhs | 6 +--
src/DrIFT.hs | 2 +-
src/ParseLib2.hs | 4 +-
10 files changed, 98 insertions(+), 19 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/01-local-changes.patch
rename debian/patches/{ghc-7.4-fixes.dpatch => 02-ghc-7.4-fixes.patch} (98%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 7d84623..34689a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+drift (2.2.3-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
+ (Closes: #669554).
+ * Update Standards-Version to 3.9.4 and debhelper to 9.
+ * Patches
+ - (01): New. Contains in-line changes to local sources.
+ * Lintian fixes
+ - binary-control-field-duplicates-source section
+ - ored-build-depends-on-obsolete-package tetex-bin
+ - package-contains-info-dir-file
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 18 May 2013 19:45:13 +0300
+
drift (2.2.3-2.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 125cb49..6b1fd4f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,14 @@ Source: drift
Section: devel
Priority: optional
Maintainer: Arjan Oosting <ar...@debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5.0.0), dpatch, ghc, texlive-latex-base | tetex-bin, tex-common (>= 0.23), texinfo, texi2html, libghc-random-dev
-Standards-Version: 3.7.3
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 9), ghc, texlive-latex-base, tex-common (>= 0.23), texinfo, texi2html, libghc-random-dev
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/drift/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/drift/trunk
Homepage: http://repetae.net/john/computer/haskell/DrIFT/
Package: drift
Architecture: any
-Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ghc
Suggests: doc-base
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0ecc251..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-ghc-7.4-fixes.dpatch
diff --git a/debian/patches/01-local-changes.patch b/debian/patches/01-local-changes.patch
new file mode 100644
index 0000000..db664c0
--- /dev/null
+++ b/debian/patches/01-local-changes.patch
@@ -0,0 +1,49 @@
+From: unknown
+Subject: Debian local chnages to original sources
+
+index 0000000..57f6396
+diff --git a/src/DataP.lhs b/src/DataP.lhs
+index e261d94..eabed29 100644
+--- a/src/DataP.lhs
++++ b/src/DataP.lhs
+@@ -10,9 +10,9 @@ needs to be fixed.
+ >where
+
+ >import ParseLib2
+->import Char
+->import List
+->import Monad
++>import Data.Char
++>import Data.List
++>import Control.Monad
+
+
+ >data Statement = DataStmt | NewTypeStmt deriving (Eq,Show)
+diff --git a/src/DrIFT.hs b/src/DrIFT.hs
+index 8419583..9abb120 100644
+--- a/src/DrIFT.hs
++++ b/src/DrIFT.hs
+@@ -17,7 +17,7 @@ import RuleUtils (commentLine,texts)
+ import RuleUtils(Rule,Tag)
+ import Version
+ import qualified Rules(rules)
+-import qualified System
++import System.Environment (getArgs)
+
+ data Op = OpList | OpDerive | OpVersion
+
+diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs
+index 3be9b85..730e4be 100644
+--- a/src/ParseLib2.hs
++++ b/src/ParseLib2.hs
+@@ -31,8 +31,8 @@ module ParseLib2
+ many1_offside,many_offside,off,
+ opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where
+
+-import Char
+-import Monad
++import Data.Char
++import Control.Monad
+
+ infixr 5 +++
+
diff --git a/debian/patches/ghc-7.4-fixes.dpatch b/debian/patches/02-ghc-7.4-fixes.patch
similarity index 98%
rename from debian/patches/ghc-7.4-fixes.dpatch
rename to debian/patches/02-ghc-7.4-fixes.patch
index 4fca238..8ad20dc 100644
--- a/debian/patches/ghc-7.4-fixes.dpatch
+++ b/debian/patches/02-ghc-7.4-fixes.patch
@@ -1,9 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Description: Alter imports for new modules exposed by GHC 7.4
-## Origin/Author: Iain Lane <la...@debian.org>
-## Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669554
+From: Iain Lane <i...@orangesquash.org.uk>
+Subject: Alter imports for new modules exposed by GHC 7.4
+Bug-Debian: http://bugs.debian.org/669554
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drift-2.2.3~/src/ChaseImports.hs drift-2.2.3/src/ChaseImports.hs
--- drift-2.2.3~/src/ChaseImports.hs 2008-02-10 14:38:31.000000000 +0000
+++ drift-2.2.3/src/ChaseImports.hs 2012-09-18 21:23:49.074270747 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..583a520
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-local-changes.patch
+02-ghc-7.4-fixes.patch
diff --git a/debian/rules b/debian/rules
index 32accdc..e28ddf9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_CONFIGURE_EXTRA_FLAGS := --with-hc=ghc
@@ -15,10 +14,27 @@ endif
# Don't compress pdf files since pdf reader can not read pdf.gz files.
DEB_COMPRESS_EXCLUDE := .pdf
+ORIG = \
+ aclocal.m4 \
+ configure \
+ src/Makefile.in \
+ example/Makefile.in \
+ docs/drift.info \
+ docs/drift.html \
+ docs/version.texi \
+ docs/stamp-vti \
+ Makefile.in \
+ src/Rules.hs \
+ src/Version.hs \
+
+configure::
+ # save files that will be modified by the build process
+ for f in $(ORIG); do [ -f $$f._ ] || cp -a $$f $$f._ ; done || :
+
clean::
- rm -f docs/stamp-vti
- rm -f docs/version.texi
- rm -f src/Rules.hs
+ # restore
+ for f in $(ORIG); do [ ! -f $$f._ ] || mv $$f._ $$f; done
+ rm -f config.log config.status docs/drift.html
common-build-arch::
rm -f "$(DEB_BUILDDIR)/docs/drift.html"
@@ -30,5 +46,6 @@ binary-post-install/drift::
install -m 644 -o root -g root "$(DEB_BUILDDIR)/docs/drift.ps" debian/drift/usr/share/doc/drift
# install -m 644 -o root -g root "$(DEB_BUILDDIR)/docs/drift.pdf" debian/drift/usr/share/doc/drift
rm debian/drift/usr/share/doc/drift/README
+ rm -f debian/drift/usr/share/info/dir*
.PHONY: update-debian-control
diff --git a/src/DataP.lhs b/src/DataP.lhs
index eabed29..e261d94 100644
--- a/src/DataP.lhs
+++ b/src/DataP.lhs
@@ -10,9 +10,9 @@ needs to be fixed.
>where
>import ParseLib2
->import Data.Char
->import Data.List
->import Control.Monad
+>import Char
+>import List
+>import Monad
>data Statement = DataStmt | NewTypeStmt deriving (Eq,Show)
diff --git a/src/DrIFT.hs b/src/DrIFT.hs
index 9abb120..8419583 100644
--- a/src/DrIFT.hs
+++ b/src/DrIFT.hs
@@ -17,7 +17,7 @@ import RuleUtils (commentLine,texts)
import RuleUtils(Rule,Tag)
import Version
import qualified Rules(rules)
-import System.Environment (getArgs)
+import qualified System
data Op = OpList | OpDerive | OpVersion
diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs
index 730e4be..3be9b85 100644
--- a/src/ParseLib2.hs
+++ b/src/ParseLib2.hs
@@ -31,8 +31,8 @@ module ParseLib2
many1_offside,many_offside,off,
opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where
-import Data.Char
-import Control.Monad
+import Char
+import Monad
infixr 5 +++
--
1.7.10.4
