← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/heimdal/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/012_sharedlibs

  • Committer: Bazaar Package Importer
  • Author(s): Nick Ellery
  • Date: 2008-11-17 22:25:58 UTC
  • mfrom: (1.1.5 upstream) (2.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20081117222558-jd1aj1jth6ycdb0x
Tags: 1.2.dfsg.1-2.1ubuntu1
https://launchpad.net/bugs/299345
* Merge from debian unstable, remaining changes (LP: #299345):
  - Change libdb4.2-dev to libdb4.6-dev in build-deps
  - Add netbase to heimdal-kdc depends.
  - Set CPPFLAGS=-DLDAP_DEPRECATED to fix build with OpenLDAP 2.4 on
    64-bit architectures.
* Remove dependency on update-inetd to heimdal-servers and heimdal-kdc,
  as packages should rely on the inet-superserver to provide the
  update-inetd command.
* Drop the addition of -1 to the version of comerr-dev in build depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/012_sharedlibs
1
 
Index: heimdal-1.0.1/cf/krb-readline.m4
 
1
Index: heimdal-1.2/cf/krb-readline.m4
2
2
===================================================================
3
 
--- heimdal-1.0.1.orig/cf/krb-readline.m4       2007-08-09 17:47:22.000000000 +1000
4
 
+++ heimdal-1.0.1/cf/krb-readline.m4    2007-08-10 11:35:11.622969685 +1000
 
3
--- heimdal-1.2.orig/cf/krb-readline.m4 2008-05-23 12:38:17.000000000 +1000
 
4
+++ heimdal-1.2/cf/krb-readline.m4      2008-05-27 13:04:21.277387728 +1000
5
5
@@ -28,8 +28,10 @@
6
6
        :
7
7
 elif test "$ac_cv_func_el_init" = yes; then
13
13
        LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)"
14
14
 fi
15
15
 AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
16
 
Index: heimdal-1.0.1/configure.in
 
16
Index: heimdal-1.2/configure.in
17
17
===================================================================
18
 
--- heimdal-1.0.1.orig/configure.in     2007-08-09 17:47:23.000000000 +1000
19
 
+++ heimdal-1.0.1/configure.in  2007-08-10 11:35:11.622969685 +1000
20
 
@@ -154,7 +154,7 @@
 
18
--- heimdal-1.2.orig/configure.in       2008-05-23 12:38:33.000000000 +1000
 
19
+++ heimdal-1.2/configure.in    2008-05-27 13:04:21.281386859 +1000
 
20
@@ -164,7 +164,7 @@
21
21
 
22
22
 rk_TEST_PACKAGE(readline,
23
23
 [#include <stdio.h>
26
26
 
27
27
 rk_TEST_PACKAGE(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD)
28
28
 
29
 
Index: heimdal-1.0.1/lib/Makefile.am
 
29
Index: heimdal-1.2/lib/Makefile.am
30
30
===================================================================
31
 
--- heimdal-1.0.1.orig/lib/Makefile.am  2007-08-09 17:47:21.000000000 +1000
32
 
+++ heimdal-1.0.1/lib/Makefile.am       2007-08-10 11:35:43.074176888 +1000
33
 
@@ -18,5 +18,5 @@
 
31
--- heimdal-1.2.orig/lib/Makefile.am    2008-05-23 12:37:54.000000000 +1000
 
32
+++ heimdal-1.2/lib/Makefile.am 2008-05-27 13:04:34.362534556 +1000
 
33
@@ -18,6 +18,6 @@
34
34
 dir_hcrypto = hcrypto
35
35
 endif
36
36
 
37
 
-SUBDIRS = roken vers editline $(dir_com_err) sl asn1 $(dir_hcrypto) hx509 \
38
 
+SUBDIRS = roken vers @DIR_readline@ $(dir_com_err) sl asn1 $(dir_hcrypto) hx509 \
39
 
        krb5 ntlm kafs gssapi hdb kadm5 auth $(dir_45) $(dir_otp) $(dir_dce)
40
 
Index: heimdal-1.0.1/cf/test-package.m4
 
37
-SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \
 
38
+SUBDIRS = roken vers @DIR_readline@ $(dir_com_err) sl wind asn1 sqlite \
 
39
        $(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
 
40
        auth $(dir_45) $(dir_otp) $(dir_dce)
 
41
Index: heimdal-1.2/cf/test-package.m4
41
42
===================================================================
42
 
--- heimdal-1.0.1.orig/cf/test-package.m4       2007-08-09 17:47:22.000000000 +1000
43
 
+++ heimdal-1.0.1/cf/test-package.m4    2007-08-10 11:35:11.662953421 +1000
 
43
--- heimdal-1.2.orig/cf/test-package.m4 2008-05-23 12:38:17.000000000 +1000
 
44
+++ heimdal-1.2/cf/test-package.m4      2008-05-27 13:04:21.337374654 +1000
44
45
@@ -37,7 +37,7 @@
45
46
 
46
47
 header_dirs=