[Enigma-cvs] enigma/etc Info.plist, 1.1, 1.2 enigma.icns, 1.1, 1.2 mac-build.sh, 1.1, 1.2 .cvsignore, 1.2, 1.3 Makefile.am, 1.4, 1.5 enigma.spec.in, 1.1, 1.2 enigma.spec, 1.4, NONE mingw32-dist.sh, 1.9, NONE

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/etc
In directory subversions:/tmp/cvs-serv9138/etc

Modified Files:
        .cvsignore Makefile.am enigma.spec.in 
Added Files:
        Info.plist enigma.icns mac-build.sh 
Removed Files:
        enigma.spec mingw32-dist.sh 
Log Message:
Merged changes from 0_80_rc branch

--- mingw32-dist.sh DELETED ---

Index: enigma.spec.in
===================================================================
RCS file: /cvsroot/enigma/enigma/etc/enigma.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** enigma.spec.in      13 Mar 2003 17:55:33 -0000      1.1
--- enigma.spec.in      18 Oct 2003 13:49:03 -0000      1.2
***************
*** 40,48 ****
  %defattr(-,root,root)
  %doc README AUTHORS ChangeLog COPYING INSTALL NEWS doc/TODO
! %doc doc/HACKING doc/CREATING-LEVELS doc/functions.html doc/functions.css
  %{prefix}/share/enigma
  %{prefix}/bin/enigma
  %doc %{prefix}/man/man?/enigma.*
  
! %changelog
! * Initial specfile by Achim Settelmeier <address@hidden>
--- 40,49 ----
  %defattr(-,root,root)
  %doc README AUTHORS ChangeLog COPYING INSTALL NEWS doc/TODO
! # %doc doc/HACKING doc/functions.html doc/functions.css
! # %doc doc/manual/* doc/manual/images/*
  %{prefix}/share/enigma
  %{prefix}/bin/enigma
  %doc %{prefix}/man/man?/enigma.*
  
! # %changelog
! # * Initial specfile by Achim Settelmeier <address@hidden>

--- NEW FILE: enigma.icns ---
(This appears to be a binary file; contents omitted.)

Index: .cvsignore
===================================================================
RCS file: /cvsroot/enigma/enigma/etc/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .cvsignore  9 Feb 2003 21:22:30 -0000       1.2
--- .cvsignore  18 Oct 2003 13:49:03 -0000      1.3
***************
*** 2,3 ****
--- 2,5 ----
  Makefile
  Makefile.in
+ enigma.spec
+ mingw32-dist.sh

--- NEW FILE: mac-build.sh ---
export CPPFLAGS="-I`sdl-config --prefix`/include -DMACOSX"
export LDFLAGS=-L`sdl-config --prefix`/lib
./configure
make
cd src
make bundle-fw

Index: Makefile.am
===================================================================
RCS file: /cvsroot/enigma/enigma/etc/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am 14 Sep 2003 19:32:35 -0000      1.4
--- Makefile.am 18 Oct 2003 13:49:03 -0000      1.5
***************
*** 1,15 ****
  # if !MINGW32
  # Comply with xdg icon theme specification
! icondir = $(datadir)/icons/hicolor/48x48/apps
  icon_DATA = enigma.png
  
  # Backwards-compatible global search location for images
! pixmapdir = $(datadir)/pixmaps
  pixmap_DATA = enigma.png
  
  # Install .desktop file in xdg standard location
! desktopdir = $(datadir)/applications
  desktop_DATA = enigma.desktop
  # endif !MINGW32
  
! EXTRA_DIST =   enigma.spec mingw32-configure.sh mingw32-dist.sh nlcvt.pl 
enigma.desktop enigma.png
--- 1,28 ----
  # if !MINGW32
  # Comply with xdg icon theme specification
! icondir = $(prefix)/share/icons/hicolor/48x48/apps
  icon_DATA = enigma.png
  
  # Backwards-compatible global search location for images
! pixmapdir = $(prefix)/share/pixmaps
  pixmap_DATA = enigma.png
  
  # Install .desktop file in xdg standard location
! desktopdir = $(prefix)/share/applications
  desktop_DATA = enigma.desktop
  # endif !MINGW32
  
! EXTRA_DIST = \
!       enigma.spec.in \
!       enigma.spec \
!       mingw32-configure.sh \
!       mingw32-dist.sh.in \
!       mingw32-dist.sh \
!       nlcvt.pl \
!       enigma.desktop \
!       enigma.png \
!       Info.plist \
!       enigma.icns \
!       mac-build.sh \
!       README-SDL.txt \
!       enigma.nsi

--- enigma.spec DELETED ---

--- NEW FILE: Info.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" 
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
<plist version="1.0">
<dict>
        <key>CFBundleDevelopmentRegion</key>
        <string>German</string>
        <key>CFBundleExecutable</key>
        <string>Enigma</string>
        <key>CFBundleIconFile</key>
        <string>enigma.icns</string>
        <key>CFBundleIdentifier</key>
        <string>application/x-vnd.enigma.oxyd</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
        <string>Enigma</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <string>0.80</string>
        <key>NSMainNibFile</key>
        <string>SDLMain</string>
        <key>NSPrincipalClass</key>
        <string>NSApplication</string>
</dict>
</plist>