Skip to content

Commit

Permalink
backport most of the 3.0 PE features into OSE
Browse files Browse the repository at this point in the history
  • Loading branch information
bazsi committed Oct 1, 2008
1 parent 1bffb00 commit 0a287bd
Show file tree
Hide file tree
Showing 170 changed files with 21,460 additions and 7,285 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ depcomp
install-sh
missing
mkinstalldirs
cscope.out
._*
config.*
stamp-h.in
stamp-h
ylwrap
.*.swp
15 changes: 8 additions & 7 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
SUBDIRS = src tests doc contrib solbuild tgzbuild
SUBDIRS = src tests doc contrib debian tgz2build

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

debian/changelog: debian/changelog.in
$(top_builddir)/config.status --file $@:$<
.PHONY: ChangeLog

ChangeLog:
(cd $(top_srcdir); git log) > $@

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.9.0
Loading

0 comments on commit 0a287bd

Please sign in to comment.