diff --git a/debian/changelog b/debian/changelog index a80a7c07c..8ab3a74d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ cmake (2.6.3-2) UNRELEASED; urgency=low * Remove do-not-use-lib64.diff, no longer needed (according to upstream). + * Remove reinstate-arm.diff, merged upstream. - -- Modestas Vainius Thu, 26 Feb 2009 15:14:23 +0200 + -- Modestas Vainius Thu, 26 Feb 2009 22:40:09 +0200 cmake (2.6.3-1) experimental; urgency=low diff --git a/debian/patches/reinstate-arm.diff b/debian/patches/reinstate-arm.diff deleted file mode 100644 index 5c7222d2b..000000000 --- a/debian/patches/reinstate-arm.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- cmake-2.6.0.orig/Source/kwsys/CPU.h.in -+++ cmake-2.6.0/Source/kwsys/CPU.h.in -@@ -28,6 +28,14 @@ - #elif defined(__BIG_ENDIAN__) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG - -+/* Arm */ -+#elif defined(__arm__) -+# if !defined(__ARMEB__) -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE -+# else -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG -+# endif -+ - /* Alpha */ - #elif defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE diff --git a/debian/patches/series b/debian/patches/series index 2db7825ae..501749634 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,7 @@ FindQt4.cmake2.6.diff -do-not-use-lib64.diff findmpeg2-addpath.diff kfreebsd-Platform.diff executables-dont-need-fpic.diff -reinstate-arm.diff relative_path_fixes2.diff FindQt4_qt4_lupdate_lrelease.diff manpage_friendly_docs.diff