4 files changed, 23 insertions, 9 deletions

diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index a268dff..94bcb6d 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -1093,11 +1093,13 @@ parse_signature_subpacket tag =
 signature_issuer :: Packet -> Maybe String
 signature_issuer (SignaturePacket {hashed_subpackets = hashed,
                                    unhashed_subpackets = unhashed}) =
-        if length issuers > 0 then Just issuer else Nothing
-        where IssuerPacket issuer = issuers !! 0
-              issuers = filter isIssuer hashed ++ filter isIssuer unhashed
-              isIssuer (IssuerPacket {}) = True
-              isIssuer _ = False
+        case issuers of
+                IssuerPacket issuer : _ -> Just issuer
+                _                       -> Nothing
+        where
+        issuers = filter isIssuer hashed ++ filter isIssuer unhashed
+        isIssuer (IssuerPacket {}) = True
+        isIssuer _ = False
 signature_issuer _ = Nothing
 
 find_key :: (Packet -> String) -> Message -> String -> Maybe Packet
diff --git a/Makefile b/Makefile
index 67e823b..076b00a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ else
 GHCFLAGS=-Wall -O2 -fno-warn-name-shadowing -XHaskell98
 endif
 
-HLINTFLAGS=-XHaskell98 -XCPP -i 'Use camelCase' -i 'Use String' -i 'Use head' -i 'Use string literal' -i 'Use list comprehension' --utf8
+HLINTFLAGS=-u -XHaskell98 -XCPP -i 'Use camelCase' -i 'Use String' -i 'Use string literal' -i 'Use list comprehension'
 VERSION=0.4
 
 .PHONY: all clean doc install debian test
diff --git a/debian/changelog b/debian/changelog
index 31d5882..60634f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+haskell-openpgp (0.4-1~hackage1) unstable; urgency=low
+
+  * Debianization generated by cabal-debian
+
+ -- Stephen Paul Weber <singpolyma@singpolyma.net>  Thu, 01 Nov 2012 14:31:20 -0500
+
 haskell-openpgp (0.3-1~hackage1) unstable; urgency=low
 
   * Debianization generated by cabal-debian
diff --git a/debian/control b/debian/control
index 679e316..14b26b0 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,9 @@ Description: Implementation of the OpenPGP message format
  and then defines instances of Data.Binary for each to facilitate
  encoding/decoding.
  .
- For performing cryptography, see <http://hackage.haskell.org/openpgp-Crypto>
+ For performing cryptography, see
+ <http://hackage.haskell.org/package/openpgp-crypto-api> or
+ <http://hackage.haskell.org/package/openpgp-Crypto>
  .
  It is intended that you use qualified imports with this library.
  .
@@ -69,7 +71,9 @@ Description: Implementation of the OpenPGP message format
  and then defines instances of Data.Binary for each to facilitate
  encoding/decoding.
  .
- For performing cryptography, see <http://hackage.haskell.org/openpgp-Crypto>
+ For performing cryptography, see
+ <http://hackage.haskell.org/package/openpgp-crypto-api> or
+ <http://hackage.haskell.org/package/openpgp-Crypto>
  .
  It is intended that you use qualified imports with this library.
  .
@@ -97,7 +101,9 @@ Description: Implementation of the OpenPGP message format
  and then defines instances of Data.Binary for each to facilitate
  encoding/decoding.
  .
- For performing cryptography, see <http://hackage.haskell.org/openpgp-Crypto>
+ For performing cryptography, see
+ <http://hackage.haskell.org/package/openpgp-crypto-api> or
+ <http://hackage.haskell.org/package/openpgp-Crypto>
  .
  It is intended that you use qualified imports with this library.
  .