← Back to branch summary

~ubuntu-branches/ubuntu/trusty/schleuder/trusty

« back to all changes in this revision

Viewing changes to debian/patches/bugs-dead-configuration-in-example.patch

  • Committer: Package Import Robot
  • Author(s): Jérémy Bobbio
  • Date: 2012-06-19 17:49:16 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20120619174916-k1b28tzhm8csh1ac
Tags: 2.2.1-1
* Update README.source.
* Drop the following patches:
  - 0004-Deactivate-log-file-rotation-by-default.patch:
    Upstream has removed support for log file rotation.
  - 0008-Suggest-to-install-highline-package-in-newlist.patch:
    highline is required by `bin/schleuder-migrate-v2.1-to-v2.2` and
    thus now a hard Depends.
  - 0011-Formal-workaround-for-ruby-gpgme-1.0.8-for-use-with-.patch:
    It was cherry-picked from upstream master branch.
  - 0012-Better-workaround-for-ruby-gpgme-1.0.8-for-use-with-.patch:
    It was cherry-picked from upstream master branch.
  - 0013-newlist-add-the-necessary-workaround-for-ruby-gpgme-.patch:
    It has been integrated upstream.
  - 0014-Don-t-echo-passphrase-to-terminal-when-asking-for-it.patch:
    It was cherry-picked from master.
* Refresh the following patches:
   - 0001-Enable-logging-through-syslog.patch
     => feature-logging.patch
   - 0002-Allow-list-configuration-files-to-be-in-a-single-dir.patch
     => feature-list-conf-dir.patch
   - 0003-Add-support-for-multiple-plugins-directory.patch
     => feature-multiple-plugins-dir.patch
   - 0005-Adjust-other-default-configuration-settings.patch
     => debian-default-settings.patch
   - 0006-No-need-for-rubygems-we-have-Debian-packages.patch
     => debian-no-rubygems.patch
   - 0007-Explicitely-use-ruby1.8-in-executable-scripts.patch
     => debian-use-ruby1.8.patch
   - 0009-Mention-README.Debian-in-newlist.patch
     => debian-readme-debian-in-newlist.patch
* New patches:
   - bugs-dead-configuration-in-example.patch:
     Remove removed setting from example configuration.
   - bugs-missing-admin-only-keywords.patch:
     Adjust default settings to example configuration.
   - bugs-fix-manpages-wrt-2.2.1.patch:
     Update manpages with recent changes and improve formatting.
   - debian-use-magic-instead-of-filemagic.patch:
     Use the 'magic' gem instead of 'ruby-filemagic', as the former is
     already in Debian.
* Refresh Depends in debian/control for 2.2.1.
* Install library according to the new Debian Ruby policy.
* Use upstream manpages.
* Install schleuder-newlist from its new location.
* Update README.Debian for Schleuder 2.2.
* Add new default-members.conf to examples.
* Call migration scripts when upgrading from previous version.
* Add weekly reminder for expired member keys.
* Add debian/NEWS to help admins cope with the new version.
* Ship README.plugins at its intended location
* Remove schleuder-migrationhelper.pl from examples (removed upstream).
* Update mutt-schleuder-resend.vim name in examples.
* Do not ship TODO in docs (removed upstream).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/bugs-dead-configuration-in-example.patch
 
1
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar@debian.org>
 
2
Date: Sat, 16 Jun 2012 16:24:18 +0200
 
3
Subject: [PATCH] bugs/dead-configuration-in-example
 
4
MIME-Version: 1.0
 
5
Content-Type: text/plain; charset=UTF-8
 
6
Content-Transfer-Encoding: 8bit
 
7
 
 
8
Squashed commit of the following:
 
9
 
 
10
commit f523f54e619e07cc591dc4bd5b44d0dd72c70d2c
 
11
Author: Jérémy Bobbio <lunar@debian.org>
 
12
Date:   Sat Jun 16 12:14:45 2012 +0200
 
13
 
 
14
    Remove lists_logfile from example configuration
 
15
 
 
16
    This setting is useless since Schleuder uses Log4r (commit a48c4df88).
 
17
---
 
18
 ext/schleuder.conf |    4 ----
 
19
 1 files changed, 0 insertions(+), 4 deletions(-)
 
20
 
 
21
diff --git a/ext/schleuder.conf b/ext/schleuder.conf
 
22
index c056d10..7f11b43 100644
 
23
--- a/ext/schleuder.conf
 
24
+++ b/ext/schleuder.conf
 
25
@@ -26,10 +26,6 @@
 
26
 # Name of the per list config file.
 
27
 #lists_configfile: list.conf
 
28
 #
 
29
-# Per list logfile name. Will be written into the directory
 
30
-# of the list.
 
31
-#lists_logfile: list.log
 
32
-#
 
33
 # Name of the per list file containing all members and their
 
34
 # options.
 
35
 #lists_memberfile: members.conf
 
36
--