Changeset: e3256e1b41a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3256e1b41a0
Modified Files:
        MonetDB.spec
        sql/ChangeLog.Aug2011
Branch: Dec2011
Log Message:

backout ac3f3d4d8a52: another build gone bad


diffs (107 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Aug2011-SP3/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Aug2011-SP2/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -625,17 +625,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
-* Fri Nov 11 2011 Fabian Groffen <[email protected]> - 11.5.9-20111111
-- Rebuilt.
-
-* Sun Nov  6 2011 Fabian Groffen <[email protected]> - 11.5.9-20111111
-- merovingian: Fixed a bug where monetdbd's socket files from /tmp were 
removed when
-  a second monetdbd was attempted to be started using the same port.
-
-* Wed Oct 26 2011 Fabian Groffen <[email protected]> - 11.5.9-20111111
-- sql: Added a fix for bug #2834, which caused weird (failing) behaviour
-  with PreparedStatements.
-
 * Fri Oct 21 2011 Sjoerd Mullender <[email protected]> - 11.5.7-20111021
 - Rebuilt.
 
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,3 @@
-monetdb (11.5.9-20111111) unstable; urgency=low
-
-  * Rebuilt.
-
- -- Fabian Groffen <[email protected]>  Fri, 11 Nov 2011 09:33:19 +0100
-
-monetdb (11.5.9-20111111) unstable; urgency=low
-
-  * merovingian: Fixed a bug where monetdbd's socket files from /tmp were 
removed when
-    a second monetdbd was attempted to be started using the same port.
-
- -- Fabian Groffen <[email protected]>  Sun, 6 Nov 2011 09:33:18 +0100
-
-monetdb (11.5.9-20111111) unstable; urgency=low
-
-  * sql: Added a fix for bug #2834, which caused weird (failing) behaviour
-    with PreparedStatements.
-
- -- Fabian Groffen <[email protected]>  Wed, 26 Oct 2011 09:33:18 +0100
-
 monetdb (11.5.7-20111021) unstable; urgency=low
 
   * Rebuilt.
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,10 +1,6 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
-* Wed Oct 26 2011 Fabian Groffen <[email protected]> - 11.5.9-20111111
-- Added a fix for bug #2834, which caused weird (failing) behaviour
-  with PreparedStatements.
-
 * Wed Sep 21 2011 Sjoerd Mullender <[email protected]> - 11.5.3-20110925
 - Fixed a bug when using default values for interval columns.  Bug 2877.
 
diff --git a/sql/ChangeLog.Aug2011 b/sql/ChangeLog.Aug2011
--- a/sql/ChangeLog.Aug2011
+++ b/sql/ChangeLog.Aug2011
@@ -1,3 +1,7 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Wed Oct 26 2011 Fabian Groffen <[email protected]>
+- Added a fix for bug #2834, which caused weird (failing) behaviour
+  with PreparedStatements.
+
diff --git a/tools/merovingian/ChangeLog-Archive 
b/tools/merovingian/ChangeLog-Archive
--- a/tools/merovingian/ChangeLog-Archive
+++ b/tools/merovingian/ChangeLog-Archive
@@ -1,10 +1,6 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
-* Sun Nov  6 2011 Fabian Groffen <[email protected]> - 11.5.9-20111111
-- Fixed a bug where monetdbd's socket files from /tmp were removed when
-  a second monetdbd was attempted to be started using the same port.
-
 * Sun Oct  9 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
 - Resolved problem where monetdbd would terminate abnormally when
   databases named 'control', 'discovery' or 'merovingian' were stopped.
diff --git a/tools/merovingian/ChangeLog.Aug2011 
b/tools/merovingian/ChangeLog.Aug2011
--- a/tools/merovingian/ChangeLog.Aug2011
+++ b/tools/merovingian/ChangeLog.Aug2011
@@ -1,3 +1,7 @@
 # ChangeLog file for sql/src/backends/monet5/merovingian
 # This file is updated with mchangelog
 
+* Sun Nov  6 2011 Fabian Groffen <[email protected]>
+- Fixed a bug where monetdbd's socket files from /tmp were removed when
+  a second monetdbd was attempted to be started using the same port.
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to