summaryrefslogtreecommitdiff
blob: 632c10ba099a4020137f87efb4b17c0dff59ccfd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
diff -ru enigma-1.20.orig/Makefile.am enigma-1.20/Makefile.am
--- enigma-1.20.orig/Makefile.am	2013-04-01 14:31:58.000000000 -0400
+++ enigma-1.20/Makefile.am	2013-05-07 18:50:08.624851119 -0400
@@ -3,12 +3,9 @@
 #   tools -> lib-src/lua
 #   src   -> tools, lib-src
 #
-SUBDIRS = m4 lib-src tools intl src data doc po etc
+SUBDIRS = m4 lib-src tools intl src data po etc
 EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
 
-docdir = @datadir@/doc/enigma
-doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
-
 ACLOCAL_AMFLAGS = -I m4
 
 .PHONY: tolua
diff -ru enigma-1.20.orig/configure.ac enigma-1.20/configure.ac
--- enigma-1.20.orig/configure.ac	2013-04-01 14:33:05.000000000 -0400
+++ enigma-1.20/configure.ac	2013-05-07 18:47:52.420666003 -0400
@@ -292,7 +292,6 @@
 	CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer"
 	AC_MSG_RESULT(yes)
 else
-	CXXFLAGS="$CXXFLAGS -g"
 	AC_MSG_RESULT(no)
 fi
 
diff -ru enigma-1.20.orig/etc/Makefile.am enigma-1.20/etc/Makefile.am
--- enigma-1.20.orig/etc/Makefile.am	2013-04-01 14:31:57.000000000 -0400
+++ enigma-1.20/etc/Makefile.am	2013-05-07 18:48:20.707666061 -0400
@@ -1,14 +1,14 @@
 # if !MINGW32
 # Comply with xdg icon theme specification
-icondir = $(prefix)/share/icons/hicolor/48x48/apps
+icondir = /usr/share/icons/hicolor/48x48/apps
 icon_DATA = enigma.png
 
 # Backwards-compatible global search location for images
-pixmapdir = $(prefix)/share/pixmaps
+pixmapdir = /usr/share/pixmaps
 pixmap_DATA = enigma.png
 
 # Install .desktop file in xdg standard location
-desktopdir = $(prefix)/share/applications
+desktopdir = /usr/share/applications
 desktop_DATA = enigma.desktop
 # endif !MINGW32
 
diff -ru enigma-1.20.orig/etc/enigma.desktop enigma-1.20/etc/enigma.desktop
--- enigma-1.20.orig/etc/enigma.desktop	2013-04-01 14:31:57.000000000 -0400
+++ enigma-1.20/etc/enigma.desktop	2013-05-07 18:49:07.889998154 -0400
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 
 Name=Enigma
@@ -8,7 +7,6 @@
 Comment=Uncover pairs of stones while navigating obstacles using a marble
 Comment[eo]=Malkovru parojn de ŝtonojn dum vi navigas obstaklojn kun globeto
 
-FilePattern=enigma;
 TryExec=enigma
 Exec=enigma
 Terminal=false
@@ -17,5 +15,5 @@
 StartupNotify=false
 
 Type=Application
-Categories=Application;Game;PuzzleGame;
+Categories=Game;X-PuzzleGame;
 
diff -ru enigma-1.20.orig/lib-src/Makefile.am enigma-1.20/lib-src/Makefile.am
--- enigma-1.20.orig/lib-src/Makefile.am	2013-04-01 14:33:52.000000000 -0400
+++ enigma-1.20/lib-src/Makefile.am	2013-05-07 18:49:37.009968740 -0400
@@ -1 +1 @@
-SUBDIRS = oxydlib lua zipios++ enet enigma-core
+SUBDIRS = oxydlib lua zipios++ enigma-core
diff -ru enigma-1.20.orig/po/Makefile.in.in enigma-1.20/po/Makefile.in.in
--- enigma-1.20.orig/po/Makefile.in.in	2013-04-01 14:34:35.000000000 -0400
+++ enigma-1.20/po/Makefile.in.in	2013-05-07 18:50:47.291484194 -0400
@@ -25,12 +25,12 @@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = /usr/share/locale
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@ 
+MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
 #install_sh@ -d
 mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
diff -ru enigma-1.20.orig/src/Makefile.am enigma-1.20/src/Makefile.am
--- enigma-1.20.orig/src/Makefile.am	2013-04-01 14:33:59.000000000 -0400
+++ enigma-1.20/src/Makefile.am	2013-05-07 18:51:50.173261187 -0400
@@ -12,12 +12,11 @@
 CXXFLAGS = @CXXFLAGS@\
 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
 	-DDOCDIR=\"$(docdir)\" \
-	-DLOCALEDIR=\"$(localedir_enigma)\" \
+	-DLOCALEDIR=\"/usr/share/locale\" \
 	-I$(top_srcdir)/lib-src/zipios++  \
 	-I$(top_builddir)/lib-src/zipios++ \
 	-I$(top_srcdir)/lib-src/lua \
 	-I$(top_srcdir)/lib-src/enigma-core \
-	-I$(top_srcdir)/lib-src/enet/include \
 	-I$(top_srcdir)/lib-src \
 	-I$(top_builddir)/intl @SDL_CFLAGS@
 
@@ -433,7 +432,7 @@
 
 else # not MINGW32
 
-  localedir_enigma := $(datadir)/locale
+  localedir_enigma := /usr/share/locale
   mingw_ldadd =
 
 endif
@@ -442,7 +441,7 @@
 	@LIBINTL@ \
 	$(top_builddir)/lib-src/enigma-core/libecl.a \
 	$(top_builddir)/lib-src/lua/liblua.a \
-	$(top_builddir)/lib-src/enet/libenet.a \
+	-lenet \
 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
 	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
 	-lz \