← Back to branch summary

~ubuntu-branches/ubuntu/maverick/curl/maverick

« back to all changes in this revision

Viewing changes to debian/patches/versioned

  • 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:
debian/patches/versioned
1
1
Index: curl/configure.ac
2
2
===================================================================
3
 
--- curl.orig/configure.ac      2009-11-08 23:07:08.000000000 +0100
4
 
+++ curl/configure.ac   2009-11-08 23:07:15.000000000 +0100
5
 
@@ -1767,6 +1767,52 @@
 
3
--- curl.orig/configure.ac      2010-02-09 13:50:08.000000000 +0100
 
4
+++ curl/configure.ac   2010-02-09 13:50:10.000000000 +0100
 
5
@@ -1896,6 +1896,52 @@
6
6
 fi
7
7
 
8
8
 dnl **********************************************************************
55
55
 dnl Check for the presence of IDN libraries and headers
56
56
 dnl **********************************************************************
57
57
 
58
 
@@ -2566,6 +2612,7 @@
 
58
@@ -2578,6 +2624,7 @@
59
59
            include/curl/Makefile \
60
60
            src/Makefile \
61
61
            lib/Makefile \
65
65
            tests/server/Makefile \
66
66
Index: curl/lib/Makefile.am
67
67
===================================================================
68
 
--- curl.orig/lib/Makefile.am   2009-11-08 23:07:05.000000000 +0100
69
 
+++ curl/lib/Makefile.am        2009-11-08 23:07:15.000000000 +0100
70
 
@@ -110,7 +110,11 @@
 
68
--- curl.orig/lib/Makefile.am   2010-02-09 13:50:03.000000000 +0100
 
69
+++ curl/lib/Makefile.am        2010-02-09 13:50:10.000000000 +0100
 
70
@@ -113,7 +113,11 @@
71
71
 MIMPURE = -mimpure-text
72
72
 endif
73
73
 
83
83
Index: curl/lib/libcurl.vers.in
84
84
===================================================================
85
85
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
86
 
+++ curl/lib/libcurl.vers.in    2009-11-08 23:07:08.000000000 +0100
 
86
+++ curl/lib/libcurl.vers.in    2010-02-09 13:50:10.000000000 +0100
87
87
@@ -0,0 +1,13 @@
88
88
+HIDDEN
89
89
+{
95
95
+
96
96
+CURL_@VERSIONED_FLAVOUR@3
97
97
+{
98
 
+       global: curl_*;
 
98
+       global: curl_*; Curl_*;
99
99
+       local: *;
100
100
+};