← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/exim4/oneiric

« back to all changes in this revision

Viewing changes to debian/EDITME.eximon.diff

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2010-12-28 22:20:17 UTC
  • mfrom: (2.3.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20101228222017-r6vg4eqlqy2fk4ul
Tags: 4.73~rc1-1ubuntu1
https://launchpad.net/bugs/697934
http://bugs.debian.org/542726
* Merge from debian unstable.  Remaining changes: (LP: #697934)
  - debian/patches/71_exiq_grep_error_on_messages_without_size.patch:
    + Improve handling of broken messages when "exim4 -bp" (mailq)
      reports lines without size info.
  - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
    we want postfix to be the default.
  - debian/{control,rules}: Add and enable hardened build for PIE.
    (Closes: #542726)
* Drop B-D on libmysqlclient15-dev, resolved in Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/EDITME.eximon.diff
1
 
--- /tmp/EXIM/exim-4.71/build-tree/exim_monitor/EDITME  2004-10-07 12:39:01.000000000 +0200
2
 
+++ EDITME.eximon       2009-11-28 11:26:52.000000000 +0100
3
 
@@ -1,3 +1,4 @@
 
1
--- /tmp/EXIM4/exim-4.73/build-tree/exim_monitor/EDITME 2010-12-23 15:19:35.000000000 +0100
 
2
+++ EDITME.eximon       2010-12-25 11:44:41.000000000 +0100
 
3
@@ -3,6 +3,7 @@
 
4
 ##################################################
 
5
 #                The Exim Monitor                #
 
6
 ##################################################
4
7
+# -*- makefile -*-
5
 
 # $Cambridge: exim/exim-src/exim_monitor/EDITME,v 1.1 2004/10/07 10:39:01 ph10 Exp $
6
8
 
7
 
 ##################################################
 
9
 # This is the template for the Exim monitor's main build-time configuration
 
10
 # file. It contains settings that are independent of any operating system. It