← Back to branch summary

~ubuntu-branches/ubuntu/natty/curl/natty-security

« back to all changes in this revision

Viewing changes to src/version.h

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-06-20 13:56:28 UTC
  • mfrom: (3.4.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100620135628-e30tp9jldq6hq985
Tags: 7.21.0-1ubuntu1
https://launchpad.net/bugs/596334
* Merge from debian unstable.  Remaining changes: LP: #596334
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/version.h
1
 
#ifndef __VERSION_H
2
 
#define __VERSION_H
 
1
#ifndef HEADER_CURL_VERSION_H
 
2
#define HEADER_CURL_VERSION_H
3
3
/***************************************************************************
4
 
 *                                  _   _ ____  _     
5
 
 *  Project                     ___| | | |  _ \| |    
6
 
 *                             / __| | | | |_) | |    
7
 
 *                            | (__| |_| |  _ <| |___ 
 
4
 *                                  _   _ ____  _
 
5
 *  Project                     ___| | | |  _ \| |
 
6
 *                             / __| | | | |_) | |
 
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
11
11
 *
12
12
 * This software is licensed as described in the file COPYING, which
13
13
 * you should have received as part of this distribution. The terms
14
14
 * are also available at http://curl.haxx.se/docs/copyright.html.
15
 
 * 
 
15
 *
16
16
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
17
17
 * copies of the Software, and permit persons to whom the Software is
18
18
 * furnished to do so, under the terms of the COPYING file.
20
20
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
21
 * KIND, either express or implied.
22
22
 *
23
 
 * $Id: version.h,v 1.94 2008-01-24 14:15:49 gknauf Exp $
24
23
 ***************************************************************************/
25
24
 
26
25
#include <curl/curlver.h>
27
26
 
28
27
#define CURL_NAME "curl"
29
28
#define CURL_COPYRIGHT LIBCURL_COPYRIGHT
30
 
#define CURL_VERSION "7.19.7"
 
29
#define CURL_VERSION "7.21.0"
31
30
#define CURL_VERSION_MAJOR LIBCURL_VERSION_MAJOR
32
31
#define CURL_VERSION_MINOR LIBCURL_VERSION_MINOR
33
32
#define CURL_VERSION_PATCH LIBCURL_VERSION_PATCH
34
33
#define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
35
34
 
36
 
#endif
 
35
#endif /* HEADER_CURL_VERSION_H */