← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vsftpd/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/copyright

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-21 14:07:17 UTC
  • mfrom: (2.3.10 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100621140717-fnd7ghb4s1vholau
Tags: 2.3.0~pre2-3ubuntu1
https://launchpad.net/bugs/513978
* Merge from debian unstable:
  - Use snakeoil SSL certificates and key.
  - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart
  - Add apport hook: (LP: #513978): 
    - debian/vsftpd.apport: Added.
    - debian/control: Build-depends on dh-apport.
    - debian/rules: Add --with apport.
  - Dropped:
    + debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8:
      Use the debian version instead.
  - Add debian/watch file 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/copyright
4
4
Maintainer-Homepage: http://daniel.debian-maintainers.org/
5
5
 
6
6
Files: *
7
 
Copyright: (C) 2001-2009 Chris Evans <scarybeasts@gmail.com>
 
7
Copyright: (C) 2001-2010 Chris Evans <scarybeasts@gmail.com>
8
8
License: GPL-2
9
9
 This program is free software; you can redistribute it and/or
10
10
 modify it under the terms of the GNU General Public License
31
31
 remain intact.
32
32
 
33
33
Files: debian/*
34
 
Copyright: (C) 2009 Daniel Baumann <daniel@debian.org>
 
34
Copyright: (C) 2009-2010 Daniel Baumann <daniel@debian.org>
35
35
License: GPL-2+
36
36
 This program is free software; you can redistribute it and/or
37
37
 modify it under the terms of the GNU General Public License