Imported Debian patch 1.6~git20131117+dfsg-1

19 files changed, 144 insertions, 91 deletions

diff --git a/debian/changelog b/debian/changelog
index c26f09549..a4c558f23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+heimdal (1.6~git20131117+dfsg-1) unstable; urgency=low
+
+  * New upstream snapshot.
+   + Drop texinfo_5.1 and texinfo_b_5.1; applied upstream.
+  * Install asn1_compile and asn1_print binaries in heimdal-dev.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 17 Nov 2013 15:06:09 +0000
+
 heimdal (1.6~git20120403+dfsg1-4) unstable; urgency=low
 
   * Fix broken symlinks. Closes: #715069.
diff --git a/debian/control b/debian/control
index ebdc0016a..fd2822b7a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: bison,
                libdb-dev,
                libedit-dev,
                libhesiod-dev,
+               libjson-perl,
                libldap2-dev,
                libncurses5-dev,
                libperl4-corelibs-perl,
@@ -107,7 +108,7 @@ Description: Heimdal Kerberos - Multi-implementation Development
  multidev package should be used.
 
 Package: heimdal-dev
-Depends: heimdal-multidev (= ${binary:Version}), ${misc:Depends}
+Depends: heimdal-multidev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Section: devel
 Conflicts: libkrb5-dev
 Priority: extra
diff --git a/debian/heimdal-dev.install b/debian/heimdal-dev.install
index e267fc9d9..437c2950a 100644
--- a/debian/heimdal-dev.install
+++ b/debian/heimdal-dev.install
@@ -1,2 +1,6 @@
+usr/sbin/heimdal/asn1_compile usr/bin
+usr/sbin/heimdal/asn1_print usr/bin
+usr/sbin/heimdal/slc usr/bin
 usr/lib/*/*.la
 usr/share/man/man3
+usr/share/man/man7/krb5-plugin.7
diff --git a/debian/heimdal-docs.install b/debian/heimdal-docs.install
index bea90fc24..28bfc482d 100644
--- a/debian/heimdal-docs.install
+++ b/debian/heimdal-docs.install
@@ -2,4 +2,5 @@ usr/share/info
 usr/share/man/man5/krb5.conf.5
 usr/share/man/man5/login.access.5
 usr/share/man/man5/mech.5
+usr/share/man/man5/qop.5
 usr/share/man/man8/kerberos.8
diff --git a/debian/heimdal-kdc.install b/debian/heimdal-kdc.install
index 2c9cfea29..4a4bfb92c 100644
--- a/debian/heimdal-kdc.install
+++ b/debian/heimdal-kdc.install
@@ -1,3 +1,4 @@
+usr/sbin/digest-service
 usr/sbin/hprop
 usr/sbin/hpropd
 usr/sbin/iprop-log
diff --git a/debian/heimdal-multidev.install b/debian/heimdal-multidev.install
index 3162335de..300d26fcb 100644
--- a/debian/heimdal-multidev.install
+++ b/debian/heimdal-multidev.install
@@ -2,3 +2,8 @@ usr/bin/krb5-config
 usr/include/* usr/include/heimdal
 usr/lib/*/pkgconfig/heimdal-gssapi.pc
 usr/share/man/man1/krb5-config.1
