[Pkg-voip-commits] r856 - in pwlib/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2005-10-16 19:16:08 +0000 (Sun, 16 Oct 2005)
New Revision: 856

Added:
   pwlib/trunk/debian/patches/08_fix_casts.dpatch
Modified:
   pwlib/trunk/debian/changelog
   pwlib/trunk/debian/control
   pwlib/trunk/debian/patches/00list
Log:
prepare new upload fixing #331634


Modified: pwlib/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog	2005-10-16 02:27:44 UTC (rev 855)
+++ pwlib/trunk/debian/changelog	2005-10-16 19:16:08 UTC (rev 856)
@@ -1,3 +1,9 @@
+pwlib (1.8.7-2) unstable; urgency=low
+
+  * Conflict old pwlib version to allow clean upgrade. (Closes: #331634)
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 16 Oct 2005 21:13:00 +0200
+
 pwlib (1.8.7-1) unstable; urgency=low
 
   * Mimas_patch2 is 1.8.7. And shlibdeps imposes this as version.

Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control	2005-10-16 02:27:44 UTC (rev 855)
+++ pwlib/trunk/debian/control	2005-10-16 19:16:08 UTC (rev 856)
@@ -12,7 +12,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libpt-1.8.3
+Replaces: libpt-1.8.3, libpt-1.8.3c2 (<< 1.8.4-3)
 Conflicts: libpt-1.8.3
 Description: Portable Windows Library
  This package contains the shared version of the library PWLib, which is

Modified: pwlib/trunk/debian/patches/00list
===================================================================
--- pwlib/trunk/debian/patches/00list	2005-10-16 02:27:44 UTC (rev 855)
+++ pwlib/trunk/debian/patches/00list	2005-10-16 19:16:08 UTC (rev 856)
@@ -4,3 +4,4 @@
 05_hppa
 06_plugins_shared
 07_nostrip
+08_fix_casts

Added: pwlib/trunk/debian/patches/08_fix_casts.dpatch
===================================================================
--- pwlib/trunk/debian/patches/08_fix_casts.dpatch	2005-10-16 02:27:44 UTC (rev 855)
+++ pwlib/trunk/debian/patches/08_fix_casts.dpatch	2005-10-16 19:16:08 UTC (rev 856)
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_casts.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix casts
+
+ at DPATCH@
+--- pwlib-1.8.7.orig/src/ptclib/pssl.cxx
++++ pwlib-1.8.7/src/ptclib/pssl.cxx
+@@ -297,14 +297,14 @@
+ 
+ PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
+ {
+-  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
++  key = d2i_AutoPrivateKey(NULL, (const unsigned char **)&keyData, keySize);
+ }
+ 
+ 
+ PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
+ {
+   const BYTE * keyPtr = keyData;
+-  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
++  key = d2i_AutoPrivateKey(NULL, (const unsigned char **)&keyPtr, keyData.GetSize());
+ }
+ 
+ 
+@@ -472,14 +472,14 @@
+ 
+ PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
+ {
+-  certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
++  certificate = d2i_X509(NULL, (const unsigned char **)&certData, certSize);
+ }
+ 
+ 
+ PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
+ {
+   const BYTE * certPtr = certData;
+-  certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
++  certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
+ }
+ 
+ 
+@@ -489,7 +489,7 @@
+   PBase64::Decode(certStr, certData);
+   if (certData.GetSize() > 0) {
+     const BYTE * certPtr = certData;
+-    certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
++    certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
+   }
+   else
+     certificate = NULL;