← Back to branch summary

~ubuntu-branches/ubuntu/saucy/enigma/saucy

« back to all changes in this revision

Viewing changes to debian/patches/system-zipios-and-no-s3m

  • Committer: Package Import Robot
  • Author(s): Erich Schubert
  • Date: 2012-06-19 21:47:22 UTC
  • mfrom: (5.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20120619214722-o8v3jobogn60iw68
Tags: 1.10~~pre-alpha+r2236-1
* New upstream checkout. No release on the horizon, but well playable.
* Acknowledge NMUs. Thank you!
* Drop suggest on enigma-level-previews which are not available for 1.10
* Update policy version, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/system-zipios-and-no-s3m
 
1
--- enigma-1.10~~pre-alpha+r2210.orig/src/Makefile.am
 
2
+++ enigma-1.10~~pre-alpha+r2210/src/Makefile.am
 
3
@@ -13,8 +13,6 @@ CXXFLAGS = @CXXFLAGS@\
 
4
        -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
 
5
        -DDOCDIR=\"$(docdir)\" \
 
6
        -DLOCALEDIR=\"$(localedir_enigma)\" \
 
7
-       -I$(top_srcdir)/lib-src/zipios++  \
 
8
-       -I$(top_builddir)/lib-src/zipios++ \
 
9
        -I$(top_srcdir)/lib-src/lua \
 
10
        -I$(top_srcdir)/lib-src/enigma-core \
 
11
        -I$(top_srcdir)/lib-src/enet/include \
 
12
@@ -442,8 +440,7 @@ enigma_LDADD = \
 
13
        $(top_builddir)/lib-src/lua/liblua.a \
 
14
        $(top_builddir)/lib-src/enet/libenet.a \
 
15
        $(top_builddir)/lib-src/oxydlib/liboxyd.a \
 
16
-       $(top_builddir)/lib-src/zipios++/src/libzipios.a \
 
17
-       -lz \
 
18
+       -lzipios \
 
19
        $(mingw_ldadd) \
 
20
        @SDL_LIBS@
 
21
 
 
22
--- enigma-1.10~~pre-alpha+r2210.orig/src/Makefile.in
 
23
+++ enigma-1.10~~pre-alpha+r2210/src/Makefile.in
 
24
@@ -150,7 +150,6 @@ enigma_DEPENDENCIES = $(top_builddir)/li
 
25
        $(top_builddir)/lib-src/lua/liblua.a \
 
26
        $(top_builddir)/lib-src/enet/libenet.a \
 
27
        $(top_builddir)/lib-src/oxydlib/liboxyd.a \
 
28
-       $(top_builddir)/lib-src/zipios++/src/libzipios.a \
 
29
        $(am__DEPENDENCIES_1)
 
30
 DEFAULT_INCLUDES = -I.@am__isrc@
 
31
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 
32
@@ -192,8 +191,6 @@ CXXFLAGS = @CXXFLAGS@\
 
33
        -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
 
34
        -DDOCDIR=\"$(docdir)\" \
 
35
        -DLOCALEDIR=\"$(localedir_enigma)\" \
 
36
-       -I$(top_srcdir)/lib-src/zipios++  \
 
37
-       -I$(top_builddir)/lib-src/zipios++ \
 
38
        -I$(top_srcdir)/lib-src/lua \
 
39
        -I$(top_srcdir)/lib-src/enigma-core \
 
40
        -I$(top_srcdir)/lib-src/enet/include \
 
41
@@ -735,8 +732,7 @@ enigma_LDADD = \
 
42
        $(top_builddir)/lib-src/lua/liblua.a \
 
43
        $(top_builddir)/lib-src/enet/libenet.a \
 
44
        $(top_builddir)/lib-src/oxydlib/liboxyd.a \
 
45
-       $(top_builddir)/lib-src/zipios++/src/libzipios.a \
 
46
-       -lz \
 
47
+       -lzipios \
 
48
        $(mingw_ldadd) \
 
49
        @SDL_LIBS@
 
50
 
 
51
--- enigma-1.10~~pre-alpha+r2210.orig/data/music/menu/Makefile.am
 
52
+++ enigma-1.10~~pre-alpha+r2210/data/music/menu/Makefile.am
 
53
@@ -1,6 +1,5 @@
 
54
 pkgdatadir = $(datadir)/@PACKAGE@/music/menu
 
55
 pkgdata_DATA = esprit.ogg \
 
56
-               enigma_rag.ogg \
 
57
-               pentagonal_dreams.s3m
 
58
+               enigma_rag.ogg
 
59
 
 
60
 EXTRA_DIST = $(pkgdata_DATA)
 
61
--- enigma-1.10~~pre-alpha+r2210.orig/data/music/menu/Makefile.in
 
62
+++ enigma-1.10~~pre-alpha+r2210/data/music/menu/Makefile.in
 
63
@@ -227,8 +227,7 @@ top_build_prefix = @top_build_prefix@
 
64
 top_builddir = @top_builddir@
 
65
 top_srcdir = @top_srcdir@
 
66
 pkgdata_DATA = esprit.ogg \
 
67
-               enigma_rag.ogg \
 
68
-               pentagonal_dreams.s3m
 
69
+               enigma_rag.ogg
 
70
 
 
71
 EXTRA_DIST = $(pkgdata_DATA)
 
72
 all: all-am