[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (991cce80fad064b66870e97b1dc3618e4ff659d3)

Arwed von Merkatz scm at sourcemage.org
Wed Jan 13 15:39:09 EST 2010


GIT changes to master grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 dev/null                               |binary
 gnome2-apps/gnumeric/HISTORY           |    4 ++++
 gnome2-apps/gnumeric/TRIGGERS          |    1 -
 gnome2-libs/gal2/BUILD                 |    5 +----
 gnome2-libs/gal2/DEPENDS               |    7 -------
 gnome2-libs/gal2/DETAILS               |    9 +++++----
 gnome2-libs/gal2/HISTORY               |    3 +++
 gnome2-libs/gal2/INSTALL               |    1 +
 gnome2-libs/gal2/PRE_BUILD             |    1 +
 gnome2-libs/gal2/UP_TRIGGERS           |    1 +
 gnome2-libs/gal2/gal-2.5.3.tar.bz2.sig |    0 
 gnome2-libs/gal2/gcc-3.4.patch         |   10 ----------
 12 files changed, 16 insertions(+), 26 deletions(-)

New commits:
commit 991cce80fad064b66870e97b1dc3618e4ff659d3
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gnumeric: removed unnecessary trigger on gal2

commit 0155903ef5e46baac4d608b27975a774d76b2403
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gal2: deprecated, doesn't compile anymore

diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 3d2315f..e090150 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,7 @@
+2010-01-13 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* TRIGGERS: removed, only triggered for gal2, which doesn't exist
+	  anymore
+
 2009-11-02 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.9.15 (devel)
 
diff --git a/gnome2-apps/gnumeric/TRIGGERS b/gnome2-apps/gnumeric/TRIGGERS
deleted file mode 100755
index 69dec22..0000000
--- a/gnome2-apps/gnumeric/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gal2 cast_self
diff --git a/gnome2-libs/gal2/BUILD b/gnome2-libs/gal2/BUILD
index 7a932e1..27ba77d 100755
--- a/gnome2-libs/gal2/BUILD
+++ b/gnome2-libs/gal2/BUILD
@@ -1,4 +1 @@
-#patch -p0<$SCRIPT_DIRECTORY/gcc-3.4.patch &&
-make_single    &&
-default_build  &&
-make_normal
+true
diff --git a/gnome2-libs/gal2/DEPENDS b/gnome2-libs/gal2/DEPENDS
deleted file mode 100755
index d5fc0d7..0000000
--- a/gnome2-libs/gal2/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends  libgnomeprintui  &&
-depends  libgnomeui       &&
-
-optional_depends gtk-doc                            \
-                 "--enable-gtk-doc"                 \
-                 "--disable-gtk-doc"                \
-                 "Build documentation with gtk-doc"
diff --git a/gnome2-libs/gal2/DETAILS b/gnome2-libs/gal2/DETAILS
index 07ee0a4..e2a18c0 100755
--- a/gnome2-libs/gal2/DETAILS
+++ b/gnome2-libs/gal2/DETAILS
@@ -1,12 +1,13 @@
            SPELL=gal2
          VERSION=2.5.3
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=gal-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gal-$VERSION
-   SOURCE_URL[0]=$GNOME_URL/sources/gal/$BRANCH/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+#          SOURCE=gal-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/gal-$VERSION
+#   SOURCE_URL[0]=$GNOME_URL/sources/gal/$BRANCH/$SOURCE
+#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=GPL
       LICENSE[1]=LGPL
+PATCHLEVEL=1
         WEB_SITE=http://www.gnome.org
          ENTERED=20011009
          UPDATED=20050605
diff --git a/gnome2-libs/gal2/HISTORY b/gnome2-libs/gal2/HISTORY
index d82d5e7..0d6a025 100644
--- a/gnome2-libs/gal2/HISTORY
+++ b/gnome2-libs/gal2/HISTORY
@@ -1,3 +1,6 @@
+2010-01-13 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* all: deprecated unused and doesn't compile
+
 2008-01-11 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Depends on libgnomeui
 
diff --git a/gnome2-libs/gal2/INSTALL b/gnome2-libs/gal2/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/gal2/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/gal2/PRE_BUILD b/gnome2-libs/gal2/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/gal2/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/gal2/UP_TRIGGERS b/gnome2-libs/gal2/UP_TRIGGERS
new file mode 100755
index 0000000..d4d41e2
--- /dev/null
+++ b/gnome2-libs/gal2/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger gal2 dispel_self
diff --git a/gnome2-libs/gal2/gal-2.5.3.tar.bz2.sig b/gnome2-libs/gal2/gal-2.5.3.tar.bz2.sig
deleted file mode 100644
index ea033b1..0000000
Binary files a/gnome2-libs/gal2/gal-2.5.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gal2/gcc-3.4.patch b/gnome2-libs/gal2/gcc-3.4.patch
deleted file mode 100644
index 7b16c7b..0000000
--- a/gnome2-libs/gal2/gcc-3.4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gal/a11y/e-table/gal-a11y-e-table-item.c	2004/05/21 14:10:56	1.1
-+++ gal/a11y/e-table/gal-a11y-e-table-item.c	2004/05/21 14:11:48
-@@ -48,6 +48,7 @@ struct _GalA11yETableItemPrivate {
- static gboolean gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
- 						     ESelectionModel *selection);
- static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y);
-+static gpointer * eti_reinit_data (AtkTable *table, ETableItem *item);
- 
- #if 0
- static void



More information about the SM-Commit mailing list