Bug#331634: Intention to NMU

[Luk Claes]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi

Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.

Note that this also resolves the build error and fixes the clean target.

Cheers

Luk


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDUjbS5UTeB5t8Mo0RAlQsAKCM4CiZvNPhqLHMSAqLoC1mb4DNiwCeMb3s
3+2JPg6FFlpgAIbW/SE70IE=
=05wm
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -u pwlib-1.8.7/debian/control pwlib-1.8.7/debian/control
--- pwlib-1.8.7/debian/control
+++ pwlib-1.8.7/debian/control
@@ -27,6 +27,7 @@
 Section: libdevel
 Architecture: any
 Depends: libpt-1.8.3c2 (= ${Source-Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
+Replaces: libpt-1.8.3c2 (<< 1.8.4-3)
 Description: Portable Windows Library development files
  This package contains the headers and a static version of the library
  PWLib, which is a moderately large class library that has its genesis
diff -u pwlib-1.8.7/debian/changelog pwlib-1.8.7/debian/changelog
--- pwlib-1.8.7/debian/changelog
+++ pwlib-1.8.7/debian/changelog
@@ -1,3 +1,10 @@
+pwlib (1.8.7-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Replace libpt-1.8.3c2 (<< 1.8.4-3). (Closes: #331634)
+
+ -- Luk Claes <luk at debian.org>  Sun, 16 Oct 2005 11:58:55 +0200
+
 pwlib (1.8.7-1) unstable; urgency=low
 
   * Mimas_patch2 is 1.8.7. And shlibdeps imposes this as version.
diff -u pwlib-1.8.7/debian/rules pwlib-1.8.7/debian/rules
--- pwlib-1.8.7/debian/rules
+++ pwlib-1.8.7/debian/rules
@@ -87,7 +87,7 @@
 	$(checkdir)
 	-rm -f build-arch-stamp build-indep-stamp patch-stamp
 	if [ -f Makefile ];then \
-	-$(MAKE) PWLIBDIR=$(PWD) clean;\
+	$(MAKE) PWLIBDIR=$(PWD) clean;\
 	fi
 	-rm -f include/ptbuildopts.h
 	-rm -f Makefile config.log config.status autotools
only in patch2:
unchanged:
--- 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;
only in patch2:
unchanged:
--- pwlib-1.8.7.orig/plugins/vidinput_dc/Makefile
+++ pwlib-1.8.7/plugins/vidinput_dc/Makefile
@@ -0,0 +1,12 @@
+ifndef PWLIBDIR
+PWLIBDIR = $(HOME)/pwlib
+endif
+
+PLUGIN_NAME	= dc
+PLUGIN_FAMILY	= device/videoinput
+PLUGIN_LIBS	= -lraw1394 -ldv -ldc1394_control
+PLUGIN_SOURCES	= video4dc1394.cxx
+
+CFLAGS		= 
+
+include ../../make/plugins.mak