[Pkg-cyrus-sasl2-commits] r410 - in /cyrus-sasl-2.1/branches/heimdal/debian: changelog control patches/0021_build_with_gcc44.dpatch patches/00list source.lintian-overrides

Sat Mar 14 23:40:44 UTC 2009

Author: roberto
Date: Sat Mar 14 23:40:44 2009
New Revision: 410

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=410
Log:
* Bump Standards-Version
* Patch from Martin Michlmayr to build with gcc 4.4 (Closes: #505054)
* Some cleanup based on suggestions from lintian

Added:
    cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch   (with props)
Removed:
    cyrus-sasl-2.1/branches/heimdal/debian/source.lintian-overrides
Modified:
    cyrus-sasl-2.1/branches/heimdal/debian/changelog
    cyrus-sasl-2.1/branches/heimdal/debian/control
    cyrus-sasl-2.1/branches/heimdal/debian/patches/00list

Modified: cyrus-sasl-2.1/branches/heimdal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/changelog?rev=410&op=diff
==============================================================================

--- cyrus-sasl-2.1/branches/heimdal/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/changelog Sat Mar 14 23:40:44 2009
@@ -1,8 +1,10 @@
 cyrus-sasl2-heimdal (2.1.22.dfsg1-24) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Roberto C. Sanchez <roberto at connexer.com>  Mon, 01 Sep 2008 13:24:40 -0400
+  * Bump Standards-Version
+  * Patch from Martin Michlmayr to build with gcc 4.4 (Closes: #505054)
+  * Some cleanup based on suggestions from lintian
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 14 Mar 2009 19:40:26 -0400
 
 cyrus-sasl2-heimdal (2.1.22.dfsg1-23) unstable; urgency=high
 

Modified: cyrus-sasl-2.1/branches/heimdal/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/control?rev=410&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/control (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/control Sat Mar 14 23:40:44 2009
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
 Uploaders: Fabian Fagerholm <fabbe at debian.org>, Roberto C. Sanchez <roberto at connexer.com>
-Standards-Version: 3.8.0.0
+Standards-Version: 3.8.1
 Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb-dev (>= 4.6.21), libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), heimdal-dev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base
 Build-Conflicts: libkrb5-dev
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/
@@ -11,8 +11,6 @@
 Homepage: http://asg.web.cmu.edu/sasl/sasl-library.html
 
 Package: libsasl2-modules-gssapi-heimdal
-Section: libs
-Priority: extra
 Architecture: any
 Depends: libsasl2-modules (>= ${source:Version}), libsasl2-modules (<< ${source:Version}.), ${shlibs:Depends}
 Conflicts: libsasl2-modules-gssapi-mit
@@ -26,7 +24,6 @@
 Package: cyrus-sasl2-heimdal-dbg
 Section: libdevel
 Architecture: any
-Priority: extra
 Depends: cyrus-sasl2-dbg (>= ${source:Version}), cyrus-sasl2-dbg (<< ${source:Version}.), libsasl2-modules-gssapi-heimdal (= ${binary:Version})
 Description: Debugging symbols for Cyrus SASL
  This is the Cyrus SASL API implementation, version 2. See package

Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch?rev=410&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch Sat Mar 14 23:40:44 2009
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0021_build_with_gcc44.dpatch by  <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build with gcc 4.4
+
+ at DPATCH@
+
+Index: plugins/digestmd5.c
+===================================================================
+--- plugins/digestmd5.c	(revision 409)
++++ plugins/digestmd5.c	(working copy)
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,

Propchange: cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/00list?rev=410&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/00list (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/00list Sat Mar 14 23:40:44 2009
@@ -19,3 +19,4 @@
 0018_auth_rimap_quotes
 0019_ldap_deprecated
 0020_saslauthd_manpage
+0021_build_with_gcc44