+usr/lib/*/pkgconfig/kadm-server.pc
+usr/lib/*/pkgconfig/kadm-client.pc
+usr/lib/*/pkgconfig/krb5-gssapi.pc
+usr/lib/*/pkgconfig/kafs.pc
+usr/lib/*/pkgconfig/krb5.pc
diff --git a/debian/heimdal-servers.install b/debian/heimdal-servers.install
index 4f024ab7a..2209b699e 100644
--- a/debian/heimdal-servers.install
+++ b/debian/heimdal-servers.install
@@ -4,6 +4,7 @@ usr/sbin/kfd usr/lib/heimdal-servers
 usr/sbin/popper usr/lib/heimdal-servers
 usr/sbin/rshd usr/lib/heimdal-servers
 usr/sbin/telnetd usr/lib/heimdal-servers
+usr/share/man/man1/login.1
 usr/share/man/man5/ftpusers.5
 usr/share/man/man8/ftpd.8
 usr/share/man/man8/kfd.8
diff --git a/debian/libasn1-8-heimdal.symbols b/debian/libasn1-8-heimdal.symbols
index 7d0c77da0..ca9156bc7 100644
--- a/debian/libasn1-8-heimdal.symbols
+++ b/debian/libasn1-8-heimdal.symbols
@@ -9,13 +9,17 @@ libasn1.so.8 #PACKAGE# #MINVER#
  KeyUsage2int@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  SAMFlags2int@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  TicketFlags2int@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ _asn1_bmember_isset_bit@HEIMDAL_ASN1_1.0 1.6~git20131117
+ _asn1_bmember_put_bit@HEIMDAL_ASN1_1.0 1.6~git20131117
  _asn1_copy@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  _asn1_copy_top@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  _asn1_decode@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  _asn1_decode_top@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  _asn1_encode@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  _asn1_free@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ _asn1_free_top@HEIMDAL_ASN1_1.0 1.6~git20131117
  _asn1_length@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ _asn1_sizeofType@HEIMDAL_ASN1_1.0 1.6~git20131117
  _der_gmtime@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  _der_timegm@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  _heim_der_set_sort@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -43,12 +47,18 @@ libasn1.so.8 #PACKAGE# #MINVER#
  asn1_KeyUsage_units@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_SAMFlags_units@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_TicketFlags_units@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ asn1_fuzzer_done@HEIMDAL_ASN1_1.0 1.6~git20131117
+ asn1_fuzzer_method@HEIMDAL_ASN1_1.0 1.6~git20131117
+ asn1_fuzzer_next@HEIMDAL_ASN1_1.0 1.6~git20131117
+ asn1_fuzzer_reset@HEIMDAL_ASN1_1.0 1.6~git20131117
  asn1_oid_id_Userid@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_aes_128_cbc@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_aes_192_cbc@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_aes_256_cbc@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ asn1_oid_id_apple_system_id@HEIMDAL_ASN1_1.0 1.6~git20131117
  asn1_oid_id_at_commonName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_at_countryName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ asn1_oid_id_at_description@HEIMDAL_ASN1_1.0 1.6~git20131117
  asn1_oid_id_at_generationQualifier@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_at_givenName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_at_initials@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -61,6 +71,7 @@ libasn1.so.8 #PACKAGE# #MINVER#
  asn1_oid_id_at_stateOrProvinceName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_at_streetAddress@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_at_surname@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ asn1_oid_id_at_title@HEIMDAL_ASN1_1.0 1.6~git20131117
  asn1_oid_id_dhpublicnumber@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_domainComponent@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_dsa@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -200,6 +211,7 @@ libasn1.so.8 #PACKAGE# #MINVER#
  asn1_oid_id_x509_ce_subjectKeyIdentifier@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_x520_at@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  asn1_oid_id_x9_57@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ asn1_template_prim@HEIMDAL_ASN1_1.0 1.6~git20131117
  copy_AD_AND_OR@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  copy_AD_IF_RELEVANT@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  copy_AD_INITIAL_VERIFIED_CAS@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -315,10 +327,18 @@ libasn1.so.8 #PACKAGE# #MINVER#
  copy_KDCFastFlags@HEIMDAL_ASN1_1.0 1.6~git20120311g
  copy_KDCFastState@HEIMDAL_ASN1_1.0 1.6~git20120311g
  copy_KDCOptions@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ copy_KDC_PROXY_MESSAGE@HEIMDAL_ASN1_1.0 1.6~git20131117
  copy_KDC_REP@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  copy_KDC_REQ@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  copy_KDC_REQ_BODY@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  copy_KDFAlgorithmId@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ copy_KERB_ARMOR_SERVICE_REPLY@HEIMDAL_ASN1_1.0 1.6~git20131117
+ copy_KERB_CRED@HEIMDAL_ASN1_1.0 1.6~git20131117
+ copy_KERB_TGS_REP_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ copy_KERB_TGS_REP_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ copy_KERB_TGS_REQ_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ copy_KERB_TGS_REQ_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ copy_KERB_TIMES@HEIMDAL_ASN1_1.0 1.6~git20131117
  copy_KRB5PrincipalName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  copy_KRB5SignedPath@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  copy_KRB5SignedPathData@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -570,10 +590,18 @@ libasn1.so.8 #PACKAGE# #MINVER#
  decode_KDCFastFlags@HEIMDAL_ASN1_1.0 1.6~git20120311g
  decode_KDCFastState@HEIMDAL_ASN1_1.0 1.6~git20120311g
  decode_KDCOptions@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ decode_KDC_PROXY_MESSAGE@HEIMDAL_ASN1_1.0 1.6~git20131117
  decode_KDC_REP@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  decode_KDC_REQ@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  decode_KDC_REQ_BODY@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  decode_KDFAlgorithmId@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ decode_KERB_ARMOR_SERVICE_REPLY@HEIMDAL_ASN1_1.0 1.6~git20131117
+ decode_KERB_CRED@HEIMDAL_ASN1_1.0 1.6~git20131117
+ decode_KERB_TGS_REP_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ decode_KERB_TGS_REP_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ decode_KERB_TGS_REQ_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ decode_KERB_TGS_REQ_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ decode_KERB_TIMES@HEIMDAL_ASN1_1.0 1.6~git20131117
  decode_KRB5PrincipalName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  decode_KRB5SignedPath@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  decode_KRB5SignedPathData@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -943,10 +971,18 @@ libasn1.so.8 #PACKAGE# #MINVER#
  encode_KDCFastFlags@HEIMDAL_ASN1_1.0 1.6~git20120311g
  encode_KDCFastState@HEIMDAL_ASN1_1.0 1.6~git20120311g
  encode_KDCOptions@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ encode_KDC_PROXY_MESSAGE@HEIMDAL_ASN1_1.0 1.6~git20131117
  encode_KDC_REP@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  encode_KDC_REQ@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  encode_KDC_REQ_BODY@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  encode_KDFAlgorithmId@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ encode_KERB_ARMOR_SERVICE_REPLY@HEIMDAL_ASN1_1.0 1.6~git20131117
+ encode_KERB_CRED@HEIMDAL_ASN1_1.0 1.6~git20131117
+ encode_KERB_TGS_REP_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ encode_KERB_TGS_REP_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ encode_KERB_TGS_REQ_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ encode_KERB_TGS_REQ_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ encode_KERB_TIMES@HEIMDAL_ASN1_1.0 1.6~git20131117
  encode_KRB5PrincipalName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  encode_KRB5SignedPath@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  encode_KRB5SignedPathData@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -1199,10 +1235,18 @@ libasn1.so.8 #PACKAGE# #MINVER#
  free_KDCFastFlags@HEIMDAL_ASN1_1.0 1.6~git20120311g
  free_KDCFastState@HEIMDAL_ASN1_1.0 1.6~git20120311g
  free_KDCOptions@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ free_KDC_PROXY_MESSAGE@HEIMDAL_ASN1_1.0 1.6~git20131117
  free_KDC_REP@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  free_KDC_REQ@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  free_KDC_REQ_BODY@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  free_KDFAlgorithmId@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ free_KERB_ARMOR_SERVICE_REPLY@HEIMDAL_ASN1_1.0 1.6~git20131117
+ free_KERB_CRED@HEIMDAL_ASN1_1.0 1.6~git20131117
+ free_KERB_TGS_REP_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ free_KERB_TGS_REP_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ free_KERB_TGS_REQ_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ free_KERB_TGS_REQ_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ free_KERB_TIMES@HEIMDAL_ASN1_1.0 1.6~git20131117
  free_KRB5PrincipalName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  free_KRB5SignedPath@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  free_KRB5SignedPathData@HEIMDAL_ASN1_1.0 1.4.0+git20110226
@@ -1466,10 +1510,18 @@ libasn1.so.8 #PACKAGE# #MINVER#
  length_KDCFastFlags@HEIMDAL_ASN1_1.0 1.6~git20120311g
  length_KDCFastState@HEIMDAL_ASN1_1.0 1.6~git20120311g
  length_KDCOptions@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ length_KDC_PROXY_MESSAGE@HEIMDAL_ASN1_1.0 1.6~git20131117
  length_KDC_REP@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  length_KDC_REQ@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  length_KDC_REQ_BODY@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  length_KDFAlgorithmId@HEIMDAL_ASN1_1.0 1.4.0+git20110226
+ length_KERB_ARMOR_SERVICE_REPLY@HEIMDAL_ASN1_1.0 1.6~git20131117
+ length_KERB_CRED@HEIMDAL_ASN1_1.0 1.6~git20131117
+ length_KERB_TGS_REP_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ length_KERB_TGS_REP_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ length_KERB_TGS_REQ_IN@HEIMDAL_ASN1_1.0 1.6~git20131117
+ length_KERB_TGS_REQ_OUT@HEIMDAL_ASN1_1.0 1.6~git20131117
+ length_KERB_TIMES@HEIMDAL_ASN1_1.0 1.6~git20131117
  length_KRB5PrincipalName@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  length_KRB5SignedPath@HEIMDAL_ASN1_1.0 1.4.0+git20110226
  length_KRB5SignedPathData@HEIMDAL_ASN1_1.0 1.4.0+git20110226
diff --git a/debian/libhdb9-heimdal.symbols b/debian/libhdb9-heimdal.symbols
index 8b16ec1f4..cff7a4641 100644
--- a/debian/libhdb9-heimdal.symbols
+++ b/debian/libhdb9-heimdal.symbols
@@ -1,6 +1,8 @@
 libhdb.so.9 #PACKAGE# #MINVER#
  HDBFlags2int@HEIMDAL_HDB_1.0 1.4.0+git20110226
  HEIMDAL_HDB_1.0@HEIMDAL_HDB_1.0 1.4.0+git20110226
+ _hdb_mdb_value2entry@HEIMDAL_HDB_1.0 1.6~git20131117
+ _hdb_mit_dump2mitdb_entry@HEIMDAL_HDB_1.0 1.6~git20131117
  add_HDB_Ext_KeySet@HEIMDAL_HDB_1.0 1.6~git20120311
  add_Keys@HEIMDAL_HDB_1.0 1.6~git20120311
  asn1_HDBFlags_units@HEIMDAL_HDB_1.0 1.4.0+git20110226
@@ -72,6 +74,7 @@ libhdb.so.9 #PACKAGE# #MINVER#
  hdb_generate_key_set@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_generate_key_set_password@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_get_dbinfo@HEIMDAL_HDB_1.0 1.4.0+git20110226
+ hdb_get_kt_ops@HEIMDAL_HDB_1.0 1.6~git20131117
  hdb_init_db@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_interface_version@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_key2principal@HEIMDAL_HDB_1.0 1.4.0+git20110226
@@ -89,6 +92,7 @@ libhdb.so.9 #PACKAGE# #MINVER#
  hdb_seal_key_mkey@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_seal_keys@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_seal_keys_mkey@HEIMDAL_HDB_1.0 1.4.0+git20110226
+ hdb_set_last_modified_by@HEIMDAL_HDB_1.0 1.6~git20131117
  hdb_set_master_key@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_set_master_keyfile@HEIMDAL_HDB_1.0 1.4.0+git20110226
  hdb_unlock@HEIMDAL_HDB_1.0 1.4.0+git20110226
diff --git a/debian/libheimbase1-heimdal.symbols b/debian/libheimbase1-heimdal.symbols
index 1502f5d0b..517799def 100644
--- a/debian/libheimbase1-heimdal.symbols
+++ b/debian/libheimbase1-heimdal.symbols
@@ -13,6 +13,7 @@ libheimbase.so.1 #PACKAGE# #MINVER#
  heim_array_copy_value@HEIMDAL_BASE_1.0 1.4.0+git20110226
  heim_array_create@HEIMDAL_BASE_1.0 1.4.0+git20110226
  heim_array_delete_value@HEIMDAL_BASE_1.0 1.4.0+git20110226
+ heim_array_filter_f@HEIMDAL_BASE_1.0 1.6~git20131117
  heim_array_get_length@HEIMDAL_BASE_1.0 1.4.0+git20110226
  heim_array_get_type_id@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_array_get_value@HEIMDAL_BASE_1.0 1.6~git20120311
@@ -54,11 +55,13 @@ libheimbase.so.1 #PACKAGE# #MINVER#
  heim_error_append@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_error_copy_string@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_error_create@HEIMDAL_BASE_1.0 1.6~git20120311
+ heim_error_create_enomem@HEIMDAL_BASE_1.0 1.6~git20131117
+ heim_error_create_opt@HEIMDAL_BASE_1.0 1.6~git20131117
  heim_error_createv@HEIMDAL_BASE_1.0 1.6~git20120311
- heim_error_enomem@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_error_get_code@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_get_hash@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_get_tid@HEIMDAL_BASE_1.0 1.6~git20120311
+ heim_json_copy_serialize@HEIMDAL_BASE_1.0 1.6~git20131117
  heim_json_create@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_json_create_with_bytes@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_null_create@HEIMDAL_BASE_1.0 1.6~git20120311
@@ -75,11 +78,11 @@ libheimbase.so.1 #PACKAGE# #MINVER#
  heim_path_vget@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_release@HEIMDAL_BASE_1.0 1.4.0+git20110226
  heim_retain@HEIMDAL_BASE_1.0 1.4.0+git20110226
- heim_serialize@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_show@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_sorted_text_file_dbtype@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_string_create@HEIMDAL_BASE_1.0 1.4.0+git20110226
  heim_string_create_with_bytes@HEIMDAL_BASE_1.0 1.6~git20120311
+ heim_string_create_with_format@HEIMDAL_BASE_1.0 1.6~git20131117
  heim_string_get_type_id@HEIMDAL_BASE_1.0 1.6~git20120311
  heim_string_get_utf8@HEIMDAL_BASE_1.0 1.4.0+git20110226
  heim_string_ref_create@HEIMDAL_BASE_1.0 1.6~git20120311
diff --git a/debian/libhx509-5-heimdal.symbols b/debian/libhx509-5-heimdal.symbols
index 7368b4feb..d828ed699 100644
--- a/debian/libhx509-5-heimdal.symbols
+++ b/debian/libhx509-5-heimdal.symbols
@@ -201,6 +201,7 @@ libhx509.so.5 #PACKAGE# #MINVER#
  hx509_revoke_free@HEIMDAL_X509_1.2 1.4.0+git20110226
  hx509_revoke_init@HEIMDAL_X509_1.2 1.4.0+git20110226
  hx509_revoke_ocsp_print@HEIMDAL_X509_1.2 1.4.0+git20110226
+ hx509_revoke_print@HEIMDAL_X509_1.2 1.6~git20131117
  hx509_revoke_verify@HEIMDAL_X509_1.2 1.4.0+git20110226
  hx509_set_error_string@HEIMDAL_X509_1.2 1.4.0+git20110226
  hx509_set_error_stringv@HEIMDAL_X509_1.2 1.4.0+git20110226
diff --git a/debian/libkrb5-26-heimdal.symbols b/debian/libkrb5-26-heimdal.symbols
index cfbe06065..239e031b2 100644
--- a/debian/libkrb5-26-heimdal.symbols
+++ b/debian/libkrb5-26-heimdal.symbols
@@ -6,6 +6,7 @@ libkrb5.so.26 #PACKAGE# #MINVER#
  _krb5_crc_update@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  _krb5_dh_group_ok@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  _krb5_expand_default_cc_name@HEIMDAL_KRB5_2.0 1.4.0+git20110226
+ _krb5_expand_path_tokensv@HEIMDAL_KRB5_2.0 1.6~git20131117
  _krb5_fast_armor_key@HEIMDAL_KRB5_2.0 1.6~git20120311
  _krb5_fast_cf2@HEIMDAL_KRB5_2.0 1.6~git20120311
  _krb5_get_host_realm_int@HEIMDAL_KRB5_2.0 1.4.0+git20110226
@@ -20,8 +21,7 @@ libkrb5.so.26 #PACKAGE# #MINVER#
  _krb5_pk_octetstring2key@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  _krb5_plugin_find@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  _krb5_plugin_free@HEIMDAL_KRB5_2.0 1.4.0+git20110226
- _krb5_plugin_get_next@HEIMDAL_KRB5_2.0 1.4.0+git20110226
- _krb5_plugin_get_symbol@HEIMDAL_KRB5_2.0 1.4.0+git20110226
+ _krb5_plugin_run_f@HEIMDAL_KRB5_2.0 1.6~git20131117
  _krb5_principal2principalname@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  _krb5_principalname2krb5_principal@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  _krb5_put_int@HEIMDAL_KRB5_2.0 1.4.0+git20110226
@@ -160,6 +160,7 @@ libkrb5.so.26 #PACKAGE# #MINVER#
  krb5_cc_support_switch@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_cc_switch@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_cc_type_api@HEIMDAL_KRB5_2.0 1.4.0+git20110226
+ krb5_cc_type_dcc@HEIMDAL_KRB5_2.0 1.6~git20131117
  krb5_cc_type_file@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_cc_type_kcm@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_cc_type_memory@HEIMDAL_KRB5_2.0 1.4.0+git20110226
@@ -242,6 +243,7 @@ libkrb5.so.26 #PACKAGE# #MINVER#
  krb5_data_free@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_data_realloc@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_data_zero@HEIMDAL_KRB5_2.0 1.4.0+git20110226
+ krb5_dcc_ops@HEIMDAL_KRB5_2.0 1.6~git20131117
  krb5_decode_Authenticator@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_decode_ETYPE_INFO2@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_decode_ETYPE_INFO@HEIMDAL_KRB5_2.0 1.4.0+git20110226
@@ -507,7 +509,7 @@ libkrb5.so.26 #PACKAGE# #MINVER#
  krb5_net_write_block@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_ntlm_alloc@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_ntlm_free@HEIMDAL_KRB5_2.0 1.4.0+git20110226
- krb5_ntlm_init_get_challange@HEIMDAL_KRB5_2.0 1.4.0+git20110226
+ krb5_ntlm_init_get_challenge@HEIMDAL_KRB5_2.0 1.6~git20131117
  krb5_ntlm_init_get_flags@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_ntlm_init_get_opaque@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_ntlm_init_get_targetinfo@HEIMDAL_KRB5_2.0 1.4.0+git20110226
@@ -661,6 +663,7 @@ libkrb5.so.26 #PACKAGE# #MINVER#
  krb5_storage_from_fd@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_storage_from_mem@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_storage_from_readonly_mem@HEIMDAL_KRB5_2.0 1.4.0+git20110226
+ krb5_storage_fsync@HEIMDAL_KRB5_2.0 1.6~git20131117
  krb5_storage_get_byteorder@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_storage_get_eof_code@HEIMDAL_KRB5_2.0 1.4.0+git20110226
  krb5_storage_is_flags@HEIMDAL_KRB5_2.0 1.4.0+git20110226
diff --git a/debian/libroken18-heimdal.symbols b/debian/libroken18-heimdal.symbols
index c30a20e8e..decc247a3 100644
--- a/debian/libroken18-heimdal.symbols
+++ b/debian/libroken18-heimdal.symbols
@@ -38,6 +38,7 @@ libroken.so.18 #PACKAGE# #MINVER#
  rk_cloexec@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_cloexec_dir@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_cloexec_file@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
+ rk_cloexec_socket@HEIMDAL_ROKEN_1.0 1.6~git20131117
  rk_closefrom@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_copyhostent@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_dns_free_data@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
@@ -63,6 +64,7 @@ libroken.so.18 #PACKAGE# #MINVER#
  rk_hex_decode@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_hex_encode@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_hostent_find_fqdn@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
+ rk_mkdir@HEIMDAL_ROKEN_1.0 1.6~git20131117
  rk_pid_file_delete@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_pid_file_write@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_pidfile@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
@@ -85,6 +87,7 @@ libroken.so.18 #PACKAGE# #MINVER#
  rk_socket_set_any@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_socket_set_debug@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_socket_set_ipv6only@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
+ rk_socket_set_nonblocking@HEIMDAL_ROKEN_1.0 1.6~git20131117
  rk_socket_set_port@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_socket_set_portrange@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_socket_set_reuseaddr@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
diff --git a/debian/patches/020_maintainermode b/debian/patches/020_maintainermode
index 98e573aff..30da1d899 100644
--- a/debian/patches/020_maintainermode
+++ b/debian/patches/020_maintainermode
@@ -5,7 +5,7 @@ Index: heimdal-1.3.1.dfsg.1/configure.ac
 @@ -3,6 +3,7 @@
  AC_PREREQ(2.62)
  test -z "$CFLAGS" && CFLAGS="-g"
- AC_INIT([Heimdal],[1.5.99],[heimdal-bugs@h5l.org])
+ AC_INIT([Heimdal],[1.6.99],[heimdal-bugs@h5l.org])
 +AM_MAINTAINER_MODE
  AC_CONFIG_SRCDIR([kuser/kinit.c])
  AC_CONFIG_HEADERS(include/config.h)
diff --git a/debian/patches/041_hurd_maxhostnamelen b/debian/patches/041_hurd_maxhostnamelen
index c6ddb96de..886b314e3 100644
--- a/debian/patches/041_hurd_maxhostnamelen
+++ b/debian/patches/041_hurd_maxhostnamelen
@@ -1,3 +1,5 @@
+diff --git a/appl/gssmask/gssmask.c b/appl/gssmask/gssmask.c
+index 5a454fc..64de3f6 100644
 --- a/appl/gssmask/gssmask.c
 +++ b/appl/gssmask/gssmask.c
 @@ -55,7 +55,7 @@ struct client {
@@ -9,7 +11,7 @@
  };
  
  FILE *logfile;
-@@ -1097,7 +1097,7 @@ create_client(int fd, int port, const ch
+@@ -1097,7 +1097,7 @@ create_client(int fd, int port, const char *moniker)
      if (moniker) {
  	c->moniker = estrdup(moniker);
      } else {
@@ -18,6 +20,8 @@
  	gethostname(hostname, sizeof(hostname));
  	ret = asprintf(&c->moniker, "gssmask: %s:%d", hostname, port);
  	if (ret == -1)
+diff --git a/appl/kf/kfd.c b/appl/kf/kfd.c
+index 9099bab..5af66a8 100644
 --- a/appl/kf/kfd.c
 +++ b/appl/kf/kfd.c
 @@ -128,7 +128,7 @@ proto (int sock, const char *svc)
@@ -29,6 +33,8 @@
      krb5_data data;
      krb5_data remotename;
      krb5_data tk_file;
+diff --git a/appl/login/login_access.c b/appl/login/login_access.c
+index 71b1fb1..c1b2059 100644
 --- a/appl/login/login_access.c
 +++ b/appl/login/login_access.c
 @@ -163,11 +163,11 @@ list_match(char *list,
@@ -45,9 +51,11 @@
      }
      return (name);
  }
+diff --git a/appl/test/tcp_server.c b/appl/test/tcp_server.c
+index 50d1bf4..e4b4df7 100644
 --- a/appl/test/tcp_server.c
 +++ b/appl/test/tcp_server.c
-@@ -44,7 +44,7 @@ proto (int sock, const char *service)
+@@ -52,7 +52,7 @@ proto (int sock, const char *service)
      krb5_principal server;
      krb5_ticket *ticket;
      char *name;
@@ -56,9 +64,11 @@
      krb5_data packet;
      krb5_data data;
      uint32_t len, net_len;
+diff --git a/lib/gssapi/spnego/accept_sec_context.c b/lib/gssapi/spnego/accept_sec_context.c
+index 48b786c..63940c8 100644
 --- a/lib/gssapi/spnego/accept_sec_context.c
 +++ b/lib/gssapi/spnego/accept_sec_context.c
-@@ -366,7 +366,7 @@ select_mech(OM_uint32 *minor_status, Mec
+@@ -366,7 +366,7 @@ select_mech(OM_uint32 *minor_status, MechType *mechType, int verify_p,
      if (verify_p) {
  	gss_name_t name = GSS_C_NO_NAME;
  	gss_buffer_desc namebuf;
@@ -67,6 +77,8 @@
  
  	host = getenv("GSSAPI_SPNEGO_NAME");
  	if (host == NULL || issuid()) {
+diff --git a/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c
+index edb3b04..01d7d67 100644
 --- a/lib/krb5/get_addrs.c
 +++ b/lib/krb5/get_addrs.c
 @@ -47,7 +47,7 @@ static krb5_error_code
@@ -78,6 +90,8 @@
      struct hostent *hostent;
  
      if (gethostname (hostname, sizeof(hostname))) {
+diff --git a/lib/krb5/get_host_realm.c b/lib/krb5/get_host_realm.c
+index 35edaec..58fd87e 100644
 --- a/lib/krb5/get_host_realm.c
 +++ b/lib/krb5/get_host_realm.c
 @@ -93,7 +93,7 @@ dns_find_realm(krb5_context context,
@@ -89,7 +103,7 @@
      struct rk_dns_reply *r;
      const char **labels;
      char **config_labels;
-@@ -221,7 +221,7 @@ krb5_get_host_realm(krb5_context context
+@@ -218,7 +218,7 @@ krb5_get_host_realm(krb5_context context,
  		    krb5_realm **realms)
  {
      const char *host = targethost;
@@ -98,6 +112,8 @@
      krb5_error_code ret;
      int use_dns;
  
+diff --git a/lib/krb5/krbhst-test.c b/lib/krb5/krbhst-test.c
+index 873734f..8445acf 100644
 --- a/lib/krb5/krbhst-test.c
 +++ b/lib/krb5/krbhst-test.c
 @@ -85,7 +85,7 @@ main(int argc, char **argv)
@@ -109,9 +125,11 @@
  
  	for (j = 0; j < sizeof(types)/sizeof(*types); ++j) {
  	    printf ("%s for %s:\n", type_str[j], argv[i]);
+diff --git a/lib/krb5/krbhst.c b/lib/krb5/krbhst.c
+index 44689ff..e7d6cf5 100644
 --- a/lib/krb5/krbhst.c
 +++ b/lib/krb5/krbhst.c
-@@ -1020,7 +1020,7 @@ gethostlist(krb5_context context, const
+@@ -1061,7 +1061,7 @@ gethostlist(krb5_context context, const char *realm,
      krb5_error_code ret;
      int nhost = 0;
      krb5_krbhst_handle handle;
@@ -120,27 +138,29 @@
      krb5_krbhst_info *hostinfo;
  
      ret = krb5_krbhst_init(context, realm, type, &handle);
+diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
+index 27efcab..072457f 100644
 --- a/lib/krb5/principal.c
 +++ b/lib/krb5/principal.c
-@@ -1033,7 +1033,7 @@ krb5_sname_to_principal_old(krb5_context
+@@ -1050,7 +1050,7 @@ krb5_sname_to_principal_old(krb5_context context,
  			    krb5_principal *ret_princ)
  {
      krb5_error_code ret;
 -    char localhost[MAXHOSTNAMELEN];
 +    char localhost[MaxHostNameLen];
-     char **realms, *host = NULL;
+     char **realms = NULL, *host = NULL;
  
      if(type != KRB5_NT_SRV_HST && type != KRB5_NT_UNKNOWN) {
-@@ -1188,7 +1188,7 @@ krb5_sname_to_principal(krb5_context con
+@@ -1299,7 +1299,7 @@ krb5_sname_to_principal(krb5_context context,
      char *realm, *remote_host;
      krb5_error_code ret;
      register char *cp;
 -    char localname[MAXHOSTNAMELEN];
 +    char localname[MaxHostNameLen];
  
-     if ((type != KRB5_NT_UNKNOWN) &&
- 	(type != KRB5_NT_SRV_HST))
-@@ -1196,7 +1196,7 @@ krb5_sname_to_principal(krb5_context con
+     *ret_princ = NULL;
+ 
+@@ -1309,7 +1309,7 @@ krb5_sname_to_principal(krb5_context context,
  
      /* if hostname is NULL, use local hostname */
      if (!hostname) {
@@ -149,9 +169,11 @@
  	    return errno;
  	hostname = localname;
      }
