[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (51cf33edaeaa84be33d3c2cc5ccf95a564375e79)

Treeve Jelbert scm at mail.sourcemage.org
Tue Aug 1 15:34:11 EDT 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 gnome2-apps/gnucash2/DETAILS                  |    6 +-
 gnome2-apps/gnucash2/HISTORY                  |    4 +
 gnome2-apps/gnucash2/gnucash-pubkey.key       |binary
 kde-apps/kexi/DETAILS                         |    6 +-
 kde-apps/kexi/HISTORY                         |    4 +
 kde-apps/kexi/PRE_BUILD                       |    4 -
 kde-apps/kexi/form_plugins.patch              |   52 ----------------------
 kde-apps/kexi/kexi_checkbox_data_saving.patch |   59 --------------------------
 8 files changed, 15 insertions(+), 120 deletions(-)

New commits:
commit 6e872cbf8fc5c79e587885cec240bcb846970696
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    gnucash2-2.0.1

commit 974dbb6b33a4d90fdad53d5c368fece4fffa7798
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    kexi-1.0.2

diff --git a/gnome2-apps/gnucash2/DETAILS b/gnome2-apps/gnucash2/DETAILS
index 6d27eba..3ad0aa7 100755
--- a/gnome2-apps/gnucash2/DETAILS
+++ b/gnome2-apps/gnucash2/DETAILS
@@ -1,11 +1,13 @@
            SPELL=gnucash2
-         VERSION=2.0.0
-     SOURCE_HASH=sha512:5e6a61172b619fdab23213722dfe517189aff082debface63b6e151ebc59f3047ad44d012deb4869f4058ba94764d2443a35377fdbb3b81651985d6210570e98
+         VERSION=2.0.1
+#     SOURCE_HASH=sha512:
           SOURCE=${SPELL/2/}-$VERSION.tar.gz
          SOURCE2=${SPELL/2/}-$VERSION.tar.gz.sig
    SOURCE_URL[0]=http://www.gnucash.org/pub/gnucash/sources/stable/${SOURCE}
    SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL/2/}/${SOURCE}
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG=gnucash-pubkey.key:$SOURCE2:UPSTREAM_KEY
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 #     SOURCE_GPG=${SOURCE2}
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/2/}-$VERSION
diff --git a/gnome2-apps/gnucash2/HISTORY b/gnome2-apps/gnucash2/HISTORY
index d7d000c..60179c6 100644
--- a/gnome2-apps/gnucash2/HISTORY
+++ b/gnome2-apps/gnucash2/HISTORY
@@ -1,3 +1,7 @@
+2006-08-01 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 2.0.1
+	* gnucash-pubkey.key: added
+
 2006-07-20 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 2.0.0
 	* DEPENDS: SQL -> postgresql
diff --git a/gnome2-apps/gnucash2/gnucash-pubkey.key b/gnome2-apps/gnucash2/gnucash-pubkey.key
new file mode 100644
index 0000000..b70a994
Binary files /dev/null and b/gnome2-apps/gnucash2/gnucash-pubkey.key differ
diff --git a/kde-apps/kexi/DETAILS b/kde-apps/kexi/DETAILS
index 57574df..42e912c 100755
--- a/kde-apps/kexi/DETAILS
+++ b/kde-apps/kexi/DETAILS
@@ -1,9 +1,9 @@
            SPELL=kexi
-         VERSION=1.0.1
-     SOURCE_HASH=sha512:3be2ece69e08841bb6fa453e308e5d1bb06b5051770c7e87957150fb0e3e61162c40debd269ea492a26e98f09c71ac6b8b6207bce690506fed1c1ed720bd3771
+         VERSION=1.0.2
+     SOURCE_HASH=sha512:bc44c67cbdefd891fd4502e6319541df6b2581bac7991761402bb0d9da6115a2c3dd489f5da10b06c489e749935c5df6b0a8a82a5eedb5a46aceafed8682b3d2
           SOURCE=${SPELL}mdb-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}mdb-$VERSION
-   SOURCE_URL[0]=$KDE_URL/stable/koffice-1.5.1/src/$SOURCE
+   SOURCE_URL[0]=$KDE_URL/stable/koffice-1.5.2/src/$SOURCE
         WEB_SITE=http://www.kexi-project.org/
          ENTERED=20040830
       LICENSE[0]=GPL
