diff -u heimdal-1.2.e1.dfsg.1/debian/rules heimdal-1.2.e1.dfsg.1/debian/rules --- heimdal-1.2.e1.dfsg.1/debian/rules +++ heimdal-1.2.e1.dfsg.1/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +CPPFLAGS += -DLDAP_DEPRECATED + DEB_INSTALL_DOCS_ALL = DEB_INSTALL_DOCS_heimdal-docs = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done)) \ NEWS TODO diff -u heimdal-1.2.e1.dfsg.1/debian/control heimdal-1.2.e1.dfsg.1/debian/control --- heimdal-1.2.e1.dfsg.1/debian/control +++ heimdal-1.2.e1.dfsg.1/debian/control @@ -1,11 +1,12 @@ Source: heimdal Section: net Priority: optional -Maintainer: Brian May -Homepage: http://www.h5l.org/ -Standards-Version: 3.8.1 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Brian May Build-Depends: libncurses5-dev, bison, flex, debhelper (>= 7), libx11-dev, libxau-dev, libxt-dev, x11proto-core-dev, libedit-dev, libdb-dev, libssl-dev (>= 0.9.7), cdbs, quilt, libhesiod-dev, comerr-dev (>= 1.35), libldap2-dev, ss-dev, texinfo, python Build-Conflicts: heimdal-dev +Standards-Version: 3.8.1 +Homepage: http://www.h5l.org/ Package: heimdal-docs Section: doc @@ -26,7 +27,7 @@ Priority: extra Architecture: any Conflicts: kerberos4kth-kdc, heimdal-clients (<< 0.4e-3), heimdal-servers (<< 0.6.3-3), krb5-kdc, krb5-admin-server -Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, logrotate, debconf (>= 0.5.00) | debconf-2.0, krb5-config, openbsd-inetd|inet-superserver +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, logrotate, debconf (>= 0.5.00) | debconf-2.0, krb5-config, netbase, openbsd-inetd | inet-superserver Replaces: heimdal-clients (<< 0.7.2-1), heimdal-servers (<< 0.4e-3) Suggests: heimdal-docs Description: Heimdal Kerberos - key distribution center (KDC) @@ -115,7 +116,7 @@ Package: heimdal-servers Priority: extra Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd|inet-superserver, krb5-config +Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, krb5-config, openbsd-inetd | inet-superserver Conflicts: telnetd, wu-ftpd-academ (<< 2.5.0), netstd, heimdal-clients (<< 0.2l-2), telnetd-ssl, kerberos4kth-services, ftp-server, rsh-server, telnet-server, pop3-server Provides: ftp-server, rsh-server, telnet-server, pop3-server Suggests: heimdal-docs diff -u heimdal-1.2.e1.dfsg.1/debian/changelog heimdal-1.2.e1.dfsg.1/debian/changelog --- heimdal-1.2.e1.dfsg.1/debian/changelog +++ heimdal-1.2.e1.dfsg.1/debian/changelog @@ -1,3 +1,14 @@ +heimdal (1.2.e1.dfsg.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #402862 + - debian/rules: + + Set CPPFLAGS=-DLDAP_DEPRECATED to fix build with OpenLDAP 2.4 on + 64-bit architectures. + - debian/control: + + Add netbase to heimdal-kdc and heimdal-servers depends + + -- Bhavani Shankar Wed, 22 Jul 2009 10:21:22 +0530 + heimdal (1.2.e1.dfsg.1-1) unstable; urgency=low * New upstream version. @@ -5,6 +16,17 @@ -- Brian May Mon, 13 Jul 2009 14:43:12 +1000 +heimdal (1.2.dfsg.1-5ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: + + Set CPPFLAGS=-DLDAP_DEPRECATED to fix build with OpenLDAP 2.4 on + 64-bit architectures. + - debian/control: + + Add netbase to heimdal-kdc and heimdal-servers depends + + -- Nick Ellery Wed, 17 Jun 2009 17:14:06 -0700 + heimdal (1.2.dfsg.1-5) unstable; urgency=low * Fix problems with postinst script. kdc.conf installed gzipped. @@ -15,6 +37,17 @@ -- Brian May Wed, 13 May 2009 11:27:03 +1000 +heimdal (1.2.dfsg.1-4ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes (LP: #368947): + - debian/rules: + + Set CPPFLAGS=-DLDAP_DEPRECATED to fix build with OpenLDAP 2.4 on + 64-bit architectures. + - debian/control: + + Add netbase to heimdal-kdc and heimdal-servers depends + + -- Nick Ellery Tue, 28 Apr 2009 17:30:32 -0700 + heimdal (1.2.dfsg.1-4) unstable; urgency=low * Update to use unversioned libdb-dev. Closes: #524292. @@ -36,6 +69,20 @@ -- Brian May Mon, 06 Apr 2009 09:38:38 +1000 +heimdal (1.2.dfsg.1-2.1ubuntu1) jaunty; urgency=low + + * 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. + + -- Nick Ellery Mon, 17 Nov 2008 22:25:58 -0800 + heimdal (1.2.dfsg.1-2.1) unstable; urgency=low * Non-maintainer upload. @@ -63,6 +110,14 @@ -- Brian May Sat, 21 Jun 2008 01:00:05 +0000 +heimdal (1.1-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Add update-inetd to heimdal-server and heimdal-kdc's dependenices. + - Add openbsd-inetd | inet-superserver to heimdal-server dependenices. + + -- Chuck Short Fri, 20 Jun 2008 11:13:21 -0500 + heimdal (1.1-3) unstable; urgency=low * Fix versioned symbols on x86_64. Closes: #453241. @@ -105,6 +160,35 @@ -- Brian May Fri, 29 Feb 2008 11:05:18 +1100 +heimdal (1.0.1-5ubuntu4) hardy; urgency=low + + * Set CPPFLAGS=-DLDAP_DEPRECATED to fix build with OpenLDAP 2.4 on + 64-bit architectures. + + -- Steve Langasek Sat, 08 Mar 2008 07:00:04 +0000 + +heimdal (1.0.1-5ubuntu3) hardy; urgency=low + + * Rebuild against libdb4.6.21-5ubuntu1 (LP: #187467) + + -- Nicolas Valcárcel Wed, 30 Jan 2008 19:36:16 -0500 + +heimdal (1.0.1-5ubuntu2) hardy; urgency=low + + * Rebuild against libldap2.4-2 + + * Rebuild against libldap2.4-2 + + -- Emmet Hikory Thu, 24 Jan 2008 21:54:33 +0900 + +heimdal (1.0.1-5ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add update-inetd to heimdal-servers and heimdal-kdc's dependencies + - Add openbsd-inetd | inet-superserver to heimdal-servers dependencies + + -- Rick Clark Thu, 13 Dec 2007 12:12:51 -0500 + heimdal (1.0.1-5) unstable; urgency=low * The "I can make these changes. Really!" release. @@ -178,6 +262,23 @@ -- Brian May Mon, 4 Jun 2007 13:06:24 +1000 +heimdal (0.7.2.dfsg.1-10ubuntu2) gutsy; urgency=low + + * debian/control: + - Actually added openbsd-inetd | inet-superserver to heimdal-servers' + dependencies (LP: #123782). + - DebainMaintainerField foo + + -- Rick Clark Tue, 03 Jul 2007 19:58:47 -0400 + +heimdal (0.7.2.dfsg.1-10ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add update-inetd to heimdal-servers and heimdal-kdc's dependencies + - Add openbsd-inetd | inet-superserver to heimdal-servers dependencies + + -- Lionel Porcheron Fri, 09 Feb 2007 14:17:33 +0100 + heimdal (0.7.2.dfsg.1-10) unstable; urgency=low * Add Portuguese debconf translation (closes: #408186). @@ -186,12 +287,29 @@ -- Brian May Thu, 8 Feb 2007 15:27:28 +1100 +heimdal (0.7.2.dfsg.1-9ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add update-inetd to heimdal-servers and heimdal-kdc's dependencies + - Add openbsd-inetd | inet-superserver to heimdal-servers dependencies + + -- Lionel Porcheron Sun, 14 Jan 2007 21:48:33 +0100 + heimdal (0.7.2.dfsg.1-9) unstable; urgency=low * Include Spanish po-debconf translation (closes: #403481). -- Brian May Thu, 11 Jan 2007 09:09:26 +1100 +heimdal (0.7.2.dfsg.1-8ubuntu1) feisty; urgency=low + + * debian/control: Add update-inetd to heimdal-servers's dependencies + (Closes Ubuntu: #76104). + * debian/control: Add openbsd-inetd | inet-superserver dependencies + as heimdal-servers needs an inet server to work + + -- Lionel Porcheron Sun, 17 Dec 2006 11:28:51 +0100 + heimdal (0.7.2.dfsg.1-8) unstable; urgency=high * Swap -n with -z in test, otherwise servers won't get added on initial @@ -1301 +1418,0 @@ -