Package: argus-client
Version: 2.0.6.fixes.1-3
Followup-For: Bug #800260
User: [email protected]
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/compat: Indicate compatibility level of 9.
* debian/control:
- Build-depend on debhelper (>= 9).
- Depend on ${misc:Depends}.
* debian/{dirs,lintian,rules}: Remove now unnecessary Lintian override.
* debian/rules:
- Don't allow clean to ignore errors.
- Install files into debian/argus-client instead of debian/tmp.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-21-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
reverted:
--- argus-client-2.0.6.fixes.1/debian/dirs
+++ argus-client-2.0.6.fixes.1.orig/debian/dirs
@@ -1 +0,0 @@
-usr/share/lintian/overrides
diff -u argus-client-2.0.6.fixes.1/debian/control argus-client-2.0.6.fixes.1/debian/control
--- argus-client-2.0.6.fixes.1/debian/control
+++ argus-client-2.0.6.fixes.1/debian/control
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Andrew Pollock <[email protected]>
Standards-Version: 3.6.1
-Build-depends: bison, flex, debhelper, devscripts, autotools-dev, libncurses5-dev, dpatch
+Build-depends: bison, flex, debhelper (>= 9), devscripts, autotools-dev, libncurses5-dev, dpatch
Package: argus-client
Architecture: any
Recommends: argus-server
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: librrds-perl
Description: IP network transaction auditing tool
argus is a network transaction auditing tool that allows the user
diff -u argus-client-2.0.6.fixes.1/debian/rules argus-client-2.0.6.fixes.1/debian/rules
--- argus-client-2.0.6.fixes.1/debian/rules
+++ argus-client-2.0.6.fixes.1/debian/rules
@@ -25,7 +25,7 @@
INSTALL_PROGRAM += -s
endif
-tmp = debian/tmp
+packagedir = debian/argus-client
sysconfdir = etc
docdir = usr/share/doc
mandir = usr/share/man
@@ -65,8 +65,8 @@
clean: unpatch checkroot
test -f debian/control
rm -f build-stamp
- rm -rf $(tmp) $(tmp-ALT) debian/substvars debian/files *.orig */*.orig *~ */*~
- -$(MAKE) -f Makefile.in realclean ALLDIRS="clients common server"
+ rm -rf $(packagedir) $(tmp-ALT) debian/substvars debian/files *.orig */*.orig *~ */*~
+ $(MAKE) -f Makefile.in realclean ALLDIRS="clients common server"
checkroot:
test root = "`whoami`" || (echo Need root privelages; exit 1)
@@ -97,74 +97,66 @@
# Generate argus-client package.
#
- $(INSTALL_DIR) $(tmp)/$(sysconfdir)
- $(INSTALL_DIR) $(tmp)/DEBIAN
- $(INSTALL_DIR) $(tmp)/$(bindir)
- $(INSTALL_DIR) $(tmp)/{$(mandir),$(bindir)}
- $(INSTALL_DIR) $(tmp)/$(mandir)/{man1,man5}
- $(INSTALL_DIR) $(tmp)/$(docdir)/$(PACKAGE)/{examples,html}
+ $(INSTALL_DIR) $(packagedir)/$(sysconfdir)
+ $(INSTALL_DIR) $(packagedir)/DEBIAN
+ $(INSTALL_DIR) $(packagedir)/$(bindir)
+ $(INSTALL_DIR) $(packagedir)/{$(mandir),$(bindir)}
+ $(INSTALL_DIR) $(packagedir)/$(mandir)/{man1,man5}
+ $(INSTALL_DIR) $(packagedir)/$(docdir)/$(PACKAGE)/{examples,html}
#
# Install documentation.
#
$(INSTALL_FILE) doc/{HOW-TO,FAQ} \
- $(tmp)/$(docdir)/$(PACKAGE)
- cp -a support/* $(tmp)/$(docdir)/$(PACKAGE)/examples
- chmod 644 $(tmp)/$(docdir)/$(PACKAGE)/examples/*
- chmod 755 $(tmp)/$(docdir)/$(PACKAGE)/examples/{Xml,Config,Tools,Archive,System}
- chmod 644 $(tmp)/$(docdir)/$(PACKAGE)/examples/README
- chmod 644 $(tmp)/$(docdir)/$(PACKAGE)/examples/Config/policy.conf
- $(INSTALL_FILE) man/man5/ra* $(tmp)/$(mandir)/man5
- $(INSTALL_FILE) man/man1/ra* $(tmp)/$(mandir)/man1
+ $(packagedir)/$(docdir)/$(PACKAGE)
+ cp -a support/* $(packagedir)/$(docdir)/$(PACKAGE)/examples
+ chmod 644 $(packagedir)/$(docdir)/$(PACKAGE)/examples/*
+ chmod 755 $(packagedir)/$(docdir)/$(PACKAGE)/examples/{Xml,Config,Tools,Archive,System}
+ chmod 644 $(packagedir)/$(docdir)/$(PACKAGE)/examples/README
+ chmod 644 $(packagedir)/$(docdir)/$(PACKAGE)/examples/Config/policy.conf
+ $(INSTALL_FILE) man/man5/ra* $(packagedir)/$(mandir)/man5
+ $(INSTALL_FILE) man/man1/ra* $(packagedir)/$(mandir)/man1
$(INSTALL_FILE) debian/README.Debian \
- $(tmp)/$(docdir)/$(PACKAGE)/README.Debian
+ $(packagedir)/$(docdir)/$(PACKAGE)/README.Debian
$(INSTALL_FILE) debian/copyright \
- $(tmp)/$(docdir)/$(PACKAGE)/copyright
- $(INSTALL_FILE) doc/CHANGES "$(tmp)/$(docdir)/$(PACKAGE)"
- $(INSTALL_FILE) CREDITS "$(tmp)/$(docdir)/$(PACKAGE)"
+ $(packagedir)/$(docdir)/$(PACKAGE)/copyright
+ $(INSTALL_FILE) doc/CHANGES "$(packagedir)/$(docdir)/$(PACKAGE)"
+ $(INSTALL_FILE) CREDITS "$(packagedir)/$(docdir)/$(PACKAGE)"
$(INSTALL_FILE) ChangeLog \
- $(tmp)/$(docdir)/$(PACKAGE)/changelog
+ $(packagedir)/$(docdir)/$(PACKAGE)/changelog
$(INSTALL_FILE) debian/changelog \
- $(tmp)/$(docdir)/$(PACKAGE)/changelog.Debian
+ $(packagedir)/$(docdir)/$(PACKAGE)/changelog.Debian
$(INSTALL_FILE) doc/html/man/ra* \
- $(tmp)/$(docdir)/$(PACKAGE)/html
- chown -R root:root $(tmp)/$(docdir)/$(PACKAGE)
+ $(packagedir)/$(docdir)/$(PACKAGE)/html
+ chown -R root:root $(packagedir)/$(docdir)/$(PACKAGE)
#
# Install special files.
#
- #install --mode=644 debian/ra.conf $(tmp)/$(sysconfdir)
- $(INSTALL_FILE) debian/ra.conf $(tmp)/$(sysconfdir)
- $(INSTALL_FILE) debian/conffiles $(tmp)/DEBIAN/conffiles
+ #install --mode=644 debian/ra.conf $(packagedir)/$(sysconfdir)
+ $(INSTALL_FILE) debian/ra.conf $(packagedir)/$(sysconfdir)
+ $(INSTALL_FILE) debian/conffiles $(packagedir)/DEBIAN/conffiles
# ragraph is a Perl script and won't take kindly to being stripped
- $(INSTALL) -p -o root -g root -m 755 bin/ragraph $(tmp)/$(bindir)
+ $(INSTALL) -p -o root -g root -m 755 bin/ragraph $(packagedir)/$(bindir)
rm bin/ragraph
#
# Install binaries.
#
- $(INSTALL_PROGRAM) bin/*ra* $(tmp)/$(bindir)
+ $(INSTALL_PROGRAM) bin/*ra* $(packagedir)/$(bindir)
#
# Compress manpages and changelog.
#
- gzip -9f $(tmp)/$(mandir)/man5/*
- gzip -9f $(tmp)/$(mandir)/man1/*
- gzip -9f $(tmp)/$(docdir)/$(PACKAGE)/changelog*
+ gzip -9f $(packagedir)/$(mandir)/man5/*
+ gzip -9f $(packagedir)/$(mandir)/man1/*
+ gzip -9f $(packagedir)/$(docdir)/$(PACKAGE)/changelog*
#
- # Install lintian override
- #
-
- $(INSTALL_FILE) debian/lintian \
- $(tmp)/usr/share/lintian/overrides/argus-client
-
-
- #
# Compress stuff
#
@@ -183,9 +175,9 @@
# Build binary package.
#
- dpkg-shlibdeps $(tmp)/$(bindir)/*
- dpkg-gencontrol -ips -p$(PACKAGE) -P$(tmp)
- dpkg --build $(tmp) ..
+ dpkg-shlibdeps $(packagedir)/$(bindir)/*
+ dpkg-gencontrol -ips -p$(PACKAGE) -P$(packagedir)
+ dpkg --build $(packagedir) ..
source diff:
reverted:
--- argus-client-2.0.6.fixes.1/debian/lintian
+++ argus-client-2.0.6.fixes.1.orig/debian/lintian
@@ -1 +0,0 @@
-argus-client: bad-distribution-in-changes-file private
only in patch2:
unchanged:
--- argus-client-2.0.6.fixes.1.orig/debian/compat
+++ argus-client-2.0.6.fixes.1/debian/compat
@@ -0,0 +1 @@
+9
