Merge branch 'master' into rel/5.0

This commit is contained in:
bharnden 2017-10-05 08:32:05 -07:00 committed by GitHub
commit fe0329da25
13 changed files with 17 additions and 14 deletions

View file

@ -20,7 +20,7 @@ build: changelog
changelog: debian
echo "core ($(CORE_VERSION)-1) unstable; urgency=low" > $(COREBUILD)/debian/changelog.generated
echo " * interim package generated from source" >> $(COREBUILD)/debian/changelog.generated
echo " -- CORE Developers <core-dev@pf.itd.nrl.navy.mil> $$(date -R)" >> $(COREBUILD)/debian/changelog.generated
echo " -- CORE Developers <core-dev@nrl.navy.mil> $$(date -R)" >> $(COREBUILD)/debian/changelog.generated
cd $(COREBUILD)/debian && \
{ test ! -L changelog && mv -f changelog changelog.save; } && \
{ test "$$(readlink changelog)" = "changelog.generated" || \

View file

@ -1,7 +1,7 @@
Source: core
Section: net
Priority: optional
Maintainer: CORE Developers <core-dev@pf.itd.nrl.navy.mil>
Maintainer: CORE Developers <core-dev@nrl.navy.mil>
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 9), cdbs, dh-autoreconf, autoconf, automake, gcc, libev-dev, make, python-dev, libreadline-dev, bridge-utils, ebtables, iproute2 | iproute, imagemagick, pkg-config, help2man
# python-sphinx