Skip to content

Commit 0a287bd

Browse files
committed
backport most of the 3.0 PE features into OSE
1 parent 1bffb00 commit 0a287bd

File tree

170 files changed

+21460
-7285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+21460
-7285
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ depcomp
1212
install-sh
1313
missing
1414
mkinstalldirs
15+
cscope.out
16+
._*
17+
config.*
18+
stamp-h.in
19+
stamp-h
20+
ylwrap
21+
.*.swp

Makefile.am

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
SUBDIRS = src tests doc contrib solbuild tgzbuild
1+
SUBDIRS = src tests doc contrib debian tgz2build
22

3-
EXTRA_DIST = debian/README.Debian debian/copyright debian/syslog-ng.conf.example debian/syslog-ng.files debian/syslog-ng.logrotate debian/syslog-ng.postrm \
4-
debian/changelog debian/changelog.in debian/rules debian/syslog-ng.default debian/syslog-ng.init debian/syslog-ng.logrotate.example debian/syslog-ng.preinst \
5-
debian/control debian/syslog-ng.conf debian/syslog-ng.docs debian/syslog-ng.logcheck.ignore debian/syslog-ng.postinst VERSION \
6-
syslog-ng.spec.bb syslog-ng.spec.bb.in dist.conf dist.conf.in
3+
EXTRA_DIST = VERSION \
4+
syslog-ng.spec.bb syslog-ng.spec.bb.in dist.conf dist.conf.in ChangeLog
75

8-
debian/changelog: debian/changelog.in
9-
$(top_builddir)/config.status --file $@:$<
6+
.PHONY: ChangeLog
7+
8+
ChangeLog:
9+
(cd $(top_srcdir); git log) > $@
10+

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.1
1+
2.9.0

0 commit comments

Comments
 (0)