Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22692
Modified Files:
denemo.info denemo.patch
Log Message:
New version 0.8.0
Index: denemo.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/denemo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- denemo.patch 20 Jan 2006 20:30:47 -0000 1.1
+++ denemo.patch 24 Jan 2009 13:07:03 -0000 1.2
@@ -1,111 +1,31 @@
-diff -Nurd -x'*~' denemo-0.7.4.orig/keymaps/Makefile.in
denemo-0.7.4/keymaps/Makefile.in
---- denemo-0.7.4.orig/keymaps/Makefile.in 2005-11-02 17:40:41.000000000
-0500
-+++ denemo-0.7.4/keymaps/Makefile.in 2005-12-30 11:45:40.000000000 -0500
-@@ -198,7 +198,7 @@
- dist_sysconf_DATA = denemo.keymaprc
- dist_pkgdata_DATA = french.keymaprc \
- english.keymaprc italian.keymaprc \
-- speedy.keymaprc
-+ speedy.keymaprc macosx.keymaprc
+--- denemo-0.8.0/Makefile.in 2008-10-20 16:13:36.000000000 +0200
++++ denemo-0.8.0_corr/Makefile.in 2009-01-22 17:10:59.000000000 +0100
+@@ -648,8 +648,8 @@
- all: all-am
-diff -Nurd -x'*~' denemo-0.7.4.orig/keymaps/macosx.keymaprc
denemo-0.7.4/keymaps/macosx.keymaprc
---- denemo-0.7.4.orig/keymaps/macosx.keymaprc 1969-12-31 19:00:00.000000000
-0500
-+++ denemo-0.7.4/keymaps/macosx.keymaprc 2005-12-30 11:44:21.000000000
-0500
-@@ -0,0 +1,74 @@
-+CursorLeft h Left
-+CursorDown Down
-+CursorUp Up
-+CursorRight Right
-+StaffUp Up(4)
-+StaffDown Down(4)
-+MeasureLeft Left(4)
-+MeasureRight Right(4)
-+ToNearestA a
-+ToNearestB b
-+ToNearestC c
-+ToNearestD d
-+ToNearestE e
-+ToNearestF f
-+ToNearestG g
-+OctaveUp apostrophe(1)
-+OctaveDown comma
-+InsertWholeNote 1
-+InsertHalfNote 2
-+InsertQuarterNote 3
-+InsertEighthNote 4
-+InsertSixteenthNote 5
-+InsertThirtysecondNote 6
-+InsertSixtyfourthNote 7
-+ToggleRestMode Escape
-+InsertWholeRest 1(4)
-+InsertHalfRest 2(4)
-+InsertQuarterRest 3(4)
-+InsertEighthRest 4(4)
-+InsertSixteenthRest 5(4)
-+InsertThirtysecondRest 6(4)
-+InsertSixtyfourthRest 7(4)
-+InsertArbitraryTuplet t
-+Insert2/3Tuplet numbersign(1)
-+Insert4/5Tuplet percent(1)
-+Insert4/6Tuplet question(1)
-+Insert4/7Or8/7Tuplet ampersand(1)
-+Insert8/9Tuplet asterisk(1)
-+AddTone Return
-+RemoveTone Return(1)
-+Sharpen/StemDown equal
-+Flatten/StemUp minus
-+ChangeToWholeNote F1
-+ChangeToHalfNote F2
-+ChangeToQuarterNote F3
-+ChangeToEighthNote F4
-+ChangeToSixteenthNote F5
-+ChangeToThirtysecondNote F6
-+ChangeToSixtyfourthNote F7
-+AddDot .
-+RemoveDot quotedbl(1)
-+ToggleTie T(1)
-+DeleteObject Delete
-+DeletePreviousObject BackSpace
-+InsertMeasure m
-+AppendMeasure M(1)
-+DeleteMeasure Delete(4)
-+DeleteStaff Delete(1)
-+ShrinkMeasures Left(4)
-+WidenMeasures Right(4)
-+ShorterStaffs Up(4)
-+TallerStaffs Down(4)
-+SetMark space
-+UnsetMark space(4)
-+ToggleBeginSlur parenleft
-+ToggleEndSlur parenright
-+ToggleAccent exclam(1)
-+ToggleFermata Mode_switch
-+ToggleStaccato period(4)
-+ToggleTenuto underscore(1)
-+ToggleTrill ccedilla
-+ToggleTurn ccedilla(4)
-+ToggleMordent w
-+ToggleStaccatissimo semicolon
-\ No newline at end of file
-diff -Nurd -x'*~' denemo-0.7.4.orig/src/file.cpp denemo-0.7.4/src/file.cpp
---- denemo-0.7.4.orig/src/file.cpp 2005-10-27 17:18:00.000000000 -0400
-+++ denemo-0.7.4/src/file.cpp 2005-12-30 11:52:14.000000000 -0500
-@@ -35,7 +35,9 @@
+ install-data-hook:
+- cp -r actions $(datadir)/${PACKAGE}/
+- chmod -R 755 $(datadir)/${PACKAGE}/actions
++ cp -r actions $(DESTDIR)$(datadir)/${PACKAGE}/
++ chmod -R 755 $(DESTDIR)$(datadir)/${PACKAGE}/actions
+ dist-hook: @[email protected]
+ cp $(srcdir)/@[email protected] $(distdir)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- denemo-0.8.0/src/file.c 2008-10-20 16:11:04.000000000 +0200
++++ denemo-0.8.0_corr/src/file.c 2009-01-22 17:10:59.000000000 +0100
+@@ -33,7 +33,9 @@
+ #include <string.h>
#include <sys/stat.h> /* check existance and type of files */
#include <dirent.h> /* filter and sort filenames */
- #include <fnmatch.h> /* find filenames matches */
+#ifdef HAVE_MALLOC_H
#include <malloc.h> /* I use free() */
+#endif
- typedef enum
-diff -Nurd -x'*~' denemo-0.7.4.orig/src/lyparser.cpp
denemo-0.7.4/src/lyparser.cpp
---- denemo-0.7.4.orig/src/lyparser.cpp 2005-10-31 04:46:02.000000000 -0500
-+++ denemo-0.7.4/src/lyparser.cpp 2005-12-30 12:17:37.000000000 -0500
-@@ -487,7 +487,9 @@
+
+--- denemo-0.8.0/src/lyparser.y 2008-09-04 18:33:02.000000000 +0200
++++ denemo-0.8.0_corr/src/lyparser.y 2009-01-22 17:10:59.000000000 +0100
+@@ -169,7 +169,9 @@
// needed for bison.simple's malloc () and free ()
@@ -115,10 +35,9 @@
#include <stdlib.h>
#include <stdio.h>
-diff -Nurd -x'*~' denemo-0.7.4.orig/src/main.cpp denemo-0.7.4/src/main.cpp
---- denemo-0.7.4.orig/src/main.cpp 2005-10-31 03:41:57.000000000 -0500
-+++ denemo-0.7.4/src/main.cpp 2005-12-30 12:00:59.000000000 -0500
-@@ -22,6 +22,9 @@
+--- denemo-0.8.0/src/main.c 2008-10-20 16:11:04.000000000 +0200
++++ denemo-0.8.0_corr/src/main.c 2009-01-22 17:10:59.000000000 +0100
+@@ -26,6 +26,9 @@
#include <wait.h>
#endif
#ifdef HAVE_SYS_RESOURCE_H
Index: denemo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/denemo.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- denemo.info 15 Jul 2008 01:41:22 -0000 1.6
+++ denemo.info 24 Jan 2009 13:07:03 -0000 1.7
@@ -1,21 +1,62 @@
Package: denemo
-Version: 0.7.4
-Revision: 1004
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 5a5680b2dab63a6217c0ab7c30be0730
-BuildDepends: glitz, expat1, libpng3, cairo (>= 1.6-1), fontconfig2-dev (>=
2.4.1-1), freetype219 (>= 2.3.5-1), xft2-dev, x11-dev, gtk+2-dev (>= 2.12.0-1),
libxml2 (>= 2.6.30-1), glib2-dev (>= 2.14.0-1), libgettext3-dev, gettext-bin,
gettext-tools, libiconv-dev, atk1 (>= 1.20.0-1), pango1-xft2-ft219-dev (>=
1.18.4-4), pixman (>= 0.10.0-1), pkgconfig (>= 0.21-1)
-Depends: x11, gtk+2-shlibs (>= 2.12.0-1), libxml2-shlibs (>= 2.6.30-1),
glib2-shlibs (>= 2.14.0-1), libgettext3-shlibs, libiconv, atk1-shlibs (>=
1.20.0-1), pango1-xft2-ft219-shlibs (>= 1.18.4-4)
+Version: 0.8.0
+Revision: 1001
+Source: http://download.savannah.gnu.org/releases/%n/%n-%v.tar.gz
+Source-MD5: a19e15130f9c7fcdcef03daefc342d0c
+BuildDepends: <<
+ atk1 (>= 1.20.0-1),
+ cairo (>= 1.6-1),
+ expat1,
+ fontconfig2-dev (>= 2.4.1-1),
+ freetype219 (>= 2.3.5-1),
+ gettext-bin,
+ gettext-tools,
+ glib2-dev (>= 2.14.0-1),
+ glitz,
+ gtk+2-dev (>= 2.12.0-1),
+ guile18-dev,
+ libaubio2,
+ libgettext3-dev,
+ libiconv-dev,
+ libpng3,
+ libtool2,
+ libxml2 (>= 2.6.30-1),
+ pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pixman (>= 0.10.0-1),
+ pkgconfig (>= 0.21-1),
+ portaudio2 (>= 2.19.0-4),
+ x11-dev,
+ xft2-dev
+<<
+Depends: <<
+ atk1-shlibs (>= 1.20.0-1),
+ cairo-shlibs (>= 1.6-1),
+ expat1-shlibs,
+ freetype219-shlibs (>= 2.3.5-1),
+ glib2-shlibs (>= 2.14.0-1),
+ glitz-shlibs,
+ gmp-shlibs,
+ gtk+2-shlibs (>= 2.12.0-1),
+ guile18-shlibs,
+ libaubio2-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libpng3-shlibs,
+ libtool2-shlibs,
+ libxml2-shlibs (>= 2.6.30-1),
+ pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ pixman-shlibs (>= 0.10.0-1),
+ portaudio2-shlibs (>= 2.19.0-4),
+ x11
+<<
BuildConflicts: libgnugetopt
Recommends: lilypond
-ConfigureParams: --disable-nls --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
PATH=%p/share/guile/1.8/scripts/binoverride:$PATH --sysconfdir=%p/etc
GCC: 4.0
Patch: %n.patch
-PatchScript: <<
- cp -f keymaps/macosx.keymaprc keymaps/denemo.keymaprc
- perl -pi -e 's/g_string_equal/ly_g_string_equal/g' src/lyparserfuncs.cpp
-<<
-ConfFiles: %p/etc/denemo.conf
-DocFiles: AUTHORS COPYING DESIGN GOALS NEWS README
+InstallScript: make install DESTDIR=%d
+ConfFiles: %p/etc/%n/denemo.conf
+DocFiles: AUTHORS COPYING NEWS README doc
Description: Graphical musical score editor
DescDetail: <<
Denemo is the GNU graphical musical score editor, and serves as a frontend to
@@ -23,18 +64,8 @@
Though its behavior and features will no doubt continue to be refined, it is
already perfectly usable.
<<
-DescUsage: <<
-The provided keymapping is somewhat different from the one described
-in share/doc/denemo/README because of the way the keyboard is mapped
-in XDarwin. Note also that the keymapping was done on a french
-keyboard so everything may not work for you. You can refer to
-.denemo/keymaprc in your home directory for more details.
-<<
DescPort: <<
Mostly changes around malloc.h
-NLS disabled due to a bug with keymapping
-OS X keymapping provided as default
-Avoid symbol collision with glib2
<<
License: GPL
Maintainer: sinclair44 <[email protected]>
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
