propagate from branch 'ca.inverse.sogo.1_3_17' (head f6b9d7fff0ee290e5bb3d449068e90673274fc9d)

to branch 'ca.inverse.sogo' (head a661d69f057cb4b81cb5a8376270574fdec7475f)

Monotone-Parent: a661d69f057cb4b81cb5a8376270574fdec7475f
Monotone-Parent: f6b9d7fff0ee290e5bb3d449068e90673274fc9d
Monotone-Revision: 6d07c0d566abebf051187aed44c7fd461982a824

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-23T17:42:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Jean Raby 2012-07-23 17:42:51 +00:00
commit cfa36312e0
7 changed files with 11 additions and 28 deletions

View file

@ -1,3 +1,10 @@
2012-07-23 Jean Raby <jraby@inverse.ca>
* debian*/sogo.logrotate:
drop distro specific log rotate scripts
* debian*/sogo.install
* debian*/rules :
Use the logrotate script from Scripts/.
2012-07-20 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/MailPartViewers/UIxMailRenderingContext.m

View file

@ -80,13 +80,13 @@ install-arch: build-arch
mkdir -p debian/tmp/etc/apache2/conf.d
cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
install -D -m 644 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo
install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
dh_testdir
dh_testroot
dh_installinit -R
dh_installlogrotate
dh_installcron
dh_installchangelogs ChangeLog
dh_installdocs

View file

@ -1,6 +1,7 @@
etc/default/sogo
etc/apache2/conf.d/SOGo.conf
etc/cron.d/sogo
etc/logrotate.d/sogo
usr/sbin/*
usr/lib/GNUstep/Frameworks/*
usr/lib/GNUstep/Libraries/*

View file

@ -1,13 +0,0 @@
/var/log/sogo/*.log {
daily
missingok
rotate 7
compress
delaycompress
notifempty
create 640 sogo sogo
sharedscripts
postrotate
/etc/init.d/sogo restart > /dev/null 2>&1
endscript
}

2
debian/rules vendored
View file

@ -79,13 +79,13 @@ install-arch: build-arch
mkdir -p debian/tmp/etc/apache2/conf.d
cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
install -D -m 644 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo
install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
dh_testdir
dh_testroot
dh_installinit -R
dh_installlogrotate
dh_installcron
dh_installchangelogs ChangeLog
dh_installdocs

1
debian/sogo.install vendored
View file

@ -1,6 +1,7 @@
etc/default/sogo
etc/apache2/conf.d/SOGo.conf
etc/cron.d/sogo
etc/logrotate.d/sogo
usr/sbin/*
usr/lib/GNUstep/Frameworks/*
usr/lib/GNUstep/Libraries/*

13
debian/sogo.logrotate vendored
View file

@ -1,13 +0,0 @@
/var/log/sogo/*.log {
daily
missingok
rotate 7
compress
delaycompress
notifempty
create 640 sogo sogo
sharedscripts
postrotate
/etc/init.d/sogo restart > /dev/null 2>&1
endscript
}