Viewing all changes in revision 30.
- Committer: Bazaar Package Importer
- Date: 2009-12-16 11:11:54 UTC
- mfrom: (3.1.9 sid)
- Revision ID: james.westby@ubuntu.com-20091216111154-6accvv6yq86h2hkc
* Merge from debian testing (LP: #497349). Remaining changes:
  - Keep the Replaces: on cmake-data to cover the Kubuntu version from
    Jaunty in case someone decides to do an (unsupported) Jaunty->Lucid
    upgrade.
  - Keep the Replaces: on cmake-data to cover the Kubuntu version from
    Jaunty in case someone decides to do an (unsupported) Jaunty->Lucid
    upgrade.
- files added:
- .pc
- .pc/bootstraptest_increase_timeout.diff
- .pc/bootstraptest_increase_timeout.diff/Tests
- .pc/hurd_platform.diff
- .pc/hurd_platform.diff/Modules
- .pc/hurd_platform.diff/Modules/Platform
- Modules/Compiler
- Modules/FindCUDA
- Modules/FortranCInterface
- Modules/FortranCInterface/Verify
- Tests/CMakeTestAllGenerators
- Tests/CMakeTestBadCommandLines
- Tests/CMakeTestMultipleConfigures
- Tests/CMakeTests/ELF
- Tests/CPackTestAllGenerators
- Tests/CTestScriptMode
- Tests/CTestTest/SmallAndFast
- Tests/CTestTestCrash
- Tests/CTestTestFailedSubmits
- Tests/CTestTestFailure
- Tests/CTestTestParallel
- Tests/CTestTestRunScript
- Tests/CTestTestSubdir
- Tests/CTestTestSubdir/subdir
- Tests/CTestTestSubdir/subdir2
- Tests/CTestTestSubdir/subdir3
- Tests/CTestTestTimeout
- Tests/Environment
- Tests/ExternalProject
- Tests/FindPackageTest/Exporter
- Tests/IPO
- Tests/JCTest
- Tests/KDE4StableBranchTest
- Tests/LinkLanguage
- Tests/ModuleDefinition
- Tests/Policy0002
- Tests/Policy0002/A
- Tests/TryCompile/Inner
- debian/source
- files removed:
- Modules/CMakeFortranCompilerId.F90.in
- Source/FLTKDialog
- Source/MFCDialog
- Source/MFCDialog/res
- Source/WXDialog
- Source/WXDialog/bin
- Tests/UseWX
- Utilities/cmxmlrpc
- Utilities/cmxmlrpc/CMake
- files modified:
- CMakeCPack.cmake *
- DartLocal.conf.in *
- Modules/CMakeAddNewLanguage.txt *
- Modules/CMakeRCCompiler.cmake.in *
- Modules/CMakeTestForFreeVC.cxx *
- Modules/DummyCXXFile.cxx *
- Modules/NSIS.InstallOptions.ini.in *
- Modules/Platform/CYGWIN-g77.cmake *
- Modules/Platform/Generic.cmake *
- Modules/Platform/Windows-cl.cmake.in *
- Modules/Platform/Windows-df.cmake *
- Modules/Platform/Windows-g++.cmake *
- Modules/Platform/Windows-gcc.cmake *
- Modules/Platform/Windows-wcl386.cmake *
- Modules/Platform/g77.cmake *
- Modules/TestForSSTREAM.cxx *
- Source/CPack/bills-comments.txt *
- Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake *
- Source/QtDialog/QMacInstallDialog.cxx *
- Source/QtDialog/QMacInstallDialog.h *
- Source/QtDialog/README *
- Tests/BuildDepends/Project/CMakeLists.txt *
- Tests/BuildDepends/Project/bar.cxx *
- Tests/Complex/Executable/A.cxx *
- Tests/Complex/Executable/Included.cmake *
- Tests/Complex/Executable/Sub1/NameConflictTest.c *
- Tests/Complex/Executable/Sub2/NameConflictTest.c *
- Tests/Complex/Executable/complex.file.cxx *
- Tests/Complex/Executable/testcflags.c *
- Tests/Complex/Library/moduleFile.c *
- Tests/Complex/Library/moduleFile.h *
- Tests/ComplexOneConfig/Executable/A.cxx *
- Tests/ComplexOneConfig/Executable/Included.cmake *
- Tests/ComplexOneConfig/Executable/Sub1/NameConflictTest.c *
- Tests/ComplexOneConfig/Executable/Sub2/NameConflictTest.c *
- Tests/ComplexOneConfig/Executable/complex.file.cxx *
- Tests/ComplexOneConfig/Executable/testcflags.c *
- Tests/ComplexOneConfig/Library/moduleFile.c *
- Tests/ComplexOneConfig/Library/moduleFile.h *
- Tests/ComplexRelativePaths/Executable/A.cxx *
- Tests/ComplexRelativePaths/Executable/Included.cmake *
- Tests/ComplexRelativePaths/Executable/Sub1/NameConflictTest.c *
- Tests/ComplexRelativePaths/Executable/Sub2/NameConflictTest.c *
- Tests/ComplexRelativePaths/Executable/complex.file.cxx *
- Tests/ComplexRelativePaths/Executable/testcflags.c *
- Tests/ComplexRelativePaths/Library/moduleFile.c *
- Tests/ComplexRelativePaths/Library/moduleFile.h *
- Tests/CustComDepend/CMakeLists.txt *
- Tests/CustComDepend/bar.h *
- Tests/CustComDepend/foo.cxx *
- Tests/CustomCommand/GeneratedHeader/CMakeLists.txt *
- Tests/CustomCommandWorkingDirectory/CMakeLists.txt *
- Tests/CustomCommandWorkingDirectory/customTarget.c *
- Tests/CustomCommandWorkingDirectory/working.c.in *
- Tests/DocTest/CMakeLists.txt *
- Tests/DocTest/DocTest.cxx *
- Tests/Fortran/foo.f *
- Tests/FunctionTest/Util.cmake *
- Tests/Java/A.java *
- Tests/Java/CMakeLists.txt *
- Tests/Java/HelloWorld.java *
- Tests/LibName/CMakeLists.txt *
- Tests/LibName/bar.c *
- Tests/LibName/foo.c *
- Tests/LibName/foobar.c *
- Tests/LoadCommand/LoadedCommand.cxx.in *
- Tests/LoadCommandOneConfig/LoadedCommand.cxx.in *
- Tests/NewlineArgs/CMakeLists.txt *
- Tests/NewlineArgs/cxxonly.cxx *
- Tests/NewlineArgs/libcxx1.cxx *
- Tests/NewlineArgs/libcxx1.h *
- Tests/NewlineArgs/libcxx2.h.in *
- Tests/OutOfSource/CMakeLists.txt *
- Tests/OutOfSource/OutOfSourceSubdir/simple.cxx *
- Tests/OutOfSource/OutOfSourceSubdir/simple.cxx.in *
- Tests/OutOfSource/OutOfSourceSubdir/testlib.cxx *
- Tests/OutOfSource/OutOfSourceSubdir/testlib.h *
- Tests/OutOfSource/SubDir/CMakeLists.txt *
- Tests/OutOfSource/testdp.h.in *
- Tests/PreOrder/CMakeLists.txt *
- Tests/PreOrder/Library/CMakeLists.txt *
- Tests/PreOrder/simple.cxx *
- Tests/Properties/SubDir/properties3.cxx *
- Tests/Properties/properties.h.in *
- Tests/Properties/properties2.h *
- Tests/ReturnTest/returnTest.c *
- Tests/ReturnTest/subdir/CMakeLists.txt *
- Tests/SameName/CMakeLists.txt *
- Tests/SameName/Exe1/CMakeLists.txt *
- Tests/SameName/Exe1/conly.c *
- Tests/SameName/Lib1/CMakeLists.txt *
- Tests/SetLang/CMakeLists.txt *
- Tests/SetLang/bar.c *
- Tests/SetLang/foo.c *
- Tests/Simple/simpleWe.cpp *
- Tests/SubDir/CMakeLists.txt *
- Tests/SubDir/Examples/CMakeLists.txt *
- Tests/SubDir/Examples/example1/CMakeLists.txt *
- Tests/SubDir/Examples/example1/example1.cxx *
- Tests/SubDir/Examples/example2/CMakeLists.txt *
- Tests/SubDir/Examples/example2/example2.cxx *
- Tests/SubDir/Executable/CMakeLists.txt *
- Tests/SubDir/Executable/test.cxx *
- Tests/SubDirSpaces/Another Subdir/pair+int.int.c *
- Tests/SubDirSpaces/Another Subdir/pair_int.int.c *
- Tests/SubDirSpaces/Another Subdir/secondone.c *
- Tests/SubDirSpaces/Another Subdir/testfromsubdir.c *
- Tests/SubDirSpaces/CMakeLists.txt *
- Tests/SubDirSpaces/Executable Sources/CMakeLists.txt *
- Tests/SubDirSpaces/Executable Sources/test.cxx *
- Tests/SubDirSpaces/Executable/CMakeLists.txt *
- Tests/SubDirSpaces/Executable/test.cxx *
- Tests/SubDirSpaces/Some Examples/CMakeLists.txt *
- Tests/SubDirSpaces/Some Examples/example1/CMakeLists.txt *
- Tests/SubDirSpaces/Some Examples/example1/example1.cxx *
- Tests/SubDirSpaces/Some Examples/example2/CMakeLists.txt *
- Tests/SubDirSpaces/Some Examples/example2/example2.cxx *
- Tests/SubDirSpaces/Some(x86) Sources/CMakeLists.txt *
- Tests/SubDirSpaces/Some(x86) Sources/test.c *
- Tests/SubDirSpaces/ThirdSubDir/pair+int.int1.c *
- Tests/SubDirSpaces/ThirdSubDir/pair_int.int1.c *
- Tests/SubDirSpaces/ThirdSubDir/pair_p_int.int1.c *
- Tests/SubDirSpaces/ThirdSubDir/testfromauxsubdir.c *
- Tests/SubDirSpaces/ThirdSubDir/thirdone.c *
- Tests/SubDirSpaces/vcl_algorithm+vcl_pair+double.foo.c *
- Tests/SubDirSpaces/vcl_algorithm_vcl_pair_double.foo.c *
- Tests/SubProject/CMakeLists.txt *
- Tests/SubProject/bar.cxx *
- Tests/SubProject/car.cxx *
- Tests/SubProject/foo/CMakeLists.txt *
- Tests/SubProject/foo/foo.cxx *
- Tests/TargetName/CMakeLists.txt *
- Tests/TargetName/executables/CMakeLists.txt *
- Tests/TargetName/executables/hello_world.c *
- Tests/TargetName/scripts/CMakeLists.txt *
- Tests/TryCompile/exit_success.c *
- Tests/TryCompile/exit_with_error.c *
- Tests/TryCompile/fail.c *
- Tests/TryCompile/pass.c *
- Tests/Tutorial/Step1/CMakeLists.txt *
- Tests/Tutorial/Step1/TutorialConfig.h.in *
- Tests/Tutorial/Step1/tutorial.cxx *
- Tests/Tutorial/Step2/CMakeLists.txt *
- Tests/Tutorial/Step2/MathFunctions/CMakeLists.txt *
- Tests/Tutorial/Step2/MathFunctions/MathFunctions.h *
- Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx *
- Tests/Tutorial/Step2/TutorialConfig.h.in *
- Tests/Tutorial/Step2/tutorial.cxx *
- Tests/Tutorial/Step3/CMakeLists.txt *
- Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt *
- Tests/Tutorial/Step3/MathFunctions/MathFunctions.h *
- Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx *
- Tests/Tutorial/Step3/TutorialConfig.h.in *
- Tests/Tutorial/Step3/tutorial.cxx *
- Tests/Tutorial/Step4/CMakeLists.txt *
- Tests/Tutorial/Step4/MathFunctions/CMakeLists.txt *
- Tests/Tutorial/Step4/MathFunctions/MathFunctions.h *
- Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx *
- Tests/Tutorial/Step4/TutorialConfig.h.in *
- Tests/Tutorial/Step4/tutorial.cxx *
- Tests/Tutorial/Step5/CMakeLists.txt *
- Tests/Tutorial/Step5/MathFunctions/MathFunctions.h *
- Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx *
- Tests/Tutorial/Step5/TutorialConfig.h.in *
- Tests/Tutorial/Step5/tutorial.cxx *
- Tests/Tutorial/Step6/MathFunctions/CMakeLists.txt *
- Tests/Tutorial/Step6/MathFunctions/MathFunctions.h *
- Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx *
- Tests/Tutorial/Step6/TutorialConfig.h.in *
- Tests/Tutorial/Step6/tutorial.cxx *
- Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt *
- Tests/Tutorial/Step7/MathFunctions/MathFunctions.h *
- Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx *
- Tests/Tutorial/Step7/TutorialConfig.h.in *
- Tests/Tutorial/Step7/tutorial.cxx *
- Tests/VSExternalInclude/Lib1/CMakeLists.txt *
- Tests/VSExternalInclude/Lib1/lib1.cpp *
- Tests/VSExternalInclude/Lib1/lib1.h *
- Tests/VSExternalInclude/Lib2/CMakeLists.txt *
- Tests/VSExternalInclude/Lib2/lib2.cpp *
- Tests/VSExternalInclude/Lib2/lib2.h *
- Tests/VSExternalInclude/main.cpp *
- Tests/Wrapping/fakefluid.cxx *
- Tests/Wrapping/qtnoqtmain.cxx *
- Tests/X11/HelloWorldX11.cxx *
- Utilities/KWStyle/CMake.kws.xml.in *
- Utilities/KWStyle/CMakeMoreChecks.kws.xml.in *
- Utilities/KWStyle/CMakeOverwrite.txt *
- Utilities/Release/CMakeInstall.bmp *
- Utilities/Release/CMakeLogo.ico *
- Utilities/Release/Cygwin/CMakeLists.txt *
- Utilities/Release/Cygwin/README.cygwin.in *
- Utilities/Release/dashsun1_release.cmake *
- Utilities/Release/hythloth_release.cmake *
- Utilities/cmcurl/Platforms/WindowsCache.cmake *
expand all
collapse all
added
removed
Source/WXDialog/cmake_icon.gif
