Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9386
Modified Files:
gnome-menus2-dev.info gnome-menus2-py.info
gnome-menus2-py.patch
Added Files:
gnome-menus2-py-2.20.3.info gnome-menus2-py-2.20.3.patch
Removed Files:
gnome-menus2-dev.patch
Log Message:
new version; -py23 and -py24 left behind by new pycairo
Index: gnome-menus2-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-menus2-py.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gnome-menus2-py.info 15 Jul 2008 01:40:56 -0000 1.12
+++ gnome-menus2-py.info 20 Oct 2008 02:32:41 -0000 1.13
@@ -1,43 +1,42 @@
Info2: <<
Package: gnome-menus2-py%type_pkg[python]
-Version: 2.20.3
+Version: 2.24.0
Revision: 1
-Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
-Type: python (2.3 2.4 2.5)
+Type: python (2.5)
BuildDepends: <<
fink (>= 0.24.12-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.12.0-1),
- gnome-menus2-dev (>= 2.20.0-1),
- intltool (>= 0.36.0-1),
+ glib2-dev (>= 2.18.0-1),
+ gnome-menus2-dev (>= %v-1),
+ intltool40,
libgettext3-dev,
libiconv-dev,
- pkgconfig,
- pycairo-py%type_pkg[python]-dev,
- pygobject2-py%type_pkg[python]-dev (>= 2.12.0-1),
- pygtk2-gtk-py%type_pkg[python]-dev (>= 2.10.0-1)
+ pkgconfig (>= 0.23),
+ pycairo-py%type_pkg[python]-dev (>= 1.6.4-1),
+ pygobject2-py%type_pkg[python]-dev (>= 2.14.2-2),
+ pygtk2-gtk-py%type_pkg[python]-dev (>= 2.12.1-3)
<<
Depends: <<
- glib2-shlibs (>= 2.12.0-1),
- gnome-menus2-shlibs (>= 2.20.0-1),
+ glib2-shlibs (>= 2.18.0-1),
+ gnome-menus2-shlibs (>= %v-1),
libgettext3-shlibs,
libiconv,
- pygtk2-gtk-py%type_pkg[python] (>= 2.10.0-1),
+ pygtk2-gtk-py%type_pkg[python] (>= 2.12.1-3),
xdg-base
<<
Description: Python bindings for the gnome-menus lib
-Source: mirror:gnome:sources/gnome-menus/2.20/gnome-menus-%v.tar.bz2
-Source-MD5: b8ab05f5edfdc3e6a46662a504934657
+Source: mirror:gnome:sources/gnome-menus/2.24/gnome-menus-%v.tar.bz2
+Source-MD5: 1816a0d21ef99d5b3a8bcd033c88f732
PatchFile: %{ni}.patch
-PatchFile-MD5: 73a84537f42a8a7242c6d9b53f8695b7
+PatchFile-MD5: 6e2c3f833a26f3788e86c5da77bc6e36
PatchScript: <<
%{default_script}
mv simple-editor/gmenu-simple-editor.glade{,-%type_pkg[python]}
perl -pi -e 's/(gmenu-simple-editor.glade)/\1-%type_pkg[python]/g'
simple-editor/Makefile.in simple-editor/GMenuSimpleEditor/maindialog.py
<<
-ConfigureParams: --disable-dependency-tracking --enable-python
+ConfigureParams: --disable-dependency-tracking --enable-python --disable-static
CompileScript: <<
#!/bin/sh -ev
export CPPFLAGS="`pkg-config --cflags libgnome-menu` $CPPFLAGS"
@@ -63,16 +62,6 @@
update-alternatives --remove gmenu-simple-editor
%p/bin/gmenu-simple-editor-%type_pkg[python]
<<
-DescPackaging: <<
-# Redo with automake1.9 so py-compile understands DESTDIR
-# See: http://bugzilla.gnome.org/show_bug.cgi?id=344047
-
- Patch simple-editor to use the python interp determined by
- configure. See: http://bugzilla.gnome.org/show_bug.cgi?id=343978
-
- Use glib2-2.12.0 for GCC version independence
-<<
-
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: gnome-menus2-py-2.20.3.info ---
Info2: <<
Package: gnome-menus2-py%type_pkg[python]
Version: 2.20.3
Revision: 1
Distribution: (%type_pkg[python] = 23) 10.4
Type: python (2.3 2.4)
BuildDepends: <<
fink (>= 0.24.12-1),
gettext-bin,
gettext-tools,
glib2-dev (>= 2.12.0-1),
gnome-menus2-dev (>= 2.20.0-1),
intltool (>= 0.36.0-1),
libgettext3-dev,
libiconv-dev,
pkgconfig,
pycairo-py%type_pkg[python]-dev,
pygobject2-py%type_pkg[python]-dev (>= 2.12.0-1),
pygtk2-gtk-py%type_pkg[python]-dev (>= 2.10.0-1)
<<
Depends: <<
glib2-shlibs (>= 2.12.0-1),
gnome-menus2-shlibs (>= 2.20.0-1),
libgettext3-shlibs,
libiconv,
pygtk2-gtk-py%type_pkg[python] (>= 2.10.0-1),
xdg-base
<<
Description: Python bindings for the gnome-menus lib
Source: mirror:gnome:sources/gnome-menus/2.20/gnome-menus-%v.tar.bz2
Source-MD5: b8ab05f5edfdc3e6a46662a504934657
PatchFile: %{ni}-%v.patch
PatchFile-MD5: 73a84537f42a8a7242c6d9b53f8695b7
PatchScript: <<
%{default_script}
mv simple-editor/gmenu-simple-editor.glade{,-%type_pkg[python]}
perl -pi -e 's/(gmenu-simple-editor.glade)/\1-%type_pkg[python]/g'
simple-editor/Makefile.in simple-editor/GMenuSimpleEditor/maindialog.py
<<
ConfigureParams: --disable-dependency-tracking --enable-python
CompileScript: <<
#!/bin/sh -ev
export CPPFLAGS="`pkg-config --cflags libgnome-menu` $CPPFLAGS"
export LDFLAGS="`pkg-config --libs libgnome-menu` $LDFLAGS"
PYTHON=%p/bin/python%type_raw[python] ./configure %c
make
<<
InstallScript: <<
#!/bin/sh -ev
make install DESTDIR=%d
for versionless in bin/gmenu-simple-editor
share/applications/gmenu-simple-editor.desktop; do
mv %i/${versionless} %i/${versionless}-%type_pkg[python]
done
<<
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po HACKING NEWS
README
PostInstScript: <<
update-alternatives \
--install %p/bin/gmenu-simple-editor
gmenu-simple-editor %p/bin/gmenu-simple-editor-%type_pkg[python]
%type_pkg[python] \
--slave %p/share/applications/gmenu-simple-editor.desktop
gmenu-simple-editor.desktop
%p/share/applications/gmenu-simple-editor.desktop-%type_pkg[python]
<<
PostRmScript: <<
update-alternatives --remove gmenu-simple-editor
%p/bin/gmenu-simple-editor-%type_pkg[python]
<<
DescPackaging: <<
# Redo with automake1.9 so py-compile understands DESTDIR
# See: http://bugzilla.gnome.org/show_bug.cgi?id=344047
Patch simple-editor to use the python interp determined by
configure. See: http://bugzilla.gnome.org/show_bug.cgi?id=343978
Use glib2-2.12.0 for GCC version independence
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
<<
--- NEW FILE: gnome-menus2-py-2.20.3.patch ---
diff -Nurd -x'*~' gnome-menus-2.20.3.orig/Makefile.in
gnome-menus-2.20.3/Makefile.in
--- gnome-menus-2.20.3.orig/Makefile.in 2008-01-07 17:29:24.000000000 -0500
+++ gnome-menus-2.20.3/Makefile.in 2008-01-09 10:16:32.000000000 -0500
@@ -245,11 +245,6 @@
NULL =
@[EMAIL PROTECTED] = python simple-editor
ALL_SUBDIRS = \
- po \
- libmenu \
- layout \
- desktop-directories \
- util \
$(NULL)
SUBDIRS = $(ALL_SUBDIRS) $(PYTHON_SUBDIRS)
diff -Nurd -x'*~' gnome-menus-2.14.3.orig/ltmain.sh gnome-menus-2.14.3/ltmain.sh
--- gnome-menus-2.14.3.orig/ltmain.sh 2006-04-29 04:39:27.000000000 -0400
+++ gnome-menus-2.14.3/ltmain.sh 2006-08-11 02:26:59.000000000 -0400
@@ -4015,6 +4015,11 @@
eval test_cmds=\"$archive_expsym_cmds\"
cmds=$archive_expsym_cmds
else
+ if test "x$verstring" = "x0.0"; then
+ tmp_verstring=
+ else
+ tmp_verstring="$verstring"
+ fi
eval test_cmds=\"$archive_cmds\"
cmds=$archive_cmds
fi
diff -Nurd -x'*~' gnome-menus-2.20.3.orig/python/Makefile.in
gnome-menus-2.20.3/python/Makefile.in
--- gnome-menus-2.20.3.orig/python/Makefile.in 2008-01-07 17:29:23.000000000
-0500
+++ gnome-menus-2.20.3/python/Makefile.in 2008-01-09 10:16:32.000000000
-0500
@@ -52,8 +52,7 @@
gmenuLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(gmenu_LTLIBRARIES)
am__DEPENDENCIES_1 =
-gmenu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/libmenu/libgnome-menu.la
+gmenu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_gmenu_la_OBJECTS = gmenu.lo
gmenu_la_OBJECTS = $(am_gmenu_la_OBJECTS)
gmenu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -250,7 +249,6 @@
NULL =
INCLUDES = \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
- -I$(srcdir)/../libmenu \
$(WARN_CFLAGS) \
$(NO_STRICT_ALIASING_CFLAGS) \
$(GLIB_CFLAGS) \
@@ -262,7 +260,7 @@
gmenudir = $(pyexecdir)
gmenu_LTLIBRARIES = gmenu.la
gmenu_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initgmenu
-gmenu_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/libmenu/libgnome-menu.la
+gmenu_la_LIBADD = $(GLIB_LIBS)
gmenu_la_SOURCES = gmenu.c
all: all-am
--- gnome-menus2-dev.patch DELETED ---
Index: gnome-menus2-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-menus2-py.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gnome-menus2-py.patch 15 Jul 2008 01:40:56 -0000 1.4
+++ gnome-menus2-py.patch 20 Oct 2008 02:32:41 -0000 1.5
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' gnome-menus-2.20.3.orig/Makefile.in
gnome-menus-2.20.3/Makefile.in
---- gnome-menus-2.20.3.orig/Makefile.in 2008-01-07 17:29:24.000000000
-0500
-+++ gnome-menus-2.20.3/Makefile.in 2008-01-09 10:16:32.000000000 -0500
-@@ -245,11 +245,6 @@
+diff -Nurd -x'*~' gnome-menus-2.24.0.orig/Makefile.in
gnome-menus-2.24.0/Makefile.in
+--- gnome-menus-2.24.0.orig/Makefile.in 2008-09-22 17:13:06.000000000
-0400
++++ gnome-menus-2.24.0/Makefile.in 2008-10-19 22:18:28.000000000 -0400
+@@ -248,11 +248,6 @@
NULL =
@[EMAIL PROTECTED] = python simple-editor
ALL_SUBDIRS = \
@@ -13,24 +13,9 @@
$(NULL)
SUBDIRS = $(ALL_SUBDIRS) $(PYTHON_SUBDIRS)
-diff -Nurd -x'*~' gnome-menus-2.14.3.orig/ltmain.sh
gnome-menus-2.14.3/ltmain.sh
---- gnome-menus-2.14.3.orig/ltmain.sh 2006-04-29 04:39:27.000000000 -0400
-+++ gnome-menus-2.14.3/ltmain.sh 2006-08-11 02:26:59.000000000 -0400
-@@ -4015,6 +4015,11 @@
- eval test_cmds=\"$archive_expsym_cmds\"
- cmds=$archive_expsym_cmds
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
- eval test_cmds=\"$archive_cmds\"
- cmds=$archive_cmds
- fi
-diff -Nurd -x'*~' gnome-menus-2.20.3.orig/python/Makefile.in
gnome-menus-2.20.3/python/Makefile.in
---- gnome-menus-2.20.3.orig/python/Makefile.in 2008-01-07 17:29:23.000000000
-0500
-+++ gnome-menus-2.20.3/python/Makefile.in 2008-01-09 10:16:32.000000000
-0500
+diff -Nurd -x'*~' gnome-menus-2.24.0.orig/python/Makefile.in
gnome-menus-2.24.0/python/Makefile.in
+--- gnome-menus-2.24.0.orig/python/Makefile.in 2008-09-22 17:13:05.000000000
-0400
++++ gnome-menus-2.24.0/python/Makefile.in 2008-10-19 22:18:28.000000000
-0400
@@ -52,8 +52,7 @@
gmenuLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(gmenu_LTLIBRARIES)
@@ -41,7 +26,7 @@
am_gmenu_la_OBJECTS = gmenu.lo
gmenu_la_OBJECTS = $(am_gmenu_la_OBJECTS)
gmenu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -250,7 +249,6 @@
+@@ -253,7 +252,6 @@
NULL =
INCLUDES = \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
@@ -49,7 +34,7 @@
$(WARN_CFLAGS) \
$(NO_STRICT_ALIASING_CFLAGS) \
$(GLIB_CFLAGS) \
-@@ -262,7 +260,7 @@
+@@ -265,7 +263,7 @@
gmenudir = $(pyexecdir)
gmenu_LTLIBRARIES = gmenu.la
gmenu_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex
initgmenu
Index: gnome-menus2-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-menus2-dev.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gnome-menus2-dev.info 15 Jul 2008 01:40:56 -0000 1.8
+++ gnome-menus2-dev.info 20 Oct 2008 02:32:41 -0000 1.9
@@ -1,29 +1,26 @@
Package: gnome-menus2-dev
-Version: 2.20.3
+Version: 2.24.0
Revision: 1
BuildDepends: <<
fink (>= 0.24.12-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.12.0-1),
- intltool (>= 0.36.0-1),
+ glib2-dev (>= 2.18.0-1),
+ intltool40,
libgettext3-dev,
libiconv-dev,
- pkgconfig
+ pkgconfig (>= 0.23)
<<
Depends: gnome-menus2-shlibs (= %v-%r)
BuildDependsOnly: true
Description: Headers for the gnome-menus lib
-Source: mirror:gnome:sources/gnome-menus/2.20/gnome-menus-%v.tar.bz2
-Source-MD5: b8ab05f5edfdc3e6a46662a504934657
-PatchFile: %n.patch
-PatchFile-MD5: ed9824ee9fe7df1d622e19d17253429b
+Source: mirror:gnome:sources/gnome-menus/2.24/gnome-menus-%v.tar.bz2
+Source-MD5: 1816a0d21ef99d5b3a8bcd033c88f732
PatchScript: <<
- %{default_script}
perl -pi -e 's/(GETTEXT_PACKAGE=gnome-menus)/${1}2/' configure
<<
-ConfigureParams: --disable-dependency-tracking --disable-python
+ConfigureParams: --disable-dependency-tracking --disable-python
--disable-static
InstallScript: <<
make install DESTDIR=%d
mv %i/etc/xdg/menus/applications.menu
%i/etc/xdg/menus/gnome-applications.menu
@@ -32,9 +29,14 @@
SplitOff: <<
Package: gnome-menus2-shlibs
- Depends: glib2-shlibs (>= 2.12.0-1), libgettext3-shlibs, libiconv,
xdg-base
+ Depends: <<
+ glib2-shlibs (>= 2.18.0-1),
+ libgettext3-shlibs,
+ libiconv,
+ xdg-base
+ <<
Files: lib/libgnome-menu.*.dylib share/locale
- Shlibs: %p/lib/libgnome-menu.2.dylib 4.0.0 %n (>= 2.16.0-1)
+ Shlibs: %p/lib/libgnome-menu.2.dylib 5.0.0 %n (>= 2.24.0-1)
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po HACKING
NEWS README
Description: Runtime library for the gnome-menus lib
DescPackaging: <<
@@ -47,11 +49,10 @@
Package: gnome-menus
Depends: gnome-menus2-shlibs (>= 2.20.0-1)
Conflicts: kdelibs3 (<< 3.5.1-1), kdelibs3-ssl (<< 3.5.1-1),
kdelibs3-unified (<< 3.5.1-1)
- Files: bin etc share/desktop-directories
+ Files: etc share/desktop-directories
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po HACKING
NEWS README
ConfFiles: <<
%p/etc/xdg/menus/gnome-applications.menu
- %p/etc/xdg/menus/preferences.menu
%p/etc/xdg/menus/settings.menu
<<
PostInstScript: <<
@@ -73,10 +74,6 @@
<<
<<
-DescPackaging: <<
- Use glib2-2.12.0 for GCC version independence
-<<
-
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
