[Forensics-changes] [galleta] 01/01: Imported Debian patch 1.0+20040505-8

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Tue Jan 10 02:31:30 UTC 2017


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

eriberto pushed a commit to branch debian
in repository galleta.

commit 998470d8151b2f3a4bec71ae340c30f252d03a9b
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Tue Jan 10 00:14:00 2017 -0200

    Imported Debian patch 1.0+20040505-8
---
 debian/changelog                                      | 19 ++++++++++++++++++-
 debian/compat                                         |  2 +-
 debian/control                                        | 16 +++++++---------
 debian/copyright                                      |  4 +---
 .../{fix-gcc-warnings => 10_fix-gcc-warnings.patch}   |  0
 .../patches/{fix-makefile => 20_fix-makefile.patch}   |  0
 debian/patches/series                                 |  4 ++--
 debian/watch                                          |  7 +++----
 8 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c86a46..a515467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+galleta (1.0+20040505-8) unstable; urgency=medium
+
+  * Team upload.
+  * Bumped DH level to 10.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Updated the Vcs-* fields to use https instead of http and git.
+  * debian/copyright: updated the packaging copyright years.
+  * debian/patches/:
+      - fix-gcc-warnings: renamed to 10_fix-gcc-warnings.patch.
+      - fix-makefile: renamed to 20_fix-makefile.patch.
+  * debian/watch:
+      - Bumped to version 4.
+      - Updated the rule to search for new upstream versions.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 10 Jan 2017 00:14:00 -0200
+
 galleta (1.0+20040505-7) unstable; urgency=medium
 
   * Team upload.
@@ -93,7 +110,7 @@ galleta (1.0+20040505-1) unstable; urgency=low
   * Adding manpage debhelper file to install the manpage.
   * Calling the upstream makefile in clean target of rules rather than
     removing the binary manually.
-  * Adjusted some a formating issue on the manpage.
+  * Adjusted some a formatting issue on the manpage.
   * Rewrapping copyright file.
   * Fixing a few typos in package description.
   * Adding ITP bug number to changelog.
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 2c25b23..b442e21 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,16 @@ Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
 Homepage: http://odessa.sf.net
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/galleta.git
-Vcs-Git: git://anonscm.debian.org/forensics/galleta.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/galleta.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/galleta.git
 
 Package: galleta
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Internet Explorer cookie forensic analysis tool
  Galleta is a forensics tool that examines the content of cookie files
- produced by Microsoft Internet Explorer (MSIE).
- .
- It parses the file and outputs a field separated that can be loaded in
- a spreadsheet.
+ produced by Microsoft Internet Explorer (MSIE). It parses the file and
+ outputs a field separated that can be loaded in a spreadsheet.
diff --git a/debian/copyright b/debian/copyright
index 3df3d4e..07d840f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ License: BSD-3-clause
 Files: debian/*
 Copyright: 2008      Christophe Monniez <christophe.monniez at fccu.be>
            2008-2009 Daniel Baumann <daniel at debian.org>
-           2015      Joao Eriberto Mota Filho <eriberto at debian.org>
+           2015-2017 Joao Eriberto Mota Filho <eriberto at debian.org>
 License: GPL-2+
 
 License: BSD-3-clause
@@ -19,11 +19,9 @@ License: BSD-3-clause
  .
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
- .
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
- .
  3. Neither the name of the project nor the names of its contributors
     may be used to endorse or promote products derived from this software
     without specific prior written permission.
diff --git a/debian/patches/fix-gcc-warnings b/debian/patches/10_fix-gcc-warnings.patch
similarity index 100%
rename from debian/patches/fix-gcc-warnings
rename to debian/patches/10_fix-gcc-warnings.patch
diff --git a/debian/patches/fix-makefile b/debian/patches/20_fix-makefile.patch
similarity index 100%
rename from debian/patches/fix-makefile
rename to debian/patches/20_fix-makefile.patch
diff --git a/debian/patches/series b/debian/patches/series
index c974851..16f7895 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix-gcc-warnings
-fix-makefile
+10_fix-gcc-warnings.patch
+20_fix-makefile.patch
diff --git a/debian/watch b/debian/watch
index ba68cfb..dc24bfc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
-version=3
-opts=uversionmangle=s/_/./g,dversionmangle=s/^1\.0\+(20040505)$/$1.1/,filenamemangle=s/\S*download=//g \
-	https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/odessa/Galleta \
-	.*=galleta(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+version=4
+opts=uversionmangle=s/_[0-9]//,dversionmangle=s/[\d\.]+\+// \
+http://sf.net/odessa/ galleta(?:_|-)([\d\._]+)\.tar\.(?:bz2|gz|xz)

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



More information about the forensics-changes mailing list