[DebianBRTeam-commits] r604 - in /packages/bittwist/trunk/debian: changelog compat control copyright patches/00list patches/01_Makefile.dpatch patches/02_mapages.dpatch rules watch

eriberto-guest at users.alioth.debian.org eriberto-guest at users.alioth.debian.org
Fri Mar 19 17:16:43 UTC 2010 

Author: eriberto-guest
Date: Fri Mar 19 17:16:43 2010
New Revision: 604

URL: http://svn.debian.org/wsvn/?sc=1&rev=604
Log:
  * New upstream release.
  * Added 02 patch to fix hyfen used as minus signal in manpages.
  * Removed extra blank spaces in debian/{copyright,rules}.
  * Updated debhelper version from 5 to 7.
  * debian/control:
      - Added ${misc:Depends} in Depends field.
      - Changed libpcap0.8-dev to libpcap-dev in Build-Depends.
      - Removed XS from two Vcs lines.
      - Updated information about SVN (Vcs lines).
      - Updated Standards-Version from 3.7.2 to 3.8.4.
  * debian/copyright:
      - Added the "copyright" word in packaging announce.
      - Changed the point to GPL from "/usr/share/common-licenses/GPL" to
        "/usr/share/common-licenses/GPL-2".
  * debian/rules:
      - Changed from dh_clean -k to dh_prep.
      - Made empty binary-indep target.
      - Removed build redundancy from binary-arch target.
      - Removed binary-indep from binary target.
  * debian/watch: fixed the version check.


Added:
    packages/bittwist/trunk/debian/patches/02_mapages.dpatch
Modified:
    packages/bittwist/trunk/debian/changelog
    packages/bittwist/trunk/debian/compat
    packages/bittwist/trunk/debian/control
    packages/bittwist/trunk/debian/copyright
    packages/bittwist/trunk/debian/patches/00list
    packages/bittwist/trunk/debian/patches/01_Makefile.dpatch
    packages/bittwist/trunk/debian/rules
    packages/bittwist/trunk/debian/watch

