[Forensics-changes] [pipebench] 01/01: Imported Debian patch 0.40-4
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Wed Jul 22 16:32:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository pipebench.
commit efa069eca9d51c5f9a542c00bc1d5364a93a366b
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Jul 20 21:54:14 2015 -0300
Imported Debian patch 0.40-4
---
debian/changelog | 24 ++++++++++++++++++++
debian/compat | 2 +-
debian/control | 15 ++++++++-----
debian/copyright | 50 +++++++++++++++--------------------------
debian/dirs | 2 ++
debian/docs | 1 +
debian/patches/fix-makefile | 28 +++++++++++++++++++++++
debian/patches/series | 1 +
debian/pipebench.install | 1 -
debian/pipebench.manpages | 1 -
debian/rules | 8 +++----
debian/source.lintian-overrides | 3 ---
debian/source/format | 1 +
debian/watch | 3 +++
14 files changed, 92 insertions(+), 48 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c28cc5c..a1a5b2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+pipebench (0.40-4) unstable; urgency=medium
+
+ * Team upload.
+ * Migrations:
+ - debian/copyright to 1.0 format.
+ - debian/rules to new (reduced) format.
+ - DebSrc to 3.0 format.
+ - DH level to 9.
+ * debian/control:
+ - Added the word 'forensics' to long description.
+ - Bumped Standards-Version to 3.9.6.
+ - Updated the Vcs-* fields.
+ * debian/copyright: updated all information.
+ * debian/dirs: added to create some directories.
+ * debian/docs: added to install the README file.
+ * debian/patches/fix-makefile: created to add GCC hardening and fix the
+ install path.
+ * debian/pipebench.install: removed. Using a patch to fix the Makefile.
+ * debian/pipebench.manpages: removed. Using a patch to fix the Makefile.
+ * debian/source.lintian-overrides: removed. Using 'Team upload' now.
+ * debian/watch: created.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Mon, 20 Jul 2015 21:54:14 -0300
+
pipebench (0.40-3) unstable; urgency=low
* Updating package to standards version 3.8.2.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 63a1cc3..15507ef 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,17 @@ 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 (>= 7)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.6
Homepage: http://www.habets.pp.se/synscan/programs.php?prog=pipebench
-Vcs-Browser: http://git.debian.org/?p=forensics/pipebench.git
-Vcs-Git: git://git.debian.org/forensics/pipebench.git
+Vcs-Browser: http://anonscm.debian.org/cgit/forensics/pipebench.git
+Vcs-Git: git://anonscm.debian.org/forensics/pipebench.git
Package: pipebench
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Measures the speed of stdin/stdout communication
- Pipebench shows the current throughput and amount of data going through a pipe.
+Description: measures the speed of stdin/stdout communication
+ Pipebench shows the current throughput and amount of data going
+ through a pipe.
+ .
+ This is useful in forensics investigations and other actions.
diff --git a/debian/copyright b/debian/copyright
index 00a7e8e..2049b9e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,30 @@
-Author: Thomas Habets <thomas at habets.pp.se>
-Download: http://www.habets.pp.se/synscan/programs.php?prog=pipebench
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: Synscan
+Source: http://www.habets.pp.se/synscan/programs.php?prog=pipebench
Files: *
-Copyright: (C) 2003 Thomas Habets
+Copyright: 2002 Thomas Habets <thomas at habets.pp.se>
License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
Files: debian/*
-Copyright:
- (C) 2008 Christophe Monniez <christophe.monniez at fccu.be>
- (C) 2008-2009 Daniel Baumann <daniel at debian.org>
+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>
+License: GPL-2+
+
License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
.
- This program is distributed in the hope that it will be useful,
+ This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>
.
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..98d1583
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile
new file mode 100644
index 0000000..4fb9328
--- /dev/null
+++ b/debian/patches/fix-makefile
@@ -0,0 +1,28 @@
+Description: add GCC hardening and fix the install path.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-07-20
+Index: pipebench-0.40/Makefile
+===================================================================
+--- pipebench-0.40.orig/Makefile
++++ pipebench-0.40/Makefile
+@@ -1,16 +1,16 @@
+ # $Id: Makefile,v 1.2 2002/12/15 19:58:36 marvin Exp $
+
+ CC=gcc
+-CFLAGS=-Wall -w -pedantic
++CFLAGS+=-Wall -w -pedantic
+
+ all: pipebench
+ doc: pipebench.1
+ install: pipebench
+- cp pipebench /usr/local/bin/
+- cp pipebench.1 /usr/local/man/man1/
++ cp pipebench $(DESTDIR)/usr/bin/
++ cp pipebench.1 $(DESTDIR)/usr/share/man/man1/
+
+ pipebench: pipebench.c
+- $(CC) $(CFLAGS) -o pipebench pipebench.c
++ $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o pipebench pipebench.c
+
+ pipebench.1: pipebench.yodl
+ yodl2man -o pipebench.1 pipebench.yodl
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4f20ff2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-makefile
diff --git a/debian/pipebench.install b/debian/pipebench.install
deleted file mode 100644
index 4bf386c..0000000
--- a/debian/pipebench.install
+++ /dev/null
@@ -1 +0,0 @@
-pipebench /usr/bin
diff --git a/debian/pipebench.manpages b/debian/pipebench.manpages
deleted file mode 100644
index f558ab9..0000000
--- a/debian/pipebench.manpages
+++ /dev/null
@@ -1 +0,0 @@
-pipebench.1
diff --git a/debian/rules b/debian/rules
index a483395..f726ce8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
+# export DH_VERBOSE=1
-%:
- dh ${@}
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-override_dh_auto_install:
- # nothing to be done
+%:
+ dh $@
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 2bb5aa9..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Avoid warnings if non-uploaders to uploads.
-pipebench source: changelog-should-mention-nmu
-pipebench source: source-nmu-has-incorrect-version-number
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..7c126d1
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.habets.pp.se/synscan/files/pipebench-(\d\S+)\.tar\.(?:bz2|gz|xz)
+http://www.habets.pp.se/synscan/programs.php?prog=pipebench .*/files/pipebench-(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/pipebench.git
More information about the forensics-changes
mailing list