Changes in / [857729e:4819d75]

Files:

• .gitlab-ci.yml (added)
• debian/autogen.sh (deleted)
• debian/compat (modified) (1 diff)
• debian/control (modified) (4 diffs)
• debian/copyright (modified) (1 diff)
• debian/libpacketdump4-dev.install (modified) (1 diff)
• debian/libpacketdump4.install (modified) (1 diff)
• debian/libtrace4-dev.dirs (modified) (1 diff)
• debian/libtrace4-dev.install (modified) (1 diff)
• debian/rules (modified) (4 diffs)
• gitlab-build.sh (added)

debian/compat

@@ -1 @@
-5
+9

debian/control

@@ -40 +40 @@
  and multiple input formats.
  .
- libtrace is developed by the WAND Network Research Group at Waikato 
+ libtrace is developed by the WAND Network Research Group at Waikato
  University in New Zealand.
 
@@ -55 +55 @@
  the libpacketdump library.
  .
- libpacketdump provides a library which can parse packets and display the 
+ libpacketdump provides a library which can parse packets and display the
  packet contents in a nice human-readable form. The output is similar to that
  produced by tcpdump, although the formatting is somewhat more verbose.
@@ -74 +74 @@
  produced by tcpdump, although the formatting is somewhat more verbose.
  .
- libpacketdump is developed by the WAND Network Research Group at Waikato 
+ libpacketdump is developed by the WAND Network Research Group at Waikato
  University in New Zealand.
 
@@ -87 +87 @@
  tasks that are required when analysing and manipulating network traces.
  .
- Multiple input methods and formats are supported including device capture, 
+ Multiple input methods and formats are supported including device capture,
  raw and gz-compressed traces, and sockets.
- . 
- libtrace is developed by the WAND Network Research Group at Waikato 
+ .
+ libtrace is developed by the WAND Network Research Group at Waikato
  University in New Zealand.

debian/copyright

@@ -1 @@
-This package was debianized by Matt Brown <debian@mattb.net.nz> on
-Thu, 13 Oct 2005 00:28:25 +1300.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Libtrace
+Source: http://research.wand.net.nz/software/libtrace.php
 
-It was downloaded from http://research.wand.net.nz/software/libtrace.php
-
-Copyright Holder: 
-
-Copyright (c) 2007-2016 The University of Waikato, Hamilton, New Zealand.
-
-License:
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Files: *
+Copyright: 2018 The University of Waikato, Hamilton, New Zealand.
+License: LGPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser 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 Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.

debian/libpacketdump4-dev.install

@@ -1 +1 @@
 usr/include/libpacketdump*
 usr/lib/libpacketdump*.so
-usr/lib/libpacketdump/*.so

debian/libpacketdump4.install

@@ -1 +1 @@
 usr/lib/libpacketdump*.so.*
 usr/lib/libpacketdump/*.protocol
+usr/lib/libpacketdump/*.so

debian/libtrace4-dev.dirs

@@ -1 +1 @@
 usr/lib
 usr/include
+usr/include/libtrace
 usr/share/man/man3

debian/libtrace4-dev.install

@@ -1 @@
-usr/include/libtrace*
-usr/include/rt_protocol.h
+usr/include/libtrace*.h
+usr/include/libtrace/*.h
 usr/lib/libtrace*.so
 usr/lib/libtrace*.a

debian/rules

@@ -21 +21 @@
 
 
-libtrace_backup.h:
-        # libtrace.h is modified by the build, so back it up so it can be restored
-        # by the clean target
-        cp lib/libtrace.h libtrace_backup.h
-
 configure:
 
-configure-stamp: configure libtrace_backup.h
+configure-stamp: configure
         dh_testdir
-        
+
         dh_autoreconf
-        
+
         ./configure $(CONFFLAGS) \
                    --prefix=/usr \
@@ -38 +33 @@
                    --mandir=\$${prefix}/share/man \
                    --infodir=\$${prefix}/share/info
-        
+
         touch configure-stamp
 
@@ -59 +54 @@
         [ ! -f Makefile ] || $(MAKE) clean
         [ ! -f Makefile ] || $(MAKE) distclean
-        [ ! -f libtrace_backup.h ] || mv libtrace_backup.h lib/libtrace.h
         rm -rf docs/doxygen
-        
+
         dh_autoreconf_clean
-        dh_clean 
+        dh_clean
 
 install: build
         dh_testdir
         dh_testroot
-        dh_clean -k 
+        dh_clean -k
         dh_installdirs
 
         # Add here commands to install the package into debian/tmp
         $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
 
 # Build architecture-independent files here.
@@ -101 +94 @@
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install