+diff --git a/lib/krb5/verify_init.c b/lib/krb5/verify_init.c
+index 128502f..2171f53 100644
 --- a/lib/krb5/verify_init.c
 +++ b/lib/krb5/verify_init.c
-@@ -86,7 +86,7 @@ krb5_verify_init_creds(krb5_context cont
+@@ -89,7 +89,7 @@ krb5_verify_init_creds(krb5_context context,
      krb5_data_zero (&req);
  
      if (ap_req_server == NULL) {
@@ -160,9 +182,11 @@
  
  	if (gethostname (local_hostname, sizeof(local_hostname)) < 0) {
  	    ret = errno;
+diff --git a/lib/roken/getaddrinfo_hostspec.c b/lib/roken/getaddrinfo_hostspec.c
+index 4541219..70aca71 100644
 --- a/lib/roken/getaddrinfo_hostspec.c
 +++ b/lib/roken/getaddrinfo_hostspec.c
-@@ -45,7 +45,7 @@ roken_getaddrinfo_hostspec2(const char *
+@@ -45,7 +45,7 @@ roken_getaddrinfo_hostspec2(const char *hostspec,
  {
      const char *p;
      char portstr[NI_MAXSERV];
diff --git a/debian/patches/series b/debian/patches/series
index 2cfcf38ec..05811da89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,3 @@ nfs_des
 041_hurd_maxhostnamelen
 installsh
 042_hurd_path_max
-texinfo_5.1
-texinfo_b_5.1
diff --git a/debian/patches/texinfo_5.1 b/debian/patches/texinfo_5.1
deleted file mode 100644
index 1495e696a..000000000
--- a/debian/patches/texinfo_5.1
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 1846c7a35d1091d3b6140c56befd7fee0a91dcbb
-Author: Love Hornquist Astrand <lha@h5l.org>
-Date:   Mon Apr 8 10:15:15 2013 -0700
-
-    make @iftex case work in texinfo-5.1
-
-diff --git a/doc/whatis.texi b/doc/whatis.texi
-index 8c1f45d..891e275 100644
---- a/doc/whatis.texi
-+++ b/doc/whatis.texi
-@@ -35,10 +35,11 @@ services can authenticate each other.
- @end macro
- @end ifinfo
- 
--@tex
--@def@xsub#1{$_{#1}$}
--@global@let@sub=@xsub
--@end tex
-+@iftex
-+@macro sub{arg}
-+@textsubscript{\arg\}
-+@end macro
-+@end iftex
- 
- @ifhtml
- @macro sub{arg}
diff --git a/debian/patches/texinfo_b_5.1 b/debian/patches/texinfo_b_5.1
deleted file mode 100644
index 75e16168d..000000000
--- a/debian/patches/texinfo_b_5.1
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN heimdal-1.6~git20120403+dfsg1.old/doc/hx509.texi heimdal-1.6~git20120403+dfsg1/doc/hx509.texi

---- heimdal-1.6~git20120403+dfsg1.old/doc/hx509.texi	2012-05-03 15:39:09.000000000 +0000

-+++ heimdal-1.6~git20120403+dfsg1/doc/hx509.texi	2013-06-12 19:23:31.342744883 +0000

-@@ -34,9 +34,20 @@

- @subtitle 2008

- @author Love Hörnquist Åstrand

- 

-+@iftex

- @def@copynext{@vskip 20pt plus 1fil}

- @def@copyrightstart{}

- @def@copyrightend{}

-+@end iftex

-+@ifinfo

-+@macro copynext

-+@end macro

-+@macro copyrightstart

-+@end macro

-+@macro copyrightend

-+@end macro

-+@end ifinfo

-+

- @page

- @copyrightstart

- Copyright (c) 1994-2008 Kungliga Tekniska Högskolan

-@@ -183,6 +194,13 @@

- * CMS signing and encryption::

- * Certificate matching::

- * Software PKCS 11 module::

-+* Creating a CA certificate::

-+* Issuing certificates::

-+* Issuing CRLs::

-+* Application requirements::

-+* CMS background::

-+* Matching syntax::

-+* How to use the PKCS11 module::

- 

- @detailmenu

-  --- The Detailed Node Listing ---

diff --git a/debian/rules b/debian/rules
index f149defb1..a7ceb8c0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,8 @@ override_dh_makeshlibs:
 override_dh_auto_test:
 
 override_dh_auto_configure:
-	./configure $(shell dpkg-buildflags --export=configure) --libexecdir="\$${prefix}/sbin" \
+	./configure $(shell dpkg-buildflags --export=configure) \
+	  --libexecdir="\$${prefix}/sbin" \
 	  --enable-shared \
 	  --enable-shared \
 	  --prefix=/usr \
@@ -111,13 +112,20 @@ override_dh_install:
 		debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal
 	mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so \
 		debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal
-	dh_install --sourcedir=$(DESTDIR) --list-missing
+	# remove general purpose utilities
+	rm -f $(DESTDIR)/usr/bin/bsearch \
+		  $(DESTDIR)/usr/bin/idn-lookup \
+		  $(DESTDIR)/usr/share/man/man1/bsearch.1 \
+		  $(DESTDIR)/usr/share/man/man1/idn-lookup.1
+	# remove unwanted files
+	rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/windc.so*
+	rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/windc.a
+	# no translations for the moment
+	rm -rf $(DESTDIR)/usr/share/locale/sv_SE
+	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
 	# remove conflicting files
 	rm -rf debian/heimdal-multidev/usr/include/heimdal/ss
 	rm -f debian/heimdal-multidev/usr/include/heimdal/fnmatch.h
-	# remove unwanted files
-	rm -f debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal/windc.so
-	rm -f debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal/windc.a
 	# rewrite symlinks to symlinks to point directly to file
 	for l in debian/heimdal-multidev/usr/lib/${DEB_HOST_MULTIARCH}/heimdal/*.so; do \
 		ln -s -f ../`readlink $$l` $$l ; \