[Forensics-changes] [aesfix] 01/01: Imported Debian patch 1.0.1-5

[Joao Eriberto Mota Filho]

This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository aesfix.

commit cdde3dd93fd7a99f19a0b862fb89f26c62e60bf2
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Sun Jan 1 22:11:13 2017 -0200

    Imported Debian patch 1.0.1-5
---
 debian/changelog                                        | 17 +++++++++++++++++
 debian/compat                                           |  2 +-
 debian/control                                          | 11 +++++------
 debian/copyright                                        |  8 ++++----
 debian/install                                          |  2 +-
 .../patches/{add-hardening => 10_add-hardening.patch}   |  0
 debian/patches/series                                   |  2 +-
 debian/upstream/signing-key.asc                         |  1 -
 debian/watch                                            |  7 ++-----
 9 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 377dfdf..be4f03c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+aesfix (1.0.1-5) unstable; urgency=medium
+
+  * Team upload.
+  * Bumped DH level to 10.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Removed a MIA uploader (solves a special case pointed by QA team).
+      - Updated the Vcs-* fields to use https instead of http and git.
+  * debian/copyright: updated the packaging copyright years.
+  * debian/patches/add-hardening: renamed to 10_add-hardening.patch.
+  * debian/watch:
+      - Bumped to version 4.
+      - Removed an extra source to avoid conflicts with uscan and updated
+        the current rule.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sun, 01 Jan 2017 22:11:13 -0200
+
 aesfix (1.0.1-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 81d1379..aa850a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,15 @@ Source: aesfix
 Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
-Uploaders: Jacob Appelbaum <jacob at appelbaum.net>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
 Homepage: https://citp.princeton.edu/research/memory/code
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/aesfix.git
-Vcs-Git: git://anonscm.debian.org/forensics/aesfix.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/aesfix.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/aesfix.git
 
 Package: aesfix
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: aeskeyfind
 Description: tool for correcting bit errors in an AES key schedule
  This program illustrates a technique for correcting bit errors in an AES
diff --git a/debian/copyright b/debian/copyright
index 0281296..2c23dd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,15 +5,15 @@ Source: https://citp.princeton.edu/research/memory/code
 Files: *
 Copyright: 2008 Nadia Heninger
            2008 J. Alex Halderman
-License: BSD-3-clause
+License: BSD-3-Clause
 
 Files: debian/*
 Copyright: 2008-2009 Jacob Appelbaum <jacob at appelbaum.net>
-           2011 Julien Valroff <julien at debian.org>
-           2015 Joao Eriberto Mota Filho <eriberto at debian.org>
+           2011      Julien Valroff <julien at debian.org>
+           2015-2017 Joao Eriberto Mota Filho <eriberto at debian.org>
 License: GPL-2+
 
-License: BSD-3-clause
+License: BSD-3-Clause
  Redistribution and use of this software in source and binary forms,
  with or without modification, are permitted provided that the
  following conditions are met:
diff --git a/debian/install b/debian/install
index 5db520f..877e9e5 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-aesfix	/usr/bin
+aesfix usr/bin
diff --git a/debian/patches/add-hardening b/debian/patches/10_add-hardening.patch
similarity index 100%
rename from debian/patches/add-hardening
rename to debian/patches/10_add-hardening.patch
diff --git a/debian/patches/series b/debian/patches/series
index 346557c..8115920 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-add-hardening
+10_add-hardening.patch
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 1f85097..0c55e7c 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,4 +1,3 @@
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEfWFOgRBAC0KtapVfG3Vfn4rmZn9kFWQ3MhDBgcjeKMueJ+ceQ9715d9QsO
diff --git a/debian/watch b/debian/watch
index a786c5f..3ece36f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,3 @@
-version=3
+version=4
 opts="pgpsigurlmangle=s/$/.asc/" \
-https://citp.princeton.edu/memory-content/src/aesfix-(\d\S+)\.tar\.(?:bz2|gz|xz)
-
-opts="pgpsigurlmangle=s/$/.asc/" \
-https://citp.princeton.edu/research/memory/code .*/src/aesfix-(\d\S+)\.tar\.(?:bz2|gz|xz)
+https://citp.princeton.edu/research/memory/code .*/aesfix-(\d\S+)\.tar\.(?:bz2|gz|xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/aesfix.git