diff --git a/kde-apps/kexi/HISTORY b/kde-apps/kexi/HISTORY
index 7999cdb..bdc3d5a 100644
--- a/kde-apps/kexi/HISTORY
+++ b/kde-apps/kexi/HISTORY
@@ -1,3 +1,7 @@
+2006-08-01 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 1.0.2
+	* PRE_BUILD, *.patch: remove
+
 2006-06-29 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/kde-apps/kexi/PRE_BUILD b/kde-apps/kexi/PRE_BUILD
deleted file mode 100755
index ef35c5f..0000000
--- a/kde-apps/kexi/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build       &&
-cd $SOURCE_DIRECTORY 	&&
-patch  -p1 < $SPELL_DIRECTORY/form_plugins.patch  &&
-patch  -p1 < $SPELL_DIRECTORY/kexi_checkbox_data_saving.patch
diff --git a/kde-apps/kexi/form_plugins.patch b/kde-apps/kexi/form_plugins.patch
deleted file mode 100644
index 3d7c7c4..0000000
--- a/kde-apps/kexi/form_plugins.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- kexi/plugins/forms/Makefile.am	(wersja 541836)
-+++ kexi/plugins/forms/Makefile.am	(kopia robocza)
-@@ -23,9 +23,10 @@
- 	kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
- 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
- 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
--libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
- libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
- 	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
- 
- kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
---- kexi/plugins/reports/Makefile.am	(wersja 541836)
-+++ kexi/plugins/reports/Makefile.am	(kopia robocza)
-@@ -5,24 +5,29 @@
- kexihandler_report_la_SOURCES = kexireports.cpp
- kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
- kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
--  ../../widget/utils/libkexiguiutils.la \
--  ../../widget/libkexiextendedwidgets.la \
--  ../../formeditor/libkformdesigner.la \
--  ../forms/libkexiformutils.la \
-+  $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
-+  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+  $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
-   ./libkexireportutils.la
- 
- kexireportwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
- kexireportwidgets_la_SOURCES =   reportwidgets.cpp kexireportfactory.cpp
- kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
-+	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
-+	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- 	./libkexireportutils.la
- 
- lib_LTLIBRARIES = libkexireportutils.la
- libkexireportutils_la_SOURCES = \
- 	kexireportpart.cpp kexireportview.cpp kexireportform.cpp
--libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
- libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
-+	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
--	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
-+	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la
- 
- kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
- kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop
diff --git a/kde-apps/kexi/kexi_checkbox_data_saving.patch b/kde-apps/kexi/kexi_checkbox_data_saving.patch
deleted file mode 100644
index a9853f0..0000000
--- a/kde-apps/kexi/kexi_checkbox_data_saving.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- kexi/plugins/forms/kexidataprovider.cpp	(revision 542130)
-+++ kexi/plugins/forms/kexidataprovider.cpp	(revision 542131)
-@@ -92,7 +92,8 @@
-  	for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); 
- 		it!=m_fieldNumbersForDataItems.constEnd(); ++it)
- 	{
--		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() << endl;
-+		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() 
-+			<< " data=" << row.at(it.data()) << endl;
- 		it.key()->setValue( row.at(it.data()) );
- 	}
- }
---- kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542130)
-+++ kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542131)
-@@ -446,8 +446,11 @@
- 		@todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool]
- 		(see doc/dev/settings.txt) */
- 			if (!text.isEmpty()) {
--				realText = text[0].upper();
--				realText += (text.mid(1) + ": ");
-+				realText = text[0].upper() + text.mid(1);
-+				if (m_widgetType!=Boolean) {
-+//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
-+					realText += ": ";
-+				}
- 			}
- 		}
- 		else
---- kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542130)
-+++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542131)
-@@ -27,7 +27,9 @@
-  : QCheckBox(text, parent, name), KexiFormDataItemInterface()
- {
- 	m_invalidState = false;
-+//! todo: tristate 
- 	setTristate(true);
-+	setFocusPolicy(QWidget::StrongFocus);
- 	connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int)));
- }
- 
-@@ -56,13 +58,16 @@
- 
- void KexiDBCheckBox::setValueInternal(const QVariant &add, bool )
- {
--	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
-+//	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
-+	setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) );
- }
- 
- QVariant
- KexiDBCheckBox::value()
- {
--	return QVariant( isChecked(), 3 );
-+	if (state()==NoChange)
-+		return QVariant();
-+	return QVariant(state()==On, 1);
- }
- 
- void KexiDBCheckBox::slotStateChanged(int )



More information about the SM-Commit mailing list