Modified: packages/bittwist/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/changelog?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/changelog (original)
+++ packages/bittwist/trunk/debian/changelog Fri Mar 19 17:16:43 2010
@@ -1,3 +1,28 @@
+bittwist (1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added 02 patch to fix hyfen used as minus signal in manpages.
+  * Removed extra blank spaces in debian/{copyright,rules}.
+  * Updated debhelper version from 5 to 7.
+  * debian/control:
+      - Added ${misc:Depends} in Depends field.
+      - Changed libpcap0.8-dev to libpcap-dev in Build-Depends.
+      - Removed XS from two Vcs lines.
+      - Updated information about SVN (Vcs lines).
+      - Updated Standards-Version from 3.7.2 to 3.8.4.
+  * debian/copyright:
+      - Added the "copyright" word in packaging announce.
+      - Changed the point to GPL from "/usr/share/common-licenses/GPL" to
+        "/usr/share/common-licenses/GPL-2".
+  * debian/rules:
+      - Changed from dh_clean -k to dh_prep.
+      - Made empty binary-indep target.
+      - Removed build redundancy from binary-arch target.
+      - Removed binary-indep from binary target.
+  * debian/watch: fixed the version check.
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Sat, 27 Feb 2010 21:49:15 -0300
+
 bittwist (1.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -18,6 +43,6 @@
 
 bittwist (0.80-1) unstable; urgency=low
 
-  * Initial release (Closes: #432724)
+  * Initial release. (Closes: #432724)
 
  -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Fri, 27 Jul 2007 09:49:34 -0300

Modified: packages/bittwist/trunk/debian/compat
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/compat?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/compat (original)
+++ packages/bittwist/trunk/debian/compat Fri Mar 19 17:16:43 2010
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/bittwist/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/control?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/control (original)
+++ packages/bittwist/trunk/debian/control Fri Mar 19 17:16:43 2010
@@ -2,15 +2,15 @@
 Section: net
 Priority: optional
 Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-Build-Depends: debhelper (>= 5), dpatch, libpcap0.8-dev
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/unstable/bittwist
-XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/unstable/bittwist
+Build-Depends: debhelper (>= 7), dpatch, libpcap-dev
+Standards-Version: 3.8.4
+Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/bittwist
+Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/bittwist
 Homepage: http://bittwist.sourceforge.net
 
 Package: bittwist
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: wireshark
 Recommends: tcpdump
 Description: libpcap-based Ethernet packet generator
@@ -35,6 +35,6 @@
       checksum correction;
     * append user payload to existing packets after a specific header;
     * select a specific range of packets and save them in another trace file;
-    * if you are teaching Computer Networks classes, you may find Bit-Twist 
-      useful as a practical teaching material. It gives your students a 
+    * if you are teaching Computer Networks classes, you may find Bit-Twist
+      useful as a practical teaching material. It gives your students a
       hands-on experience to learn various networking protocols etc.

Modified: packages/bittwist/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/copyright?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/copyright (original)
+++ packages/bittwist/trunk/debian/copyright Fri Mar 19 17:16:43 2010
@@ -5,7 +5,7 @@
 
 Upstream Author: Addy Yeow Chin Heng <ayeowch at gmail.com>
 
-Copyright: (C) 2006-2007 Addy Yeow Chin Heng
+Copyright: (C) 2006-2009 Addy Yeow Chin Heng
 
 License:
 
@@ -13,18 +13,18 @@
     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 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 package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, 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'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2007, Joao Eriberto Mota Filho
+The Debian packaging is Copyright (C) 2007-2010, Joao Eriberto Mota Filho
 <eriberto at eriberto.pro.br> and is licensed under the GPL 2 or later.

Modified: packages/bittwist/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/patches/00list?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/patches/00list (original)
+++ packages/bittwist/trunk/debian/patches/00list Fri Mar 19 17:16:43 2010
@@ -1,1 +1,2 @@
 01_Makefile.dpatch
+02_mapages.dpatch

Modified: packages/bittwist/trunk/debian/patches/01_Makefile.dpatch
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/patches/01_Makefile.dpatch?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/patches/01_Makefile.dpatch (original)
+++ packages/bittwist/trunk/debian/patches/01_Makefile.dpatch Fri Mar 19 17:16:43 2010
@@ -1,19 +1,18 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile.dpatch by Joao Eriberto Mota Filho 
-## <eriberto at eriberto.pro.br>
+## 01_Makefile.dpatch by Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make Makefile compliant with Debian.
+## DP: Makes Makefile compliant with Debian.
 
 @DPATCH@
-diff -urNad bittwist-0.80~/Makefile bittwist-0.80/Makefile
---- bittwist-0.80~/Makefile	2006-10-23 15:13:23.000000000 -0300
-+++ bittwist-0.80/Makefile	2007-07-28 09:36:07.000000000 -0300
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bittwist-1.1~/Makefile bittwist-1.1/Makefile
+--- bittwist-1.1~/Makefile	2010-02-19 06:16:54.000000000 -0200
++++ bittwist-1.1/Makefile	2010-02-27 22:29:15.266305296 -0300
 @@ -1,6 +1,6 @@
- SHELL = /bin/sh
- 
--prefix = /usr
-+prefix = $(DESTDIR)/usr
- exec_prefix = ${prefix}
- bindir = ${exec_prefix}/bin
- mandir = ${prefix}/share/man/man1
+ SHELL = /bin/sh
+ 
+-prefix = /usr
++prefix = $(DESTDIR)/usr
+ exec_prefix = ${prefix}
+ bindir = ${exec_prefix}/bin
+ mandir = ${prefix}/share/man/man1

Added: packages/bittwist/trunk/debian/patches/02_mapages.dpatch
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/patches/02_mapages.dpatch?rev=604&op=file
==============================================================================
--- packages/bittwist/trunk/debian/patches/02_mapages.dpatch (added)
+++ packages/bittwist/trunk/debian/patches/02_mapages.dpatch Fri Mar 19 17:16:43 2010
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_mapages.dpatch by Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adjust hyphens used as minus sign in manpages.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bittwist-1.1~/doc/bittwist.1 bittwist-1.1/doc/bittwist.1
+--- bittwist-1.1~/doc/bittwist.1	2010-02-19 06:16:54.000000000 -0200
++++ bittwist-1.1/doc/bittwist.1	2010-02-27 22:43:42.710311119 -0300
+@@ -74,7 +74,7 @@
+ .br
+ 0 to send the actual packet length. This is the default.
+ .br
+--1 to send the captured length.
++\-1 to send the captured length.
+ .IP
+ or any other value from 14 to 1514.
+ .TP
+@@ -89,7 +89,7 @@
+ .TP
+ .B \-r \fIrate\fP
+ Limit the sending to \fIrate\fP Mbps. Value for \fIrate\fP must be between 1 to 1000. This option is meant to limit the maximum packet throughput.
+-If you want to send packets at line rate of 100Mbps, try -m 0 -r 100
++If you want to send packets at line rate of 100Mbps, try \-m 0 \-r 100
+ .TP
+ .B \-p \fIsleep\fP
+ Set interval to \fIsleep\fP (in seconds), ignoring the actual interval. Value for \fIsleep\fP must be between 1 to 2146.
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bittwist-1.1~/doc/bittwistb.1 bittwist-1.1/doc/bittwistb.1
+--- bittwist-1.1~/doc/bittwistb.1	2010-02-19 06:16:54.000000000 -0200
++++ bittwist-1.1/doc/bittwistb.1	2010-02-27 22:44:04.450804232 -0300
+@@ -58,7 +58,7 @@
+ .SH EXAMPLES
+ \fIBittwistb\fP will, if run with the \fB-v\fP flag, print forwarding information as shown in the example below:
+ .IP
+-1 : root at localhost# bittwistb -i vr0,fxp0 -v
++1 : root at localhost# bittwistb \-i vr0,fxp0 \-v
+ .br
+ 2 : vr0=00:08:54:36:5e:01,port=1
+ .br
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bittwist-1.1~/doc/bittwiste.1 bittwist-1.1/doc/bittwiste.1
+--- bittwist-1.1~/doc/bittwiste.1	2010-02-19 06:16:54.000000000 -0200
++++ bittwist-1.1/doc/bittwiste.1	2010-02-27 22:44:21.086826520 -0300
+@@ -92,7 +92,7 @@
+ .B \-M \fIlinktype\fP
+ Replace the \fIlinktype\fP stored in the pcap file header. Typically, value for \fIlinktype\fP is 1 for Ethernet.
+ .br
+-Example: -M 12 (for raw IP), -M 51 (for PPPoE)
++Example: \-M 12 (for raw IP), \-M 51 (for PPPoE)
+ .IP
+ For the complete list, see:
+ .br

Modified: packages/bittwist/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/rules?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/rules (original)
+++ packages/bittwist/trunk/debian/rules Fri Mar 19 17:16:43 2010
@@ -25,19 +25,17 @@
 	dh_testroot
 	rm -f build-stamp
 	$(MAKE) clean
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	$(MAKE) DESTDIR=$(CURDIR)/debian/bittwist install
 
-# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGES
@@ -51,5 +49,5 @@
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
+binary: binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Modified: packages/bittwist/trunk/debian/watch
URL: http://svn.debian.org/wsvn/packages/bittwist/trunk/debian/watch?rev=604&op=diff
==============================================================================
--- packages/bittwist/trunk/debian/watch (original)
+++ packages/bittwist/trunk/debian/watch Fri Mar 19 17:16:43 2010
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/bittwist/bittwist-(.*)\.tar\.gz
+http://sf.net/bittwist/bittwist-linux-(.*)\.tar\.gz

More information about the debian-br-team-commits mailing list