--- nspr-4.7.5.orig/debian/libnspr4-0d.preinst +++ nspr-4.7.5/debian/libnspr4-0d.preinst @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +migratious_files="libnspr4.so libplc4.so libplds4.so" + +if [ "$1" = "upgrade" ]; then + for f in $migratious_files; do + # before new binaries get installed, we move the links + if [ -L /usr/lib/$f ]; then + rm -f /usr/lib/XNOLDCONFIG_$f.new-migration + mv /usr/lib/$f /usr/lib/XNOLDCONFIG_$f.new-migration + fi + # before the new links get installed, we move the old binaries + if [ -r /usr/lib/$f.0d -a ! -L /usr/lib/$f.0d ]; then + rm -f /usr/lib/XNOLDCONFIG_$f.0d.new-migration + mv /usr/lib/$f.0d /usr/lib/XNOLDCONFIG_$f.0d.new-migration + fi + done +fi + +#DEBHELPER# --- nspr-4.7.5.orig/debian/libnspr4-0d.links +++ nspr-4.7.5/debian/libnspr4-0d.links @@ -0,0 +1,3 @@ +usr/lib/libnspr4.so usr/lib/libnspr4.so.0d +usr/lib/libplc4.so usr/lib/libplc4.so.0d +usr/lib/libplds4.so usr/lib/libplds4.so.0d --- nspr-4.7.5.orig/debian/libnspr4-0d.prerm +++ nspr-4.7.5/debian/libnspr4-0d.prerm @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +migratious_files="libnspr4.so libplc4.so libplds4.so" + +if [ "$1" = "abort-upgrade" -o "$1" = "failed-upgrade" ]; then + + for f in $migratious_files; do + if [ -e /usr/lib/XNOLDCONFIG_$f.new-migration ]; then + rm -f /usr/lib/$f + mv /usr/lib/XNOLDCONFIG_$f.new-migration /usr/lib/$f + fi + if [ -e /usr/lib/XNOLDCONFIG_$f.0d.new-migration ]; then + rm -f /usr/lib/$f.0d + mv /usr/lib/XNOLDCONFIG_$f.0d.new-migration /usr/lib/$f.0d + fi + done + +fi + + +# old-prerm upgrade version +# this is the dowgrade cas where we need to reshuffle links before the upgrade happens +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" "le" "4.7.1+1.9-1ubuntu1~"; then + + for f in $migratious_files; do + if [ -L /usr/lib/$f.0d ]; then + rm -f /usr/lib/XNOLDCONFIG_$f.old-migration + mv /usr/lib/$f.0d /usr/lib/XNOLDCONFIG_$f.0d.old-migration + fi + if [ -r /usr/lib/$f -a ! -L /usr/lib/$f ]; then + rm -f /usr/lib/XNOLDCONFIG_$f.old-migration + mv /usr/lib/$f /usr/lib/XNOLDCONFIG_$f.old-migration + fi + done + +fi + +#DEBHELPER# --- nspr-4.7.5.orig/debian/libnspr4-0d.symbols +++ nspr-4.7.5/debian/libnspr4-0d.symbols @@ -0,0 +1,458 @@ +libnspr4.so libnspr4-0d #MINVER# + GetExecutionEnvironment@Base 4.7.3-0ubuntu1~ + LL_MaxInt@Base 4.7.3-0ubuntu1~ + LL_MaxUint@Base 4.7.3-0ubuntu1~ + LL_MinInt@Base 4.7.3-0ubuntu1~ + LL_Zero@Base 4.7.3-0ubuntu1~ + PRP_DestroyNakedCondVar@Base 4.7.3-0ubuntu1~ + PRP_NakedBroadcast@Base 4.7.3-0ubuntu1~ + PRP_NakedNotify@Base 4.7.3-0ubuntu1~ + PRP_NakedWait@Base 4.7.3-0ubuntu1~ + PRP_NewNakedCondVar@Base 4.7.3-0ubuntu1~ + PRP_TryLock@Base 4.7.3-0ubuntu1~ + PR_Abort@Base 4.7.3-0ubuntu1~ + PR_Accept@Base 4.7.3-0ubuntu1~ + PR_AcceptRead@Base 4.7.3-0ubuntu1~ + PR_Access@Base 4.7.3-0ubuntu1~ + PR_AddToCounter@Base 4.7.3-0ubuntu1~ + PR_AddWaitFileDesc@Base 4.7.3-0ubuntu1~ + PR_AllocFileDesc@Base 4.7.3-0ubuntu1~ + PR_Assert@Base 4.7.3-0ubuntu1~ + PR_AtomicAdd@Base 4.7.3-0ubuntu1~ + PR_AtomicDecrement@Base 4.7.3-0ubuntu1~ + PR_AtomicIncrement@Base 4.7.3-0ubuntu1~ + PR_AtomicSet@Base 4.7.3-0ubuntu1~ + PR_AttachSharedMemory@Base 4.7.3-0ubuntu1~ + PR_AttachThread@Base 4.7.3-0ubuntu1~ + PR_Available64@Base 4.7.3-0ubuntu1~ + PR_Available@Base 4.7.3-0ubuntu1~ + PR_Bind@Base 4.7.3-0ubuntu1~ + PR_BlockClockInterrupts@Base 4.7.3-0ubuntu1~ + PR_BlockInterrupt@Base 4.7.3-0ubuntu1~ + PR_CEnterMonitor@Base 4.7.3-0ubuntu1~ + PR_CExitMonitor@Base 4.7.3-0ubuntu1~ + PR_CNotify@Base 4.7.3-0ubuntu1~ + PR_CNotifyAll@Base 4.7.3-0ubuntu1~ + PR_CSetOnMonitorRecycle@Base 4.7.3-0ubuntu1~ + PR_CWait@Base 4.7.3-0ubuntu1~ + PR_CallOnce@Base 4.7.3-0ubuntu1~ + PR_CallOnceWithArg@Base 4.7.3-0ubuntu1~ + PR_Calloc@Base 4.7.3-0ubuntu1~ + PR_CancelJob@Base 4.7.3-0ubuntu1~ + PR_CancelWaitFileDesc@Base 4.7.3-0ubuntu1~ + PR_CancelWaitGroup@Base 4.7.3-0ubuntu1~ + PR_CeilingLog2@Base 4.7.3-0ubuntu1~ + PR_ChangeFileDescNativeHandle@Base 4.7.3-0ubuntu1~ + PR_Cleanup@Base 4.7.3-0ubuntu1~ + PR_ClearInterrupt@Base 4.7.3-0ubuntu1~ + PR_ClearThreadGCAble@Base 4.7.3-0ubuntu1~ + PR_Close@Base 4.7.3-0ubuntu1~ + PR_CloseDir@Base 4.7.3-0ubuntu1~ + PR_CloseFileMap@Base 4.7.3-0ubuntu1~ + PR_CloseSemaphore@Base 4.7.3-0ubuntu1~ + PR_CloseSharedMemory@Base 4.7.3-0ubuntu1~ + PR_Connect@Base 4.7.3-0ubuntu1~ + PR_ConnectContinue@Base 4.7.3-0ubuntu1~ + PR_ConvertIPv4AddrToIPv6@Base 4.7.3-0ubuntu1~ + PR_CreateAlarm@Base 4.7.3-0ubuntu1~ + PR_CreateCounter@Base 4.7.3-0ubuntu1~ + PR_CreateFileMap@Base 4.7.3-0ubuntu1~ + PR_CreateIOLayer@Base 4.7.3-0ubuntu1~ + PR_CreateIOLayerStub@Base 4.7.3-0ubuntu1~ + PR_CreateMWaitEnumerator@Base 4.7.3-0ubuntu1~ + PR_CreateOrderedLock@Base 4.7.3-0ubuntu1~ + PR_CreatePipe@Base 4.7.3-0ubuntu1~ + PR_CreateProcess@Base 4.7.3-0ubuntu1~ + PR_CreateProcessDetached@Base 4.7.3-0ubuntu1~ + PR_CreateSocketPollFd@Base 4.7.3-0ubuntu1~ + PR_CreateStack@Base 4.7.3-0ubuntu1~ + PR_CreateThread@Base 4.7.3-0ubuntu1~ + PR_CreateThreadGCAble@Base 4.7.3-0ubuntu1~ + PR_CreateThreadPool@Base 4.7.3-0ubuntu1~ + PR_CreateTrace@Base 4.7.3-0ubuntu1~ + PR_CreateWaitGroup@Base 4.7.3-0ubuntu1~ + PR_DecrementCounter@Base 4.7.3-0ubuntu1~ + PR_Delete@Base 4.7.3-0ubuntu1~ + PR_DeleteSemaphore@Base 4.7.3-0ubuntu1~ + PR_DeleteSharedMemory@Base 4.7.3-0ubuntu1~ + PR_DestroyAlarm@Base 4.7.3-0ubuntu1~ + PR_DestroyCondVar@Base 4.7.3-0ubuntu1~ + PR_DestroyCounter@Base 4.7.3-0ubuntu1~ + PR_DestroyLock@Base 4.7.3-0ubuntu1~ + PR_DestroyMWaitEnumerator@Base 4.7.3-0ubuntu1~ + PR_DestroyMonitor@Base 4.7.3-0ubuntu1~ + PR_DestroyOrderedLock@Base 4.7.3-0ubuntu1~ + PR_DestroyPollableEvent@Base 4.7.3-0ubuntu1~ + PR_DestroyProcessAttr@Base 4.7.3-0ubuntu1~ + PR_DestroyRWLock@Base 4.7.3-0ubuntu1~ + PR_DestroySem@Base 4.7.3-0ubuntu1~ + PR_DestroySocketPollFd@Base 4.7.3-0ubuntu1~ + PR_DestroyStack@Base 4.7.3-0ubuntu1~ + PR_DestroyTrace@Base 4.7.3-0ubuntu1~ + PR_DestroyWaitGroup@Base 4.7.3-0ubuntu1~ + PR_DetachProcess@Base 4.7.3-0ubuntu1~ + PR_DetachSharedMemory@Base 4.7.3-0ubuntu1~ + PR_DetachThread@Base 4.7.3-0ubuntu1~ + PR_DisableClockInterrupts@Base 4.7.3-0ubuntu1~ + PR_EmulateAcceptRead@Base 4.7.3-0ubuntu1~ + PR_EmulateSendFile@Base 4.7.3-0ubuntu1~ + PR_EnableClockInterrupts@Base 4.7.3-0ubuntu1~ + PR_EnterMonitor@Base 4.7.3-0ubuntu1~ + PR_EnumerateAddrInfo@Base 4.7.3-0ubuntu1~ + PR_EnumerateHostEnt@Base 4.7.3-0ubuntu1~ + PR_EnumerateThreads@Base 4.7.3-0ubuntu1~ + PR_EnumerateWaitGroup@Base 4.7.3-0ubuntu1~ + PR_ErrorInstallCallback@Base 4.7.3-0ubuntu1~ + PR_ErrorInstallTable@Base 4.7.3-0ubuntu1~ + PR_ErrorLanguages@Base 4.7.3-0ubuntu1~ + PR_ErrorToName@Base 4.7.3-0ubuntu1~ + PR_ErrorToString@Base 4.7.3-0ubuntu1~ + PR_ExitMonitor@Base 4.7.3-0ubuntu1~ + PR_ExplodeTime@Base 4.7.3-0ubuntu1~ + PR_ExportFileMapAsString@Base 4.7.3-0ubuntu1~ + PR_FD_CLR@Base 4.7.3-0ubuntu1~ + PR_FD_ISSET@Base 4.7.3-0ubuntu1~ + PR_FD_NCLR@Base 4.7.3-0ubuntu1~ + PR_FD_NISSET@Base 4.7.3-0ubuntu1~ + PR_FD_NSET@Base 4.7.3-0ubuntu1~ + PR_FD_SET@Base 4.7.3-0ubuntu1~ + PR_FD_ZERO@Base 4.7.3-0ubuntu1~ + PR_FPrintZoneStats@Base 4.7.3-0ubuntu1~ + PR_FileDesc2NativeHandle@Base 4.7.3-0ubuntu1~ + PR_FindFunctionSymbol@Base 4.7.3-0ubuntu1~ + PR_FindFunctionSymbolAndLibrary@Base 4.7.3-0ubuntu1~ + PR_FindNextCounterQname@Base 4.7.3-0ubuntu1~ + PR_FindNextCounterRname@Base 4.7.3-0ubuntu1~ + PR_FindNextTraceQname@Base 4.7.3-0ubuntu1~ + PR_FindNextTraceRname@Base 4.7.3-0ubuntu1~ + PR_FindSymbol@Base 4.7.3-0ubuntu1~ + PR_FindSymbolAndLibrary@Base 4.7.3-0ubuntu1~ + PR_FloorLog2@Base 4.7.3-0ubuntu1~ + PR_FormatTime@Base 4.7.3-0ubuntu1~ + PR_FormatTimeUSEnglish@Base 4.7.3-0ubuntu1~ + PR_Free@Base 4.7.3-0ubuntu1~ + PR_FreeAddrInfo@Base 4.7.3-0ubuntu1~ + PR_FreeLibraryName@Base 4.7.3-0ubuntu1~ + PR_GMTParameters@Base 4.7.3-0ubuntu1~ + PR_GetAddrInfoByName@Base 4.7.3-0ubuntu1~ + PR_GetCanonNameFromAddrInfo@Base 4.7.3-0ubuntu1~ + PR_GetConnectStatus@Base 4.7.3-0ubuntu1~ + PR_GetCounter@Base 4.7.3-0ubuntu1~ + PR_GetCounterHandleFromName@Base 4.7.3-0ubuntu1~ + PR_GetCounterNameFromHandle@Base 4.7.3-0ubuntu1~ + PR_GetCurrentThread@Base 4.7.3-0ubuntu1~ + PR_GetDefaultIOMethods@Base 4.7.3-0ubuntu1~ + PR_GetDescType@Base 4.7.3-0ubuntu1~ + PR_GetDirectorySeparator@Base 4.7.3-0ubuntu1~ + PR_GetDirectorySepartor@Base 4.7.3-0ubuntu1~ + PR_GetEnv@Base 4.7.3-0ubuntu1~ + PR_GetError@Base 4.7.3-0ubuntu1~ + PR_GetErrorText@Base 4.7.3-0ubuntu1~ + PR_GetErrorTextLength@Base 4.7.3-0ubuntu1~ + PR_GetFileInfo64@Base 4.7.3-0ubuntu1~ + PR_GetFileInfo@Base 4.7.3-0ubuntu1~ + PR_GetFileMethods@Base 4.7.3-0ubuntu1~ + PR_GetGCRegisters@Base 4.7.3-0ubuntu1~ + PR_GetHostByAddr@Base 4.7.3-0ubuntu1~ + PR_GetHostByName@Base 4.7.3-0ubuntu1~ + PR_GetIPNodeByName@Base 4.7.3-0ubuntu1~ + PR_GetIdentitiesLayer@Base 4.7.3-0ubuntu1~ + PR_GetInheritedFD@Base 4.7.3-0ubuntu1~ + PR_GetInheritedFileMap@Base 4.7.3-0ubuntu1~ + PR_GetLayersIdentity@Base 4.7.3-0ubuntu1~ + PR_GetLibraryFilePathname@Base 4.7.3-0ubuntu1~ + PR_GetLibraryName@Base 4.7.3-0ubuntu1~ + PR_GetLibraryPath@Base 4.7.3-0ubuntu1~ + PR_GetMemMapAlignment@Base 4.7.3-0ubuntu1~ + PR_GetMonitorEntryCount@Base 4.7.3-0ubuntu1~ + PR_GetNameForIdentity@Base 4.7.3-0ubuntu1~ + PR_GetNumberOfProcessors@Base 4.7.3-0ubuntu1~ + PR_GetOSError@Base 4.7.3-0ubuntu1~ + PR_GetOpenFileInfo64@Base 4.7.3-0ubuntu1~ + PR_GetOpenFileInfo@Base 4.7.3-0ubuntu1~ + PR_GetPageShift@Base 4.7.3-0ubuntu1~ + PR_GetPageSize@Base 4.7.3-0ubuntu1~ + PR_GetPathSeparator@Base 4.7.3-0ubuntu1~ + PR_GetPeerName@Base 4.7.3-0ubuntu1~ + PR_GetPhysicalMemorySize@Base 4.7.3-0ubuntu1~ + PR_GetPipeMethods@Base 4.7.3-0ubuntu1~ + PR_GetProtoByName@Base 4.7.3-0ubuntu1~ + PR_GetProtoByNumber@Base 4.7.3-0ubuntu1~ + PR_GetRandomNoise@Base 4.7.3-0ubuntu1~ + PR_GetSP@Base 4.7.3-0ubuntu1~ + PR_GetSockName@Base 4.7.3-0ubuntu1~ + PR_GetSocketOption@Base 4.7.3-0ubuntu1~ + PR_GetSpecialFD@Base 4.7.3-0ubuntu1~ + PR_GetStackSpaceLeft@Base 4.7.3-0ubuntu1~ + PR_GetSysfdTableMax@Base 4.7.3-0ubuntu1~ + PR_GetSystemInfo@Base 4.7.3-0ubuntu1~ + PR_GetTCPMethods@Base 4.7.3-0ubuntu1~ + PR_GetThreadAffinityMask@Base 4.7.3-0ubuntu1~ + PR_GetThreadID@Base 4.7.3-0ubuntu1~ + PR_GetThreadPriority@Base 4.7.3-0ubuntu1~ + PR_GetThreadPrivate@Base 4.7.3-0ubuntu1~ + PR_GetThreadScope@Base 4.7.3-0ubuntu1~ + PR_GetThreadState@Base 4.7.3-0ubuntu1~ + PR_GetThreadType@Base 4.7.3-0ubuntu1~ + PR_GetTraceEntries@Base 4.7.3-0ubuntu1~ + PR_GetTraceHandleFromName@Base 4.7.3-0ubuntu1~ + PR_GetTraceNameFromHandle@Base 4.7.3-0ubuntu1~ + PR_GetTraceOption@Base 4.7.3-0ubuntu1~ + PR_GetUDPMethods@Base 4.7.3-0ubuntu1~ + PR_GetUniqueIdentity@Base 4.7.3-0ubuntu1~ + PR_ImplodeTime@Base 4.7.3-0ubuntu1~ + PR_ImportFile@Base 4.7.3-0ubuntu1~ + PR_ImportFileMapFromString@Base 4.7.3-0ubuntu1~ + PR_ImportPipe@Base 4.7.3-0ubuntu1~ + PR_ImportTCPSocket@Base 4.7.3-0ubuntu1~ + PR_ImportUDPSocket@Base 4.7.3-0ubuntu1~ + PR_IncrementCounter@Base 4.7.3-0ubuntu1~ + PR_Init@Base 4.7.3-0ubuntu1~ + PR_Initialize@Base 4.7.3-0ubuntu1~ + PR_InitializeNetAddr@Base 4.7.3-0ubuntu1~ + PR_Initialized@Base 4.7.3-0ubuntu1~ + PR_Interrupt@Base 4.7.3-0ubuntu1~ + PR_IntervalNow@Base 4.7.3-0ubuntu1~ + PR_IntervalToMicroseconds@Base 4.7.3-0ubuntu1~ + PR_IntervalToMilliseconds@Base 4.7.3-0ubuntu1~ + PR_IntervalToSeconds@Base 4.7.3-0ubuntu1~ + PR_IsNetAddrType@Base 4.7.3-0ubuntu1~ + PR_JoinJob@Base 4.7.3-0ubuntu1~ + PR_JoinThread@Base 4.7.3-0ubuntu1~ + PR_JoinThreadPool@Base 4.7.3-0ubuntu1~ + PR_KillProcess@Base 4.7.3-0ubuntu1~ + PR_Listen@Base 4.7.3-0ubuntu1~ + PR_LoadLibrary@Base 4.7.3-0ubuntu1~ + PR_LoadLibraryWithFlags@Base 4.7.3-0ubuntu1~ + PR_LoadStaticLibrary@Base 4.7.3-0ubuntu1~ + PR_LocalTimeParameters@Base 4.7.3-0ubuntu1~ + PR_Lock@Base 4.7.3-0ubuntu1~ + PR_LockFile@Base 4.7.3-0ubuntu1~ + PR_LockOrderedLock@Base 4.7.3-0ubuntu1~ + PR_LogFlush@Base 4.7.3-0ubuntu1~ + PR_LogPrint@Base 4.7.3-0ubuntu1~ + PR_MakeDir@Base 4.7.3-0ubuntu1~ + PR_Malloc@Base 4.7.3-0ubuntu1~ + PR_MemMap@Base 4.7.3-0ubuntu1~ + PR_MemUnmap@Base 4.7.3-0ubuntu1~ + PR_MicrosecondsToInterval@Base 4.7.3-0ubuntu1~ + PR_MillisecondsToInterval@Base 4.7.3-0ubuntu1~ + PR_MkDir@Base 4.7.3-0ubuntu1~ + PR_NetAddrToString@Base 4.7.3-0ubuntu1~ + PR_NewCondVar@Base 4.7.3-0ubuntu1~ + PR_NewLock@Base 4.7.3-0ubuntu1~ + PR_NewLogModule@Base 4.7.3-0ubuntu1~ + PR_NewMonitor@Base 4.7.3-0ubuntu1~ + PR_NewNamedMonitor@Base 4.7.3-0ubuntu1~ + PR_NewPollableEvent@Base 4.7.3-0ubuntu1~ + PR_NewProcessAttr@Base 4.7.3-0ubuntu1~ + PR_NewRWLock@Base 4.7.3-0ubuntu1~ + PR_NewSem@Base 4.7.3-0ubuntu1~ + PR_NewTCPSocket@Base 4.7.3-0ubuntu1~ + PR_NewTCPSocketPair@Base 4.7.3-0ubuntu1~ + PR_NewThreadPrivateIndex@Base 4.7.3-0ubuntu1~ + PR_NewUDPSocket@Base 4.7.3-0ubuntu1~ + PR_NormalizeTime@Base 4.7.3-0ubuntu1~ + PR_Notify@Base 4.7.3-0ubuntu1~ + PR_NotifyAll@Base 4.7.3-0ubuntu1~ + PR_NotifyAllCondVar@Base 4.7.3-0ubuntu1~ + PR_NotifyCondVar@Base 4.7.3-0ubuntu1~ + PR_Now@Base 4.7.3-0ubuntu1~ + PR_Open@Base 4.7.3-0ubuntu1~ + PR_OpenAnonFileMap@Base 4.7.3-0ubuntu1~ + PR_OpenDir@Base 4.7.3-0ubuntu1~ + PR_OpenFile@Base 4.7.3-0ubuntu1~ + PR_OpenSemaphore@Base 4.7.3-0ubuntu1~ + PR_OpenSharedMemory@Base 4.7.3-0ubuntu1~ + PR_OpenTCPSocket@Base 4.7.3-0ubuntu1~ + PR_OpenUDPSocket@Base 4.7.3-0ubuntu1~ + PR_ParseTimeString@Base 4.7.3-0ubuntu1~ + PR_ParseTimeStringToExplodedTime@Base 4.7.0~1.9b1 + PR_Poll@Base 4.7.3-0ubuntu1~ + PR_PopIOLayer@Base 4.7.3-0ubuntu1~ + PR_PostSem@Base 4.7.3-0ubuntu1~ + PR_PostSemaphore@Base 4.7.3-0ubuntu1~ + PR_ProcessAttrSetCurrentDirectory@Base 4.7.3-0ubuntu1~ + PR_ProcessAttrSetInheritableFD@Base 4.7.3-0ubuntu1~ + PR_ProcessAttrSetInheritableFileMap@Base 4.7.3-0ubuntu1~ + PR_ProcessAttrSetStdioRedirect@Base 4.7.3-0ubuntu1~ + PR_ProcessExit@Base 4.7.3-0ubuntu1~ + PR_PushIOLayer@Base 4.7.3-0ubuntu1~ + PR_QueueJob@Base 4.7.3-0ubuntu1~ + PR_QueueJob_Accept@Base 4.7.3-0ubuntu1~ + PR_QueueJob_Connect@Base 4.7.3-0ubuntu1~ + PR_QueueJob_Read@Base 4.7.3-0ubuntu1~ + PR_QueueJob_Timer@Base 4.7.3-0ubuntu1~ + PR_QueueJob_Write@Base 4.7.3-0ubuntu1~ + PR_RWLock_Rlock@Base 4.7.3-0ubuntu1~ + PR_RWLock_Unlock@Base 4.7.3-0ubuntu1~ + PR_RWLock_Wlock@Base 4.7.3-0ubuntu1~ + PR_Read@Base 4.7.3-0ubuntu1~ + PR_ReadDir@Base 4.7.3-0ubuntu1~ + PR_Realloc@Base 4.7.3-0ubuntu1~ + PR_RecordTraceEntries@Base 4.7.3-0ubuntu1~ + PR_Recv@Base 4.7.3-0ubuntu1~ + PR_RecvFrom@Base 4.7.3-0ubuntu1~ + PR_Rename@Base 4.7.3-0ubuntu1~ + PR_ResetAlarm@Base 4.7.3-0ubuntu1~ + PR_ResetProcessAttr@Base 4.7.3-0ubuntu1~ + PR_ResumeAll@Base 4.7.3-0ubuntu1~ + PR_RmDir@Base 4.7.3-0ubuntu1~ + PR_ScanStackPointers@Base 4.7.3-0ubuntu1~ + PR_SecondsToInterval@Base 4.7.3-0ubuntu1~ + PR_Seek64@Base 4.7.3-0ubuntu1~ + PR_Seek@Base 4.7.3-0ubuntu1~ + PR_Select@Base 4.7.3-0ubuntu1~ + PR_Send@Base 4.7.3-0ubuntu1~ + PR_SendFile@Base 4.7.3-0ubuntu1~ + PR_SendTo@Base 4.7.3-0ubuntu1~ + PR_SetAlarm@Base 4.7.3-0ubuntu1~ + PR_SetConcurrency@Base 4.7.3-0ubuntu1~ + PR_SetCounter@Base 4.7.3-0ubuntu1~ + PR_SetEnv@Base 4.7.3-0ubuntu1~ + PR_SetError@Base 4.7.3-0ubuntu1~ + PR_SetErrorText@Base 4.7.3-0ubuntu1~ + PR_SetFDCacheSize@Base 4.7.3-0ubuntu1~ + PR_SetFDInheritable@Base 4.7.3-0ubuntu1~ + PR_SetLibraryPath@Base 4.7.3-0ubuntu1~ + PR_SetLogBuffering@Base 4.7.3-0ubuntu1~ + PR_SetLogFile@Base 4.7.3-0ubuntu1~ + PR_SetNetAddr@Base 4.7.3-0ubuntu1~ + PR_SetPollableEvent@Base 4.7.3-0ubuntu1~ + PR_SetSocketOption@Base 4.7.3-0ubuntu1~ + PR_SetStdioRedirect@Base 4.7.3-0ubuntu1~ + PR_SetSysfdTableSize@Base 4.7.3-0ubuntu1~ + PR_SetThreadAffinityMask@Base 4.7.3-0ubuntu1~ + PR_SetThreadDumpProc@Base 4.7.3-0ubuntu1~ + PR_SetThreadGCAble@Base 4.7.3-0ubuntu1~ + PR_SetThreadPriority@Base 4.7.3-0ubuntu1~ + PR_SetThreadPrivate@Base 4.7.3-0ubuntu1~ + PR_SetThreadRecycleMode@Base 4.7.3-0ubuntu1~ + PR_SetTraceOption@Base 4.7.3-0ubuntu1~ + PR_Shutdown@Base 4.7.3-0ubuntu1~ + PR_ShutdownThreadPool@Base 4.7.3-0ubuntu1~ + PR_Sleep@Base 4.7.3-0ubuntu1~ + PR_Socket@Base 4.7.3-0ubuntu1~ + PR_StackPop@Base 4.7.3-0ubuntu1~ + PR_StackPush@Base 4.7.3-0ubuntu1~ + PR_Stat@Base 4.7.3-0ubuntu1~ + PR_StringToNetAddr@Base 4.7.3-0ubuntu1~ + PR_SubtractFromCounter@Base 4.7.3-0ubuntu1~ + PR_SuspendAll@Base 4.7.3-0ubuntu1~ + PR_Sync@Base 4.7.3-0ubuntu1~ + PR_TLockFile@Base 4.7.3-0ubuntu1~ + PR_ThreadScanStackPointers@Base 4.7.3-0ubuntu1~ + PR_TicksPerSecond@Base 4.7.3-0ubuntu1~ + PR_Trace@Base 4.7.3-0ubuntu1~ + PR_TransmitFile@Base 4.7.3-0ubuntu1~ + PR_USPacificTimeParameters@Base 4.7.3-0ubuntu1~ + PR_UnblockClockInterrupts@Base 4.7.3-0ubuntu1~ + PR_UnblockInterrupt@Base 4.7.3-0ubuntu1~ + PR_UnloadLibrary@Base 4.7.3-0ubuntu1~ + PR_Unlock@Base 4.7.3-0ubuntu1~ + PR_UnlockFile@Base 4.7.3-0ubuntu1~ + PR_UnlockOrderedLock@Base 4.7.3-0ubuntu1~ + PR_VersionCheck@Base 4.7.3-0ubuntu1~ + PR_Wait@Base 4.7.3-0ubuntu1~ + PR_WaitCondVar@Base 4.7.3-0ubuntu1~ + PR_WaitForPollableEvent@Base 4.7.3-0ubuntu1~ + PR_WaitProcess@Base 4.7.3-0ubuntu1~ + PR_WaitRecvReady@Base 4.7.3-0ubuntu1~ + PR_WaitSem@Base 4.7.3-0ubuntu1~ + PR_WaitSemaphore@Base 4.7.3-0ubuntu1~ + PR_Write@Base 4.7.3-0ubuntu1~ + PR_Writev@Base 4.7.3-0ubuntu1~ + PR_Yield@Base 4.7.3-0ubuntu1~ + PR_cnvtf@Base 4.7.3-0ubuntu1~ + PR_dtoa@Base 4.7.3-0ubuntu1~ + PR_fprintf@Base 4.7.3-0ubuntu1~ + PR_htonl@Base 4.7.3-0ubuntu1~ + PR_htonll@Base 4.7.3-0ubuntu1~ + PR_htons@Base 4.7.3-0ubuntu1~ + PR_ntohl@Base 4.7.3-0ubuntu1~ + PR_ntohll@Base 4.7.3-0ubuntu1~ + PR_ntohs@Base 4.7.3-0ubuntu1~ + PR_smprintf@Base 4.7.3-0ubuntu1~ + PR_smprintf_free@Base 4.7.3-0ubuntu1~ + PR_snprintf@Base 4.7.3-0ubuntu1~ + PR_sprintf_append@Base 4.7.3-0ubuntu1~ + PR_sscanf@Base 4.7.3-0ubuntu1~ + PR_strtod@Base 4.7.3-0ubuntu1~ + PR_sxprintf@Base 4.7.3-0ubuntu1~ + PR_vfprintf@Base 4.7.3-0ubuntu1~ + PR_vsmprintf@Base 4.7.3-0ubuntu1~ + PR_vsnprintf@Base 4.7.3-0ubuntu1~ + PR_vsprintf_append@Base 4.7.3-0ubuntu1~ + PR_vsxprintf@Base 4.7.3-0ubuntu1~ + PT_FPrintStats@Base 4.7.3-0ubuntu1~ + SetExecutionEnvironment@Base 4.7.3-0ubuntu1~ + _pr_push_ipv6toipv4_layer@Base 4.7.3-0ubuntu1~ + _pr_test_ipv6_socket@Base 4.7.3-0ubuntu1~ + libVersionPoint@Base 4.7.3-0ubuntu1~ +libplc4.so libnspr4-0d #MINVER# + PL_Base64Decode@Base 4.7.3-0ubuntu1~ + PL_Base64Encode@Base 4.7.3-0ubuntu1~ + PL_CreateLongOptState@Base 4.7.0~1.9b1 + PL_CreateOptState@Base 4.7.3-0ubuntu1~ + PL_DestroyOptState@Base 4.7.3-0ubuntu1~ + PL_FPrintError@Base 4.7.3-0ubuntu1~ + PL_GetNextOpt@Base 4.7.3-0ubuntu1~ + PL_PrintError@Base 4.7.3-0ubuntu1~ + PL_strcasecmp@Base 4.7.3-0ubuntu1~ + PL_strcaserstr@Base 4.7.3-0ubuntu1~ + PL_strcasestr@Base 4.7.3-0ubuntu1~ + PL_strcat@Base 4.7.3-0ubuntu1~ + PL_strcatn@Base 4.7.3-0ubuntu1~ + PL_strchr@Base 4.7.3-0ubuntu1~ + PL_strcmp@Base 4.7.3-0ubuntu1~ + PL_strcpy@Base 4.7.3-0ubuntu1~ + PL_strdup@Base 4.7.3-0ubuntu1~ + PL_strfree@Base 4.7.3-0ubuntu1~ + PL_strlen@Base 4.7.3-0ubuntu1~ + PL_strncasecmp@Base 4.7.3-0ubuntu1~ + PL_strncaserstr@Base 4.7.3-0ubuntu1~ + PL_strncasestr@Base 4.7.3-0ubuntu1~ + PL_strncat@Base 4.7.3-0ubuntu1~ + PL_strnchr@Base 4.7.3-0ubuntu1~ + PL_strncmp@Base 4.7.3-0ubuntu1~ + PL_strncpy@Base 4.7.3-0ubuntu1~ + PL_strncpyz@Base 4.7.3-0ubuntu1~ + PL_strndup@Base 4.7.3-0ubuntu1~ + PL_strnlen@Base 4.7.3-0ubuntu1~ + PL_strnpbrk@Base 4.7.3-0ubuntu1~ + PL_strnprbrk@Base 4.7.3-0ubuntu1~ + PL_strnrchr@Base 4.7.3-0ubuntu1~ + PL_strnrstr@Base 4.7.3-0ubuntu1~ + PL_strnstr@Base 4.7.3-0ubuntu1~ + PL_strpbrk@Base 4.7.3-0ubuntu1~ + PL_strprbrk@Base 4.7.3-0ubuntu1~ + PL_strrchr@Base 4.7.3-0ubuntu1~ + PL_strrstr@Base 4.7.3-0ubuntu1~ + PL_strstr@Base 4.7.3-0ubuntu1~ + PL_strtok_r@Base 4.7.3-0ubuntu1~ + libVersionPoint@Base 4.7.3-0ubuntu1~ +libplds4.so libnspr4-0d #MINVER# + PL_ArenaAllocate@Base 4.7.3-0ubuntu1~ + PL_ArenaFinish@Base 4.7.3-0ubuntu1~ + PL_ArenaGrow@Base 4.7.3-0ubuntu1~ + PL_ArenaRelease@Base 4.7.3-0ubuntu1~ + PL_CompactArenaPool@Base 4.7.3-0ubuntu1~ + PL_CompareStrings@Base 4.7.3-0ubuntu1~ + PL_CompareValues@Base 4.7.3-0ubuntu1~ + PL_FinishArenaPool@Base 4.7.3-0ubuntu1~ + PL_FreeArenaPool@Base 4.7.3-0ubuntu1~ + PL_HashString@Base 4.7.3-0ubuntu1~ + PL_HashTableAdd@Base 4.7.3-0ubuntu1~ + PL_HashTableDestroy@Base 4.7.3-0ubuntu1~ + PL_HashTableDump@Base 4.7.3-0ubuntu1~ + PL_HashTableEnumerateEntries@Base 4.7.3-0ubuntu1~ + PL_HashTableLookup@Base 4.7.3-0ubuntu1~ + PL_HashTableLookupConst@Base 4.7.3-0ubuntu1~ + PL_HashTableRawAdd@Base 4.7.3-0ubuntu1~ + PL_HashTableRawLookup@Base 4.7.3-0ubuntu1~ + PL_HashTableRawLookupConst@Base 4.7.3-0ubuntu1~ + PL_HashTableRawRemove@Base 4.7.3-0ubuntu1~ + PL_HashTableRemove@Base 4.7.3-0ubuntu1~ + PL_InitArenaPool@Base 4.7.3-0ubuntu1~ + PL_NewHashTable@Base 4.7.3-0ubuntu1~ + libVersionPoint@Base 4.7.3-0ubuntu1~ --- nspr-4.7.5.orig/debian/libnspr4-dev.links +++ nspr-4.7.5/debian/libnspr4-dev.links @@ -0,0 +1 @@ +usr/lib/pkgconfig/nspr.pc usr/lib/pkgconfig/xulrunner-nspr.pc --- nspr-4.7.5.orig/debian/libnspr4-0d.symbols.i386 +++ nspr-4.7.5/debian/libnspr4-0d.symbols.i386 @@ -0,0 +1,6 @@ +#include "libnspr4-0d.symbols" +libnspr4.so libnspr4-0d #MINVER# + _PR_x86_AtomicAdd@Base 4.7.3-0ubuntu1~ + _PR_x86_AtomicDecrement@Base 4.7.3-0ubuntu1~ + _PR_x86_AtomicIncrement@Base 4.7.3-0ubuntu1~ + _PR_x86_AtomicSet@Base 4.7.3-0ubuntu1~ --- nspr-4.7.5.orig/debian/libnspr4-0d.install +++ nspr-4.7.5/debian/libnspr4-0d.install @@ -0,0 +1 @@ +usr/lib/*.so --- nspr-4.7.5.orig/debian/libnspr4-0d.postinst +++ nspr-4.7.5/debian/libnspr4-0d.postinst @@ -0,0 +1,29 @@ +#!/bin/sh + +set -e + +migratious_files="libnspr4.so libplc4.so libplds4.so" + +if [ "$1" = "configure" ]; then + + for f in $migratious_files; do + # before new binaries get installed, we move the links + rm -f /usr/lib/XNOLDCONFIG_$f.new-migration + rm -f /usr/lib/XNOLDCONFIG_$f.0d.new-migration + done +fi + +if [ "$1" = "abort-upgrade" ]; then + for f in $migratious_files; do + if [ -e "/usr/lib/XNOLDCONFIG_$f.old-migration" ]; then + rm -f /usr/lib/$f + mv /usr/lib/XNOLDCONFIG_$f.old-migration /usr/lib/$f + fi + if [ -L "/usr/lib/XNOLDCONFIG_$f.0d.old-migration" ]; then + rm -f /usr/lib/$f.0d + mv /usr/lib/XNOLDCONFIG_$f.0d.old-migration /usr/lib/$f.0d + fi + done +fi + +#DEPHELPER# --- nspr-4.7.5.orig/debian/compat +++ nspr-4.7.5/debian/compat @@ -0,0 +1 @@ +5 --- nspr-4.7.5.orig/debian/libnspr4-0d.symbols.powerpc +++ nspr-4.7.5/debian/libnspr4-0d.symbols.powerpc @@ -0,0 +1,6 @@ +#include "libnspr4-0d.symbols" +libnspr4.so libnspr4-0d #MINVER# + _PR_ppc_AtomicAdd@Base 4.7.3-0ubuntu1~ + _PR_ppc_AtomicDecrement@Base 4.7.3-0ubuntu1~ + _PR_ppc_AtomicIncrement@Base 4.7.3-0ubuntu1~ + _PR_ppc_AtomicSet@Base 4.7.3-0ubuntu1~ --- nspr-4.7.5.orig/debian/libnspr4-0d.postrm +++ nspr-4.7.5/debian/libnspr4-0d.postrm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +migratious_files="libnspr4.so libplc4.so libplds4.so" + +if [ "$1" = "upgrade" ]; then + for f in $migratious_files; do + rm -f /usr/lib/XNOLDCONFIG_$f.old-migration + rm -f /usr/lib/XNOLDCONFIG_$f.0d.old-migration + done +fi + +#DEBHELPER# --- nspr-4.7.5.orig/debian/libnspr4-0d.symbols.hurd_i386 +++ nspr-4.7.5/debian/libnspr4-0d.symbols.hurd_i386 @@ -0,0 +1 @@ +#include "libnspr4-0d.symbols.i386" --- nspr-4.7.5.orig/debian/watch +++ nspr-4.7.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v(\d\.[\d\.]+)/src/nspr-([\d\.]+)\.tar\.gz --- nspr-4.7.5.orig/debian/copyright +++ nspr-4.7.5/debian/copyright @@ -0,0 +1,589 @@ +This package was debianized by Mike Hommey on +Sun, 25 Mar 2007 12:17:27 +0200. + +It was downloaded from http://ftp.mozilla.org/pub/mozilla.org/nspr/ + +Upstream Author: The Mozilla Project. + +The NSPR library is licensed under the terms of the Mozilla Public License +version 1.1 or, at your option, under the terms of the GNU General Public +License version 2 or subsequent, or the terms of the GNU Lesser General +Public License version 2.1 or subsequent. + +The original code is copyright (c) 1998-2000 Netscape Communications +Corporation. + +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL' ; +the complete text of the GNU Lesser General Public License can be +found in the file `/usr/share/common-licenses/LGPL'. + +The complete text of the Mozilla Public License can be found below. + + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + ---------------------------------------------------------------------- + + AMENDMENTS + + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + + EXHIBIT A-Netscape Public License. + + "The contents of this file are subject to the Netscape Public + License Version 1.1 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + the License at http://www.mozilla.org/NPL/ + + Software distributed under the License is distributed on an "AS + IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + implied. See the License for the specific language governing + rights and limitations under the License. + + The Original Code is Mozilla Communicator client code, released + March 31, 1998. + + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." --- nspr-4.7.5.orig/debian/libnspr4-0d.symbols.ia64 +++ nspr-4.7.5/debian/libnspr4-0d.symbols.ia64 @@ -0,0 +1,6 @@ +#include "libnspr4-0d.symbols" +libnspr4.so libnspr4-0d #MINVER# + _PR_ia64_AtomicAdd@Base 4.7.3-0ubuntu1~ + _PR_ia64_AtomicDecrement@Base 4.7.3-0ubuntu1~ + _PR_ia64_AtomicIncrement@Base 4.7.3-0ubuntu1~ + _PR_ia64_AtomicSet@Base 4.7.3-0ubuntu1~ --- nspr-4.7.5.orig/debian/libnspr4-dev.install +++ nspr-4.7.5/debian/libnspr4-dev.install @@ -0,0 +1,5 @@ +usr/bin/nspr-config +usr/include +usr/lib/*.a +usr/lib/pkgconfig +usr/share/aclocal --- nspr-4.7.5.orig/debian/rules +++ nspr-4.7.5/debian/rules @@ -0,0 +1,107 @@ +#!/usr/bin/make -f + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/quilt/quilt.make +-include /usr/share/mozilla-devscripts/nspr.mk + +CFLAGS := -Wall -pipe + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + OPTCFLAGS := -O0 +else + OPTCFLAGS := -O2 -fno-strict-aliasing +endif + +OPTCFLAGS += -g + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + DEBUGFLAGS := --enable-debug +else + DEBUGFLAGS := --disable-debug +endif + +libnspr4_0d_EXPORTED_LIBS = \ + libnspr4.so \ + libplc4.so \ + libplds4.so \ + $(NULL) + +configure: mozilla/nsprpub/config.status +mozilla/nsprpub/config.status: mozilla/nsprpub/configure + dh_testdir + CFLAGS="$(CFLAGS)" \ + LDFLAGS="-Wl,--as-needed" \ + cd mozilla/nsprpub && \ + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --enable-optimize="$(OPTCFLAGS)" \ + --prefix=/usr \ + --enable-ipv6 \ + --with-mozilla \ + $(DEBUGFLAGS) + +patches: + if [ ! -h patches ] ; then ln -s $(CURDIR)/debian/patches ; fi + +build: build-stamp +build-stamp: patches $(QUILT_STAMPFN) mozilla/nsprpub/config.status + dh_testdir + + $(MAKE) -C mozilla/nsprpub + + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + + -$(MAKE) -C mozilla/nsprpub distclean + rm -f patches + dh_clean build-stamp install-stamp + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) -C mozilla/nsprpub install DESTDIR=$(CURDIR)/debian/tmp + + touch install-stamp + +binary-indep: + +binary-arch: install-stamp + dh_testdir + dh_testroot + dh_installchangelogs -a + dh_installdocs -a + dh_install -a --sourcedir=debian/tmp + dh_link -a + dh_strip -a --dbg-package=libnspr4-0d-dbg + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a -V -- -c4 \ + $(foreach i,$(libnspr4_0d_EXPORTED_LIBS),-edebian/libnspr4-0d/usr/lib/$(i)) + install -d debian/libnspr4-0d/usr/share/lintian/overrides/ + echo 'libnspr4-0d binary: no-shlibs-control-file' > debian/libnspr4-0d/usr/share/lintian/overrides/libnspr4-0d + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch + +debian/patches/99_configure.patch: mozilla/nsprpub/configure.in + -$(MAKE) -f /usr/share/quilt/quilt.make patch + cd mozilla/nsprpub && autoconf + QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null refresh --diffstat -U8 --strip-trailing-whitespace + +.PHONY: configure clean build install clean-patched binary-indep binary-arch binary --- nspr-4.7.5.orig/debian/libnspr4-0d.symbols.lpia +++ nspr-4.7.5/debian/libnspr4-0d.symbols.lpia @@ -0,0 +1,6 @@ +#include "libnspr4-0d.symbols" +libnspr4.so libnspr4-0d #MINVER# + _PR_x86_AtomicAdd@Base 4.7.3-0ubuntu1~ + _PR_x86_AtomicDecrement@Base 4.7.3-0ubuntu1~ + _PR_x86_AtomicIncrement@Base 4.7.3-0ubuntu1~ + _PR_x86_AtomicSet@Base 4.7.3-0ubuntu1~ --- nspr-4.7.5.orig/debian/control +++ nspr-4.7.5/debian/control @@ -0,0 +1,59 @@ +Source: nspr +Section: libs +Priority: optional +Maintainer: Ubuntu Mozilla Team +XSBC-Original-Maintainer: Maintainers of Mozilla-related packages +Build-Depends: debhelper (>= 5.0.61), autotools-dev, quilt (>= 0.40), dpkg-dev (>= 1.14.9) +Homepage: http://www.mozilla.org/projects/nspr/ +Standards-Version: 3.7.3 + +Package: libnspr4-0d +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libnspr4-dev (<< 4.7.1+1.9-0ubuntu2), libnspr4 (<< 2:4) +Conflicts: libnspr4-dev (<< 4.7.1+1.9-0ubuntu2), libnspr4 (<< 2:4) +Description: NetScape Portable Runtime Library + This library provides platform independent non-GUI operating system + facilities including: + * threads, + * thread synchronisation, + * normal file I/O and network I/O, + * interval timing and calendar time, + * basic memory management (malloc and free), + * shared library linking. + +Package: libnspr4-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libnspr4-0d (>= ${source:Upstream-Version}), libnspr4-0d (<= ${source:Version}.1~) +Conflicts: libnspr4, libnspr-dev, nvu-dev +Description: Development files for the NetScape Portable Runtime library + This library provides platform independent non-GUI operating system + facilities including: + * threads, + * thread synchronisation, + * normal file I/O and network I/O, + * interval timing and calendar time, + * basic memory management (malloc and free), + * shared library linking. + . + Install this package if you wish to develop your own programs using the + NetScape Portable Runtime library. + +Package: libnspr4-0d-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libnspr4-0d (= ${binary:Version}) +Description: Development files for the NetScape Portable Runtime library + This library provides platform independent non-GUI operating system + facilities including: + * threads, + * thread synchronisation, + * normal file I/O and network I/O, + * interval timing and calendar time, + * basic memory management (malloc and free), + * shared library linking. + . + This package provides the debugging symbols for the library. --- nspr-4.7.5.orig/debian/changelog +++ nspr-4.7.5/debian/changelog @@ -0,0 +1,221 @@ +nspr (4.7.5-0ubuntu0.9.04.1) jaunty-security; urgency=low + + * New upstream version: 4.7.5 (LP: #387745) + - see USN-810-2 + + * adjust patches to changed upstream code base + - update debian/patches/99_configure.patch + + -- Alexander Sack Wed, 29 Jul 2009 18:07:21 +0200 + +nspr (4.7.3-0ubuntu2) jaunty; urgency=low + + * LP: #316452 - ldconfig breaks/removes legacy links for + previously versioned library names during upgrade; the fix + prevents ldconfig from treating the transitional/backup files + as "libs" by using a prefix ("XNOLDCONFIG_") + - debian/libnspr4-0d.postinst + - debian/libnspr4-0d.postrm + - debian/libnspr4-0d.preinst + - debian/libnspr4-0d.prerm + + -- Alexander Sack Wed, 14 Jan 2009 13:27:43 +0100 + +nspr (4.7.3-0ubuntu1) jaunty; urgency=low + + * New upstream version: 4.7.3 from NSPR_4_7_3_RTM tag + + [ Fabien Tassin ] + * LP: #269188 - use /dev/urandom for better entropy on LTSP environments + * update diverged patches: + - update debian/patches/30_pkgconfig.patch + - update debian/patches/81_sonames.patch + - update debian/patches/99_configure.patch + + [ Alexander Sack ] + Drop debian soname patch for full upstream compatibility + * eliminate soname patch + - delete debian/patches/81_sonames.patch + - update debian/patches/series + * refresh configure patch to reflect dropped soname patch + - update debian/patches/99_configure.patch + * install unversioned .so files + - update debian/libnspr4-0d.install + * .so.0d links are not created without the soname patch. we create + backlinks to the unversioned .so libs using debhelper; also we + cannot dh_install the .0d versioned libs anymore and we drop + them from .install accordingly + - add debian/libnspr4-0d.links + - update debian/libnspr4-0d.install + * implement link shuffeling transition (with abort cases) in + maintainer scripts; affected libs: libnspr4.so libplc4.so libplds4.so + - add debian/libnspr4-0d.postinst + - add debian/libnspr4-0d.postrm + - add debian/libnspr4-0d.preinst + - add debian/libnspr4-0d.prerm + * drop soname version suffix from symbol files and reflect this fact by + adjusting minimum version to this package version (4.7.3-0ubuntu1~) + - update debian/libnspr4-0d.symbols + - update debian/libnspr4-0d.symbols.amd64 + - update debian/libnspr4-0d.symbols.i386 + - update debian/libnspr4-0d.symbols.ia64 + - update debian/libnspr4-0d.symbols.lpia + - update debian/libnspr4-0d.symbols.powerpc + * bump lower shlibs version constraint to 4.7.1+1.9-0ubuntu5~ + - update debian/rules + * rerun autoconf2.13 to apply dropped 81_sonames.patch to configure + - update debian/patches/99_configure.patch + * explitly define libnspr4_0d_EXPORTED_LIBS and pass those manually + to dpkg-gensymbols to workaround uncommon SONAME used by nspr libs + - update debian/rules + * don't pretend to create shlibs-control file anymore; add binary + lintian override for that + - update debian/rules + * add #DEBHELPER# token to maintainer scripts + - update debian/libnspr4-0d.postinst + - update debian/libnspr4-0d.postrm + - update debian/libnspr4-0d.preinst + - update debian/libnspr4-0d.prerm + + -- Alexander Sack Sun, 11 Jan 2009 13:50:07 +0100 + +nspr (4.7.1+1.9-0ubuntu4) intrepid; urgency=low + + * LP: #245122 - fix upgrade issue introduced by "unbreak binary + compatibility" upload by adding Conflicts/Replaces on libnspr4 + - update debian/control + + -- Alexander Sack Tue, 15 Jul 2008 15:25:53 +0200 + +nspr (4.7.1+1.9-0ubuntu3) intrepid; urgency=low + + * LP: #245122 - fix upgrade issue introduced by "unbreak binary + compatibility" upload by adding Conflicts/Replaces on libnspr4 (<< 4) + - update debian/control + + -- Alexander Sack Wed, 09 Jul 2008 21:41:01 +0200 + +nspr (4.7.1+1.9-0ubuntu2) intrepid; urgency=low + + * unbreak binary compatibility for extensions built against upstream + xulrunner by moving /usr/lib/.so links from libnspr4-dev package + to libnspr4-0d; in turn we introduce versioned to Conflicts/Replaces + to provide a smooth upgrade. (LP: #244439) + - update debian/libnspr4-0d.install + - update debian/libnspr4-dev.install + - update debian/control + + -- Alexander Sack Tue, 01 Jul 2008 11:46:23 +0200 + +nspr (4.7.1+1.9-0ubuntu1) intrepid; urgency=low + + * New upstream release, picked from FIREFOX_3_0rc1_RELEASE cvs tag + (LP: #233922) + * update diverged patches + - update debian/patches/30_pkgconfig.patch + - update debian/patches/81_sonames.patch + - update debian/patches/99_configure.patch + + -- Fabien Tassin Wed, 21 May 2008 14:50:02 +0200 + +nspr (4.7.1~beta2-0ubuntu1) hardy; urgency=low + + * New upstream release, picked from NSPR_4_7_1_BETA2 cvs tag + * bump shlibs requirements + - update debian/rules + + -- Fabien Tassin Fri, 04 Apr 2008 16:14:45 +0200 + +nspr (4.7.0~1.9b4-0ubuntu1) hardy; urgency=low + + * New upstream release, picked from FIREFOX_3_0b4_RELEASE cvs tag + * update configure patch + - update debian/patches/99_configure.patch + * bump shlibs requirements + - update debian/rules + + -- Alexander Sack Tue, 11 Mar 2008 01:47:11 +0100 + +nspr (4.7.0~1.9b3-0ubuntu2) hardy; urgency=low + + * Add powerpc specific symbols file + - add debian/libnspr4-0d.symbols.powerpc + * Refresh diverged patch: + - update debian/patches/99_configure.patch + + -- Fabien Tassin Sun, 16 Mar 2008 17:36:03 +0100 + +nspr (4.7.0~1.9b3-0ubuntu1) hardy; urgency=low + + * New upstream snapshot, picked from FIREFOX_3_0b3_RELEASE cvs tag + * Add Homepage field and bump Standards-Version to 3.7.3 + - update debian/control + * Add support for mozilla-devscripts + - update debian/rules + * Update quilt rules and add a 'patches' link to make maintenance easier + - update debian/rules + * Pass -c4 to dpkg-gensymbols + - update debian/rules + * Add lpia specific symbols file + - add debian/libnspr4-0d.symbols.lpia + + -- Fabien Tassin Fri, 08 Feb 2008 20:13:42 +0100 + +nspr (4.7.0~1.9b2+nobinonly-0ubuntu1) hardy; urgency=low + + * New upstream snapshot, picked from FIREFOX_3_0b2_RELEASE cvs tag. + * ubuntunize maintainer field + - update debian/control + + -- Alexander Sack Sat, 24 Nov 2007 19:12:48 +0100 + +nspr (4.7.0~1.9b1-1) unstable; urgency=low + + * New upstream snapshot, picked from FIREFOX_3_0b1_RELEASE cvs tag. + * debian/patches/81_sonames.dpatch: Updated to fit upstream changes. + * debian/patches/18_kbsd_nspr.dpatch, + debian/patches/30_nspr_m4.dpatch: Removed, as applied upstream. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + * debian/rules, debian/patches/30_pkgconfig.dpatch: The real_install rule + has been replaced by install, upstream, so we now use it. + * debian/libnspr4-0d.symbols, debian/libnspr4-0d.symbols.amd64, + debian/libnspr4-0d.symbols.hurd_i386, debian/libnspr4-0d.symbols.i386, + debian/libnspr4-0d.symbols.ia64: Add symbols files to benefit from the + new features in dpkg-shlibdeps. Workaround debhelper lack of handling of + symbols files include with "../../" in the included file name. + * debian/control: Build depend on debhelper (>= 5.0.61) and dpkg-dev (>= + 1.14.9), accordingly. + * debian/rules: Bump shlibs to current version, since new symbols were + added. + + -- Mike Hommey Sat, 24 Nov 2007 19:12:48 +0100 + +nspr (4.6.7-1) unstable; urgency=low + + * New upstream release, picked from NSPR_4_6_7_RTM cvs tag. + * debian/patches/18_kbsd_nspr.dpatch: Also add support for the Hurd. + Closes: #419528. + + -- Mike Hommey Sun, 01 Jul 2007 09:49:23 +0200 + +nspr (4.6.6-3) unstable; urgency=low + + * debian/rules: replace libnss3-0d (!) with libnspr4-0d in shlib + creation. Closes: #420069. Thanks Alexander Sack. + + -- Mike Hommey Fri, 20 Apr 2007 07:05:04 +0200 + +nspr (4.6.6-2) unstable; urgency=low + + * debian/control: Fixed section. + * debian/copyright: Fixed typo. + * debian/rules: Removed unused variables and replaced some = with :=. + + -- Mike Hommey Mon, 09 Apr 2007 20:29:27 +0200 + +nspr (4.6.6-1) experimental; urgency=low + + * Initial release. (Closes: #416150) + + -- Mike Hommey Sun, 25 Mar 2007 16:32:41 +0200 --- nspr-4.7.5.orig/debian/libnspr4-0d.symbols.amd64 +++ nspr-4.7.5/debian/libnspr4-0d.symbols.amd64 @@ -0,0 +1,6 @@ +#include "libnspr4-0d.symbols" +libnspr4.so libnspr4-0d #MINVER# + _PR_x86_64_AtomicAdd@Base 4.7.3-0ubuntu1~ + _PR_x86_64_AtomicDecrement@Base 4.7.3-0ubuntu1~ + _PR_x86_64_AtomicIncrement@Base 4.7.3-0ubuntu1~ + _PR_x86_64_AtomicSet@Base 4.7.3-0ubuntu1~ --- nspr-4.7.5.orig/debian/patches/30_config_64bits.patch +++ nspr-4.7.5/debian/patches/30_config_64bits.patch @@ -0,0 +1,66 @@ +--- + mozilla/nsprpub/configure.in | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +Index: nspr-trunk-4.7.0~cvs20070713/mozilla/nsprpub/configure.in +=================================================================== +--- nspr-trunk-4.7.0~cvs20070713.orig/mozilla/nsprpub/configure.in 2007-08-14 23:00:47.000000000 +0000 ++++ nspr-trunk-4.7.0~cvs20070713/mozilla/nsprpub/configure.in 2007-08-14 23:02:55.000000000 +0000 +@@ -52,17 +52,17 @@ + MOD_MINOR_VERSION=7 + MOD_PATCH_VERSION=0 + NSPR_MODNAME=nspr20 + _HAVE_PTHREADS= + USE_PTHREADS= + USE_USER_PTHREADS= + USE_NSPR_THREADS= + USE_N32= +-USE_64= ++USE_64=maybe + USE_CPLUS= + USE_IPV6= + USE_MDUPDATE= + _MACOSX_DEPLOYMENT_TARGET= + _OPTIMIZE_FLAGS=-O + _DEBUG_FLAGS=-g + MOZ_DEBUG=1 + MOZ_OPTIMIZE= +@@ -218,21 +218,36 @@ + [ if test "$enableval" = "yes"; then + USE_N32=1 + else if test "$enableval" = "no"; then + USE_N32= + fi + fi ]) + + AC_ARG_ENABLE(64bit, +- [ --enable-64bit Enable 64-bit support (on certain platforms)], +- [ if test "$enableval" = "yes"; then ++ [ --disable-64bit Disable 64-bit support (on 64-bit platforms)], ++ [ if test "$enableval" = "no"; then ++ USE_64= ++ else + USE_64=1 + fi ]) + ++if test "${USE_64}"; then ++ AC_MSG_CHECKING(for 64-bit OS) ++ AC_TRY_COMPILE([],[int assert[(sizeof(long) == 8) ? 1: -1]], ++ result="yes", result="no") ++ AC_MSG_RESULT("$result") ++ if test "$result" = "no" && test "$USE_64" = 1; then ++ AC_MSG_ERROR([Can't --enable-64bit on non 64-bit platforms]) ++ fi ++ if test "$result" = "yes"; then ++ USE_64=1 ++ fi ++fi ++ + AC_ARG_ENABLE(mdupdate, + [ --enable-mdupdate Enable use of certain compilers' mdupdate feature], + [ if test "$enableval" = "yes"; then + USE_MDUPDATE=1 + fi ]) + + dnl ======================================================== + dnl = Mac OS X SDK support --- nspr-4.7.5.orig/debian/patches/99_configure.patch +++ nspr-4.7.5/debian/patches/99_configure.patch @@ -0,0 +1,1570 @@ +--- + mozilla/nsprpub/configure | 235 ++++++++++++++++++++++++++-------------------- + 1 file changed, 134 insertions(+), 101 deletions(-) + +Index: nspr-4.7.5/mozilla/nsprpub/configure +=================================================================== +--- nspr-4.7.5.orig/mozilla/nsprpub/configure ++++ nspr-4.7.5/mozilla/nsprpub/configure +@@ -31,17 +31,17 @@ ac_help="$ac_help + ac_help="$ac_help + --enable-win32-target=\$t + Specify win32 flavor. (WIN95 or WINNT)" + ac_help="$ac_help + --enable-debug-rtl Use the MSVC debug runtime library" + ac_help="$ac_help + --enable-n32 Enable n32 ABI support (IRIX only)" + ac_help="$ac_help +- --enable-64bit Enable 64-bit support (on certain platforms)" ++ --disable-64bit Disable 64-bit support (on 64-bit platforms)" + ac_help="$ac_help + --enable-mdupdate Enable use of certain compilers' mdupdate feature" + ac_help="$ac_help + --enable-cplus Enable some c++ api routines" + ac_help="$ac_help + --with-arm-kuser Use kuser helpers (Linux/ARM only) + (Requires kernel 2.6.13 or later)" + ac_help="$ac_help +@@ -691,17 +691,17 @@ MOD_MAJOR_VERSION=4 + MOD_MINOR_VERSION=7 + MOD_PATCH_VERSION=5 + NSPR_MODNAME=nspr20 + _HAVE_PTHREADS= + USE_PTHREADS= + USE_USER_PTHREADS= + USE_NSPR_THREADS= + USE_N32= +-USE_64= ++USE_64=maybe + USE_CPLUS= + USE_IPV6= + USE_MDUPDATE= + _MACOSX_DEPLOYMENT_TARGET= + _OPTIMIZE_FLAGS=-O + _DEBUG_FLAGS=-g + MOZ_DEBUG=1 + MOZ_OPTIMIZE= +@@ -912,22 +912,54 @@ if test "${enable_n32+set}" = set; then + fi + fi + fi + + + # Check whether --enable-64bit or --disable-64bit was given. + if test "${enable_64bit+set}" = set; then + enableval="$enable_64bit" +- if test "$enableval" = "yes"; then ++ if test "$enableval" = "no"; then ++ USE_64= ++ else + USE_64=1 + fi + fi + + ++if test "${USE_64}"; then ++ echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 ++echo "configure:931: checking for 64-bit OS" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ result="yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ result="no" ++fi ++rm -f conftest* ++ echo "$ac_t"""$result"" 1>&6 ++ if test "$result" = "no" && test "$USE_64" = 1; then ++ { echo "configure: error: Can't --enable-64bit on non 64-bit platforms" 1>&2; exit 1; } ++ fi ++ if test "$result" = "yes"; then ++ USE_64=1 ++ fi ++fi ++ + # Check whether --enable-mdupdate or --disable-mdupdate was given. + if test "${enable_mdupdate+set}" = set; then + enableval="$enable_mdupdate" + if test "$enableval" = "yes"; then + USE_MDUPDATE=1 + fi + fi + +@@ -1059,17 +1091,17 @@ if test -z "$CXX"; then + + esac + fi + + if test -z "$SKIP_PATH_CHECKS"; then + # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. + set dummy $WHOAMI whoami; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1068: checking for $ac_word" >&5 ++echo "configure:1100: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$WHOAMI" in + /*) + ac_cv_path_WHOAMI="$WHOAMI" # Let the user override the test with a path. + ;; + ?:/*) +@@ -1130,23 +1162,23 @@ if test "$target" != "$host"; then + echo "cross compiling from $host to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + + echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 +-echo "configure:1139: checking for $host compiler" >&5 ++echo "configure:1171: checking for $host compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1145: checking for $ac_word" >&5 ++echo "configure:1177: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$HOST_CC"; then + ac_cv_prog_HOST_CC="$HOST_CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1182,26 +1214,26 @@ test -n "$HOST_CC" || HOST_CC="""" + HOST_LDFLAGS="$LDFLAGS" + fi + + CC="$HOST_CC" + CFLAGS="$HOST_CFLAGS" + LDFLAGS="$HOST_LDFLAGS" + + echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1191: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1223: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: installation or configuration problem: $host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } + fi +@@ -1220,17 +1252,17 @@ rm -f conftest* + ;; + esac + + for ac_prog in $CC "${target_alias}-gcc" "${target}-gcc" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1229: checking for $ac_word" >&5 ++echo "configure:1261: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1254,17 +1286,17 @@ fi + test -n "$CC" && break + done + test -n "$CC" || CC="echo" + + unset ac_cv_prog_CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1263: checking for $ac_word" >&5 ++echo "configure:1295: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1284,17 +1316,17 @@ if test -n "$CC"; then + else + echo "$ac_t""no" 1>&6 + fi + + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1293: checking for $ac_word" >&5 ++echo "configure:1325: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +@@ -1335,17 +1367,17 @@ else + fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1344: checking for $ac_word" >&5 ++echo "configure:1376: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1367,33 +1399,33 @@ else + fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1376: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1408: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext << EOF + +-#line 1387 "configure" ++#line 1419 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:1392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi + else +@@ -1409,31 +1441,31 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAG + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 + if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1418: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1450: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1423: checking whether we are using GNU C" >&5 ++echo "configure:1455: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no + fi + fi + + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +@@ -1442,17 +1474,17 @@ if test $ac_cv_prog_gcc = yes; then + else + GCC= + fi + + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1451: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1483: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo 'void f(){}' > conftest.c + if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes + else + ac_cv_prog_cc_g=no +@@ -1479,17 +1511,17 @@ else + fi + + if test -n "$USE_CPLUS"; then + for ac_prog in $CXX "${target_alias}-g++" "${target}-g++" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1488: checking for $ac_word" >&5 ++echo "configure:1520: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1515,17 +1547,17 @@ done + test -n "$CXX" || CXX="echo" + + unset ac_cv_prog_CXX + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1524: checking for $ac_word" >&5 ++echo "configure:1556: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1547,33 +1579,33 @@ else + fi + + test -n "$CXX" && break + done + test -n "$CXX" || CXX="gcc" + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1556: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1588: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext << EOF + +-#line 1567 "configure" ++#line 1599 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi + else +@@ -1589,31 +1621,31 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAG + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 + if test $ac_cv_prog_cxx_works = no; then + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1598: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1630: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:1603: checking whether we are using GNU C++" >&5 ++echo "configure:1635: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no + fi + fi + + echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +@@ -1622,17 +1654,17 @@ if test $ac_cv_prog_gxx = yes; then + else + GXX= + fi + + ac_test_CXXFLAGS="${CXXFLAGS+set}" + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1631: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1663: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo 'void f(){}' > conftest.cc + if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes + else + ac_cv_prog_cxx_g=no +@@ -1667,17 +1699,17 @@ fi + ;; + esac + + for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1676: checking for $ac_word" >&5 ++echo "configure:1708: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1702,17 +1734,17 @@ test -n "$RANLIB" && break + done + test -n "$RANLIB" || RANLIB="echo" + + for ac_prog in $AR "${target_alias}-ar" "${target}-ar" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1711: checking for $ac_word" >&5 ++echo "configure:1743: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1737,17 +1769,17 @@ test -n "$AR" && break + done + test -n "$AR" || AR="echo" + + for ac_prog in $AS "${target_alias}-as" "${target}-as" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1746: checking for $ac_word" >&5 ++echo "configure:1778: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1772,17 +1804,17 @@ test -n "$AS" && break + done + test -n "$AS" || AS="echo" + + for ac_prog in $LD "${target_alias}-ld" "${target}-ld" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1781: checking for $ac_word" >&5 ++echo "configure:1813: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1807,17 +1839,17 @@ test -n "$LD" && break + done + test -n "$LD" || LD="echo" + + for ac_prog in $STRIP "${target_alias}-strip" "${target}-strip" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1816: checking for $ac_word" >&5 ++echo "configure:1848: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1842,17 +1874,17 @@ test -n "$STRIP" && break + done + test -n "$STRIP" || STRIP="echo" + + for ac_prog in $WINDRES "${target_alias}-windres" "${target}-windres" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1851: checking for $ac_word" >&5 ++echo "configure:1883: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1877,17 +1909,17 @@ test -n "$WINDRES" && break + done + test -n "$WINDRES" || WINDRES="echo" + + + else + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1886: checking for $ac_word" >&5 ++echo "configure:1918: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1907,17 +1939,17 @@ if test -n "$CC"; then + else + echo "$ac_t""no" 1>&6 + fi + + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1916: checking for $ac_word" >&5 ++echo "configure:1948: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +@@ -1958,17 +1990,17 @@ else + fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1967: checking for $ac_word" >&5 ++echo "configure:1999: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -1990,33 +2022,33 @@ else + fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1999: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2031: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext << EOF + +-#line 2010 "configure" ++#line 2042 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi + else +@@ -2032,31 +2064,31 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAG + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 + if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2041: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2073: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:2046: checking whether we are using GNU C" >&5 ++echo "configure:2078: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no + fi + fi + + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +@@ -2065,17 +2097,17 @@ if test $ac_cv_prog_gcc = yes; then + else + GCC= + fi + + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2074: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2106: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo 'void f(){}' > conftest.c + if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes + else + ac_cv_prog_cc_g=no +@@ -2105,17 +2137,17 @@ fi + if test "$CC" = "cl" -a -z "$CXX"; then + CXX=$CC + else + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2114: checking for $ac_word" >&5 ++echo "configure:2146: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2137,33 +2169,33 @@ else + fi + + test -n "$CXX" && break + done + test -n "$CXX" || CXX="gcc" + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2146: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2178: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext << EOF + +-#line 2157 "configure" ++#line 2189 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi + else +@@ -2179,31 +2211,31 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAG + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 + if test $ac_cv_prog_cxx_works = no; then + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2188: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2220: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:2193: checking whether we are using GNU C++" >&5 ++echo "configure:2225: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no + fi + fi + + echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +@@ -2212,17 +2244,17 @@ if test $ac_cv_prog_gxx = yes; then + else + GXX= + fi + + ac_test_CXXFLAGS="${CXXFLAGS+set}" + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:2221: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2253: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo 'void f(){}' > conftest.cc + if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes + else + ac_cv_prog_cxx_g=no +@@ -2246,72 +2278,72 @@ else + else + CXXFLAGS= + fi + fi + + fi + fi + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:2255: checking how to run the C preprocessor" >&5 ++echo "configure:2287: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +@@ -2328,17 +2360,17 @@ fi + else + ac_cv_prog_CPP="$CPP" + fi + echo "$ac_t""$CPP" 1>&6 + + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2337: checking for $ac_word" >&5 ++echo "configure:2369: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" +@@ -2360,17 +2392,17 @@ else + echo "$ac_t""no" 1>&6 + fi + + for ac_prog in as + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2369: checking for $ac_word" >&5 ++echo "configure:2401: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$AS" in + /*) + ac_cv_path_AS="$AS" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2401,17 +2433,17 @@ test -n "$AS" && break + done + test -n "$AS" || AS="$CC" + + for ac_prog in ar + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2410: checking for $ac_word" >&5 ++echo "configure:2442: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$AR" in + /*) + ac_cv_path_AR="$AR" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2442,17 +2474,17 @@ test -n "$AR" && break + done + test -n "$AR" || AR="echo not_ar" + + for ac_prog in ld link + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2451: checking for $ac_word" >&5 ++echo "configure:2483: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$LD" in + /*) + ac_cv_path_LD="$LD" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2483,17 +2515,17 @@ test -n "$LD" && break + done + test -n "$LD" || LD="echo not_ld" + + for ac_prog in strip + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2492: checking for $ac_word" >&5 ++echo "configure:2524: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$STRIP" in + /*) + ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2524,17 +2556,17 @@ test -n "$STRIP" && break + done + test -n "$STRIP" || STRIP="echo not_strip" + + for ac_prog in windres + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2533: checking for $ac_word" >&5 ++echo "configure:2565: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$WINDRES" in + /*) + ac_cv_path_WINDRES="$WINDRES" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2592,39 +2624,39 @@ esac + + if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 + else + CROSS_COMPILE= + fi + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +-echo "configure:2601: checking for gcc -pipe support" >&5 ++echo "configure:2633: checking for gcc -pipe support" >&5 + if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then + echo '#include ' > dummy-hello.c + echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c + ${CC} -S dummy-hello.c -o dummy-hello.s 2>&5 + cat dummy-hello.s | ${AS} -o dummy-hello.S - 2>&5 + if test $? = 0; then + _res_as_stdin="yes" + else + _res_as_stdin="no" + fi + if test "$_res_as_stdin" = "yes"; then + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:2623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + _res_gcc_pipe="no" + fi +@@ -2641,17 +2673,17 @@ rm -f conftest* + rm -f dummy-hello.c dummy-hello.s dummy-hello.S dummy-hello a.out + echo "$ac_t""$_res" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:2650: checking for visibility(hidden) attribute" >&5 ++echo "configure:2682: checking for visibility(hidden) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.c </dev/null 2>&1; then +@@ -2665,17 +2697,17 @@ fi + + echo "$ac_t""$ac_cv_visibility_hidden" 1>&6 + if test "$ac_cv_visibility_hidden" = "yes"; then + cat >> confdefs.h <<\EOF + #define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1 + EOF + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:2674: checking for visibility pragma support" >&5 ++echo "configure:2706: checking for visibility pragma support" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.c <&6 +-echo "configure:2727: checking for $ac_word" >&5 ++echo "configure:2759: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$PERL" in + /*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + ?:/*) +@@ -2975,27 +3007,27 @@ EOF + + cat >> confdefs.h <<\EOF + #define SYSV 1 + EOF + + DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' + ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 +-echo "configure:2984: checking for sys/atomic_op.h" >&5 ++echo "configure:3016: checking for sys/atomic_op.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -3142,36 +3174,36 @@ EOF + PR_MD_ARCH_DIR=beos + RESOLVE_LINK_SYMBOLS=1 + case "${target_cpu}" in + i*86) + _OPTIMIZE_FLAGS=-O2 + _DEBUG_FLAGS='-gdwarf-2 -O0' + MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' + echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 +-echo "configure:3151: checking for gethostbyaddr in -lbind" >&5 ++echo "configure:3183: checking for gethostbyaddr in -lbind" >&5 + ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" + LIBS="-lbind $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -4498,27 +4530,27 @@ EOF + if test -z "$GNU_CC"; then + CC="$CC -std1 -ieee_with_inexact" + if test "$OS_RELEASE" != "V2.0"; then + CC="$CC -readonly_strings" + fi + _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" + ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 +-echo "configure:4507: checking for machine/builtins.h" >&5 ++echo "configure:4539: checking for machine/builtins.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -5038,63 +5070,63 @@ if test -z "$SKIP_LIBRARY_CHECKS"; then + + + + case $target in + *-darwin*|*-beos*) + ;; + *) + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:5047: checking for dlopen in -ldl" >&5 ++echo "configure:5079: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi + rm -f conftest* + LIBS="$ac_save_LIBS" + + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:5083: checking for dlfcn.h" >&5 ++echo "configure:5115: checking for dlfcn.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -5117,23 +5149,23 @@ fi + ;; + esac + + + + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:5126: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:5158: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext < + Autoconf TIOCGETP + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes +@@ -5141,17 +5173,17 @@ else + rm -rf conftest* + ac_cv_prog_gcc_traditional=no + fi + rm -f conftest* + + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA + EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes +@@ -5165,22 +5197,22 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi + fi + + for ac_func in lchown strerror + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:5174: checking for $ac_func" >&5 ++echo "configure:5206: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func(); +@@ -5193,17 +5225,17 @@ int main() { + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + $ac_func(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi +@@ -5234,17 +5266,17 @@ if test "${enable_strip+set}" = set; the + fi + + + case "${target_os}" in + hpux*) + if test -z "$GNU_CC"; then + + echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 +-echo "configure:5243: checking for +Olit support" >&5 ++echo "configure:5275: checking for +Olit support" >&5 + if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_hpux_usable_olit_option=no + rm -f conftest* + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} ${CFLAGS} +Olit=all -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -5273,17 +5305,17 @@ esac + + case "$target_os" in + darwin*) + _HAVE_PTHREADS=1 + ;; + *) + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:5282: checking for pthread_create in -lpthreads" >&5 ++echo "configure:5314: checking for pthread_create in -lpthreads" >&5 + echo " + #include + void *foo(void *v) { return v; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -5295,17 +5327,17 @@ echo " + rm -f dummy.c dummy${ac_exeext} ; + if test "$_res" = "0"; then + echo "$ac_t""yes" 1>&6 + _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads" + else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:5304: checking for pthread_create in -lpthread" >&5 ++echo "configure:5336: checking for pthread_create in -lpthread" >&5 + echo " + #include + void *foo(void *v) { return v; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -5317,17 +5349,17 @@ echo " + rm -f dummy.c dummy${ac_exeext} ; + if test "$_res" = "0"; then + echo "$ac_t""yes" 1>&6 + _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread" + else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:5326: checking for pthread_create in -lc_r" >&5 ++echo "configure:5358: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { return v; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -5339,17 +5371,17 @@ echo " + rm -f dummy.c dummy${ac_exeext} ; + if test "$_res" = "0"; then + echo "$ac_t""yes" 1>&6 + _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r" + else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:5348: checking for pthread_create in -lc" >&5 ++echo "configure:5380: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { return v; } + int main() { + pthread_t t; + if (!pthread_create(&t, 0, &foo, 0)) { + pthread_join(t, 0); + } +@@ -5471,17 +5503,17 @@ EOF + fi + fi + + + if test -n "$USE_PTHREADS"; then + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:5480: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:5512: checking whether ${CC-cc} accepts -pthread" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then + if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then + ac_cv_have_dash_pthread=yes + case "$target_os" in + freebsd*) + # Freebsd doesn't use -pthread for compiles, it uses them for linking +@@ -5494,17 +5526,17 @@ echo "configure:5480: checking whether $ + fi + fi + rm -f conftest* + echo "$ac_t""$ac_cv_have_dash_pthread" 1>&6 + + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:5503: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:5535: checking whether ${CC-cc} accepts -pthreads" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then + if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then + ac_cv_have_dash_pthreads=yes + CFLAGS="$CFLAGS -pthreads" + CXXFLAGS="$CXXFLAGS -pthreads" + fi +@@ -5910,16 +5942,17 @@ esac + + MAKEFILES=" + Makefile + config/Makefile + config/autoconf.mk + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile + lib/libc/include/Makefile + lib/libc/src/Makefile + lib/tests/Makefile + pkg/Makefile + pkg/linux/Makefile +@@ -6027,17 +6060,17 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex + # Protect against Makefile macro expansion. + cat > conftest.defs <<\EOF + s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g + s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g + s%\[%\\&%g + s%\]%\\&%g + s%\$%$$%g + EOF +-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` ++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` + rm -f conftest.defs + + + # Without the "./", some shells look in PATH for config.status. + : ${CONFIG_STATUS=./config.status} + + echo creating $CONFIG_STATUS + rm -f $CONFIG_STATUS --- nspr-4.7.5.orig/debian/patches/series +++ nspr-4.7.5/debian/patches/series @@ -0,0 +1,3 @@ +30_config_64bits.patch +30_pkgconfig.patch +99_configure.patch --- nspr-4.7.5.orig/debian/patches/30_pkgconfig.patch +++ nspr-4.7.5/debian/patches/30_pkgconfig.patch @@ -0,0 +1,60 @@ +--- + mozilla/nsprpub/config/Makefile.in | 4 ++++ + mozilla/nsprpub/config/nspr.pc.in | 10 ++++++++++ + mozilla/nsprpub/configure.in | 1 + + 3 files changed, 15 insertions(+) + +Index: nspr-4.7.2~b2/mozilla/nsprpub/config/Makefile.in +=================================================================== +--- nspr-4.7.2~b2.orig/mozilla/nsprpub/config/Makefile.in ++++ nspr-4.7.2~b2/mozilla/nsprpub/config/Makefile.in +@@ -141,8 +141,12 @@ + + $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) + @$(MAKE_OBJDIR) + $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ + + install:: nspr.m4 + $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal + $(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal ++ ++install:: nspr.pc ++ $(NSINSTALL) -D $(DESTDIR)$(libdir)/pkgconfig ++ $(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(libdir)/pkgconfig +Index: nspr-4.7.2~b2/mozilla/nsprpub/config/nspr.pc.in +=================================================================== +--- /dev/null ++++ nspr-4.7.2~b2/mozilla/nsprpub/config/nspr.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ ++Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@ ++Cflags: -I@includedir@ +Index: nspr-4.7.2~b2/mozilla/nsprpub/configure.in +=================================================================== +--- nspr-4.7.2~b2.orig/mozilla/nsprpub/configure.in ++++ nspr-4.7.2~b2/mozilla/nsprpub/configure.in +@@ -2809,16 +2809,17 @@ + dnl ======================================================== + MAKEFILES=" + Makefile + config/Makefile + config/autoconf.mk + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile + lib/libc/include/Makefile + lib/libc/src/Makefile + lib/tests/Makefile + pkg/Makefile + pkg/linux/Makefile