[Pkg-octave-commit] r2700 - in octave/trunk/debian: . in patches
Rafael Laboissiere
rafael at alioth.debian.org
Fri Feb 27 00:19:13 UTC 2009
Author: rafael
Date: 2009-02-27 00:19:13 +0000 (Fri, 27 Feb 2009)
New Revision: 2700
Removed:
octave/trunk/debian/patches/clean-examples-subdir.dpatch
octave/trunk/debian/patches/compile-inttypes-on-short-double-arches.dpatch
octave/trunk/debian/patches/real-no-history-3.1.dpatch
octave/trunk/debian/patches/visit-script-call-accept.dpatch
Modified:
octave/trunk/debian/changelog
octave/trunk/debian/in/00list
Log:
Preparation for new upstream development snapshot release
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2009-02-27 00:08:38 UTC (rev 2699)
+++ octave/trunk/debian/changelog 2009-02-27 00:19:13 UTC (rev 2700)
@@ -1,3 +1,14 @@
+octave3.1 (3.1.53-1) UNRELEASED; urgency=low
+
+ * New upstream development snapshot
+ * Dropped patches (applied upstream):
+ + debian/patches/clean-examples-subdir.dpatch
+ + debian/patches/real-no-history-3.1.dpatch
+ + debian/patches/visit-script-call-accept.dpatch
+ + debian/patches/compile-inttypes-on-short-double-arches.dpatch
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 26 Feb 2009 17:38:35 +0100
+
octave3.0 (1:3.0.4~rc5-1) experimental; urgency=low
* New upstream release candidate. Still released to experimental, since
Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list 2009-02-27 00:08:38 UTC (rev 2699)
+++ octave/trunk/debian/in/00list 2009-02-27 00:19:13 UTC (rev 2700)
@@ -10,9 +10,5 @@
50_octave-bug-tempfile
no_pdf_in_print.dpatch
dont_set_helvetica-3.1.dpatch
-clean-examples-subdir.dpatch
-real-no-history-3.1.dpatch
-visit-script-call-accept.dpatch
-compile-inttypes-on-short-double-arches.dpatch
normal-markersize.dpatch
:]
Deleted: octave/trunk/debian/patches/clean-examples-subdir.dpatch
===================================================================
--- octave/trunk/debian/patches/clean-examples-subdir.dpatch 2009-02-27 00:08:38 UTC (rev 2699)
+++ octave/trunk/debian/patches/clean-examples-subdir.dpatch 2009-02-27 00:19:13 UTC (rev 2700)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## clean-examples-subdir.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Run some clean commands in subdirectory examples/@polynomial
-
- at DPATCH@
---- octave3.1-3.1.52.orig/examples/Makefile.in
-+++ octave3.1-3.1.52/examples/Makefile.in
-@@ -125,14 +125,17 @@
- clean mostlyclean:
- .PHONY: clean mostlyclean
-
--distclean:
-+distclean::
- rm -f Makefile octave.desktop
- .PHONY: distclean
-
--maintainer-clean: distclean
-+maintainer-clean:: distclean
- rm -f tags TAGS
- .PHONY: maintainer-clean
-
-+distclean maintainer-clean::
-+ @$(subdir-for-command)
-+
- dist:
- ln $(DISTFILES) ../`cat ../.fname`/examples
- for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/examples/$$dir; $(MAKE) -C $$dir $@; done
Deleted: octave/trunk/debian/patches/compile-inttypes-on-short-double-arches.dpatch
===================================================================
--- octave/trunk/debian/patches/compile-inttypes-on-short-double-arches.dpatch 2009-02-27 00:08:38 UTC (rev 2699)
+++ octave/trunk/debian/patches/compile-inttypes-on-short-double-arches.dpatch 2009-02-27 00:19:13 UTC (rev 2700)
@@ -1,108 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## compile-inttypes-on-short-double-arches.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Workaround gcc 4.3 explicit instantiation bug in octave_int_cmp_op.
-## DP: This was causing FTBFS on architectures with no long double type,
-## DP. like mipsel and hppa. Thanks to Jaroslav Hajek for the patch.
-
- at DPATCH@
-# HG changeset patch
-# User Jaroslav Hajek <highegg at gmail.com>
-# Date 1235374787 -3600
-# Node ID 527d53c475f2f05059a5564f10d5bf7561ff598a
-# Parent d79edebd8f4526e4c67abc18996028151f91fc58
-workaround gcc 4.3 explicit instantiation bug in octave_int_cmp_op
-
-diff --git a/liboctave/oct-inttypes.cc b/liboctave/oct-inttypes.cc
---- a/liboctave/oct-inttypes.cc
-+++ b/liboctave/oct-inttypes.cc
-@@ -56,7 +56,7 @@
-
- template <class xop>
- OCTAVE_API bool
--octave_int_cmp_op::mop (uint64_t x, double y)
-+octave_int_cmp_op::emulate_mop (uint64_t x, double y)
- {
- static const double xxup = std::numeric_limits<uint64_t>::max ();
- // This converts to the nearest double. Unless there's an equality, the
-@@ -76,7 +76,7 @@
-
- template <class xop>
- OCTAVE_API bool
--octave_int_cmp_op::mop (int64_t x, double y)
-+octave_int_cmp_op::emulate_mop (int64_t x, double y)
- {
- static const double xxup = std::numeric_limits<int64_t>::max ();
- static const double xxlo = std::numeric_limits<int64_t>::min ();
-@@ -123,7 +123,7 @@
-
- template <class xop>
- OCTAVE_API bool
--octave_int_cmp_op::mop (double x, uint64_t y)
-+octave_int_cmp_op::emulate_mop (double x, uint64_t y)
- {
- typedef typename rev_op<xop>::op rop;
- return mop<rop> (y, x);
-@@ -131,7 +131,7 @@
-
- template <class xop>
- OCTAVE_API bool
--octave_int_cmp_op::mop (double x, int64_t y)
-+octave_int_cmp_op::emulate_mop (double x, int64_t y)
- {
- typedef typename rev_op<xop>::op rop;
- return mop<rop> (y, x);
-@@ -499,8 +499,8 @@
- }
-
- #define INSTANTIATE_INT64_DOUBLE_CMP_OP0(OP,T1,T2) \
-- template OCTAVE_API bool \
-- octave_int_cmp_op::mop<octave_int_cmp_op::OP> (T1 x, T2 y)
-+ template bool \
-+ octave_int_cmp_op::emulate_mop<octave_int_cmp_op::OP> (T1 x, T2 y)
-
- #define INSTANTIATE_INT64_DOUBLE_CMP_OP(OP) \
- INSTANTIATE_INT64_DOUBLE_CMP_OP0(OP, double, int64_t); \
-diff --git a/liboctave/oct-inttypes.h b/liboctave/oct-inttypes.h
---- a/liboctave/oct-inttypes.h
-+++ b/liboctave/oct-inttypes.h
-@@ -192,20 +192,29 @@
- return xop::op (static_cast<long double> (x), \
- static_cast<long double> (y)); \
- }
-+#else
-+ // ... otherwise, use external handlers
-+
-+ // FIXME: We could declare directly the mop methods as external,
-+ // but we can't do this because bugs in gcc (<= 4.3) prevent
-+ // explicit instantiations later in that case.
-+#define DEFINE_LONG_DOUBLE_CMP_OP(T1, T2) \
-+ template <class xop> static OCTAVE_API bool \
-+ emulate_mop (T1, T2); \
-+ template <class xop> \
-+ static bool \
-+ mop (T1 x, T2 y) \
-+ { \
-+ return emulate_mop<xop> (x, y); \
-+ }
-+#endif
-+
- DEFINE_LONG_DOUBLE_CMP_OP(double, uint64_t)
- DEFINE_LONG_DOUBLE_CMP_OP(double, int64_t)
- DEFINE_LONG_DOUBLE_CMP_OP(int64_t, double)
- DEFINE_LONG_DOUBLE_CMP_OP(uint64_t, double)
-+
- #undef DEFINE_LONG_DOUBLE_CMP_OP
--
--#else
-- // ... otherwise, use external handlers
-- template <class xop> static OCTAVE_API bool mop (uint64_t, double);
-- template <class xop> static OCTAVE_API bool mop (int64_t, double);
-- template <class xop> static OCTAVE_API bool mop (double, uint64_t);
-- template <class xop> static OCTAVE_API bool mop (double, int64_t);
--#endif
--
- };
-
- // Base integer class. No data, just conversion methods and exception flags.
Deleted: octave/trunk/debian/patches/real-no-history-3.1.dpatch
===================================================================
--- octave/trunk/debian/patches/real-no-history-3.1.dpatch 2009-02-27 00:08:38 UTC (rev 2699)
+++ octave/trunk/debian/patches/real-no-history-3.1.dpatch 2009-02-27 00:19:13 UTC (rev 2700)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## real-no-history-3.1.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Only save history if Vsaving_history is true. Thanks to John Eaton
-## DP: for the patch, taken from the upstream Mercurial repository.
-##
-## DP: # HG changeset patch
-## DP: # User John W. Eaton <jwe at octave.org>
-## DP: # Date 1234548184 18000
-## DP: # Node ID afbfd7f4fd931c9460102aec3eb073f78839276e
-## DP: # Parent 767ed8cc6634851b239e3b181fa18fd7984c2678
-## DP: toplev.cc (do_octave_atexit): only save history if Vsaving_history is true
-
- at DPATCH@
-diff --git a/src/toplev.cc b/src/toplev.cc
---- a/src/toplev.cc
-+++ b/src/toplev.cc
-@@ -984,7 +984,8 @@
-
- octave_history_write_timestamp ();
-
-- command_history::clean_up_and_save ();
-+ if (Vsaving_history)
-+ command_history::clean_up_and_save ();
-
- close_files ();
-
Deleted: octave/trunk/debian/patches/visit-script-call-accept.dpatch
===================================================================
--- octave/trunk/debian/patches/visit-script-call-accept.dpatch 2009-02-27 00:08:38 UTC (rev 2699)
+++ octave/trunk/debian/patches/visit-script-call-accept.dpatch 2009-02-27 00:19:13 UTC (rev 2700)
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## visit-script-call-accept.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Avoids crashes when user scripts are loaded again after being
-## DP: changed in the file system (fixes Bug#516136). This patch was
-## DP: taken from the upstream Mercurial repository, thanks to John
-## DP: W. Eaton.
-
- at DPATCH@
-# HG changeset patch
-# User John W. Eaton <jwe at octave.org>
-# Date 1235157064 18000
-# Node ID 71742f45571ed96e0cc91b14c3647276c0a03994
-# Parent fa981a0530644364cbddbabfae8d218100066c67
-pt-bp.cc: call accept for function and script commands
-
---- a/src/pt-bp.cc Fri Feb 20 12:24:03 2009 -0500
-+++ b/src/pt-bp.cc Fri Feb 20 14:11:04 2009 -0500
-@@ -160,15 +160,21 @@
- }
-
- void
--tree_breakpoint::visit_octave_user_script (octave_user_script&)
-+tree_breakpoint::visit_octave_user_script (octave_user_script& fcn)
- {
-- panic_impossible ();
-+ tree_statement_list *cmd_list = fcn.body ();
-+
-+ if (cmd_list)
-+ cmd_list->accept (*this);
- }
-
- void
--tree_breakpoint::visit_octave_user_function (octave_user_function&)
-+tree_breakpoint::visit_octave_user_function (octave_user_function& fcn)
- {
-- panic_impossible ();
-+ tree_statement_list *cmd_list = fcn.body ();
-+
-+ if (cmd_list)
-+ cmd_list->accept (*this);
- }
-
- void
-
More information about the Pkg-octave-commit
mailing list