← Back to branch summary

~ubuntu-branches/ubuntu/lucid/transmission/lucid

« back to all changes in this revision

Viewing changes to .pc/01_lpi.patch/gtk/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Krzysztof Klimonda, Krzysztof Klimonda, Chris Coulson
  • Date: 2010-03-03 02:55:26 UTC
  • mfrom: (1.1.34 upstream) (2.1.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100303025526-qcjmpnlvk9jv3y5o
Tags: 1.92-0ubuntu1
https://launchpad.net/bugs/538034
https://launchpad.net/bugs/518692
https://launchpad.net/bugs/529037
https://launchpad.net/bugs/527299
https://launchpad.net/bugs/505861
https://launchpad.net/bugs/542194
[ Krzysztof Klimonda ]
* New upstream release (LP: #538034), rebased on debian testing.
  Remaining changes:
  - debian/control:
    + Added replaces & provides clutch (now included as part of transmission).
      Can be removed in lucid+1
    + Added liblaunchpad-integration-dev and lsb-release to Build-Depends
  - debian/rules:
    + create a po template during package build.
  - debian/patches/01_lpi.patch:
    + integrate transmission with launchpad
  - debian/patches/20_add_x-ubuntu-gettext-domain.diff:
    + add x-ubuntu-gettext-domain to .desktop file.
  - debian/transmission-daemon.default:
    - remove --auth from OPTIONS
  - debian/control, debian/rules:
    + build transmission gtk+ client with both gconf and libcanberra support.
  - debian/patches/dont_build_libevent.patch:
    + disable libevent in configure.ac and Makefile.am because we use autotools
      to regenerate build files.
  - lucid/debian/patches/updateminiupnpcstrings_double_escape_slash.patch:
    + Deleted as the bug is fixed upstream
* Fixes bugs:
  - Fix directory selection error in GTK+ 2.19 (LP: #518692)
  - Transmission "Set Location" - dialog doesn't disappear (LP: #529037)
  - The "Torrent Options" dialog's Torrent Priority row gets too much
    vertical stretch (LP: #527299)
  - "Open Folder" behavior can be confusing for single-file torrents
    (LP: #505861)
* Refreshed 99_autoreconf.patch

[ Chris Coulson ]
* debian/patches/disable_web_ui.patch:
  - Disable the web UI by default again (LP: #542194)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/01_lpi.patch/gtk/Makefile.am
 
1
SUBDIRS = icons
 
2
 
 
3
if TR_UNSTABLE
 
4
GTK_EXTRA_CPPFLAGS=-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED
 
5
endif
 
6
 
 
7
# these should go in GTK_EXTRA_CPPFLAGS at some point, but not yet because it breaks libnotify's headers
 
8
# -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
 
9
 
 
10
sexy-marshal.h: marshal.list
 
11
        glib-genmarshal --prefix=sexy_marshal ./marshal.list --header > sexy-marshal.h
 
12
 
 
13
sexy-marshal.c: marshal.list
 
14
        echo '#include "sexy-marshal.h"' > sexy-marshal.c
 
15
        glib-genmarshal --prefix=sexy_marshal ./marshal.list --body >> sexy-marshal.c
 
16
 
 
17
AM_CPPFLAGS = \
 
18
    -I$(top_srcdir) \
 
19
    -DTRANSMISSIONLOCALEDIR=\""$(transmissionlocaledir)"\" \
 
20
    $(GTK_EXTRA_CPPFLAGS)
 
21
 
 
22
AM_CFLAGS = \
 
23
    @LIBAPPINDICATOR_CFLAGS@ \
 
24
    @LIBEVENT_CFLAGS@ \
 
25
    @LIBCANBERRA_CFLAGS@ \
 
26
    @LIBGCONF_CFLAGS@ \
 
27
    @GTK_CFLAGS@ \
 
28
    @LIBCURL_CFLAGS@ \
 
29
    @GIO_CFLAGS@ \
 
30
    @LIBNOTIFY_CFLAGS@ \
 
31
    @DBUS_GLIB_CFLAGS@ \
 
32
    @OPENSSL_CFLAGS@ \
 
33
    @ZLIB_CFLAGS@ \
 
34
    @PTHREAD_CFLAGS@
 
35
 
 
36
AM_LDFLAGS = \
 
37
    @ZLIB_LDFLAGS@
 
38
 
 
39
noinst_HEADERS = \
 
40
    actions.h \
 
41
    add-dialog.h \
 
42
    conf.h \
 
43
    details.h \
 
44
    dialogs.h \
 
45
    hig.h \
 
46
    icons.h \
 
47
    file-list.h \
 
48
    lock.h \
 
49
    logo.h \
 
50
    makemeta-ui.h \
 
51
    msgwin.h \
 
52
    notify.h \
 
53
    options-icon.h \
 
54
    ratio-icon.h \
 
55
    relocate.h \
 
56
    stats.h \
 
57
    sexy-icon-entry.h \
 
58
    sexy-marshal.h \
 
59
    torrent-cell-renderer.h \
 
60
    tracker-list.h \
 
61
    tr-core.h \
 
62
    tr-core-dbus.h \
 
63
    tr-icon.h \
 
64
    tr-prefs.h \
 
65
    tr-torrent.h \
 
66
    tr-window.h \
 
67
    turtles.h \
 
68
    ui.h \
 
69
    util.h
 
70
 
 
71
bin_PROGRAMS = transmission
 
72
 
 
73
dbus_generated_sources = tr-core-dbus.h
 
74
 
 
75
transmission_SOURCES = \
 
76
    actions.c \
 
77
    add-dialog.c \
 
78
    conf.c \
 
79
    details.c \
 
80
    dialogs.c \
 
81
    file-list.c \
 
82
    hig.c \
 
83
    icons.c \
 
84
    main.c \
 
85
    makemeta-ui.c \
 
86
    msgwin.c \
 
87
    notify.c \
 
88
    relocate.c \
 
89
    sexy-icon-entry.c \
 
90
    sexy-marshal.c \
 
91
    stats.c \
 
92
    torrent-cell-renderer.c \
 
93
    tracker-list.c \
 
94
    tr-core.c \
 
95
    tr-icon.c \
 
96
    tr-prefs.c \
 
97
    tr-torrent.c \
 
98
    tr-window.c \
 
99
    util.c \
 
100
    $(dbus_generated_sources)
 
101
 
 
102
dist_man_MANS = transmission.1
 
103
 
 
104
transmission_LDADD = \
 
105
    $(top_builddir)/libtransmission/libtransmission.a \
 
106
    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
 
107
    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 
108
    @LIBCANBERRA_LIBS@ \
 
109
    @LIBGCONF_LIBS@ \
 
110
    @DHT_LIBS@ \
 
111
    @GTK_LIBS@ \
 
112
    @GIO_LIBS@ \
 
113
    @LIBAPPINDICATOR_LIBS@ \
 
114
    @LIBNOTIFY_LIBS@ \
 
115
    @LIBEVENT_LIBS@ \
 
116
    @DBUS_GLIB_LIBS@ \
 
117
    @LIBCURL_LIBS@ \
 
118
    @OPENSSL_LIBS@ \
 
119
    @ZLIB_LIBS@ \
 
120
    @PTHREAD_LIBS@
 
121
 
 
122
DESKTOP_IN_FILES=transmission.desktop.in
 
123
DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
 
124
@INTLTOOL_DESKTOP_RULE@
 
125
 
 
126
Productivitydir = $(datadir)/applications
 
127
Productivity_DATA = $(DESKTOP_FILES)
 
128
 
 
129
icon_DATA = transmission.png
 
130
icondir = $(datadir)/pixmaps
 
131
 
 
132
EXTRA_DIST = \
 
133
    $(DESKTOP_IN_FILES) \
 
134
    marshal.list \
 
135
    tr-core-dbus.xml \
 
136
    transmission.png
 
137
 
 
138
DISTCLEANFILES = \
 
139
    transmission.desktop
 
140
 
 
141
CLEANFILES = $(dbus_generated_sources)
 
142
 
 
143
$(srcdir)/tr-core.c: tr-core-dbus.h
 
144
 
 
145
tr-core-dbus.h: $(srcdir)/tr-core-dbus.xml
 
146
        $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tr_core $< > $(@F)
 
147
 
 
148
if WIN32
 
149
 
 
150
transmission.res: transmission.rc
 
151
        $(WINDRES) -J rc -i transmission.rc -O coff -o transmission.res
 
152
 
 
153
BUILT_SOURCES = \
 
154
        sexy-marshal.h \
 
155
        sexy-marshal.c \
 
156
        setransmission.res
 
157
 
 
158
CLEANFILES += \
 
159
        transmission.res
 
160
 
 
161
transmission_LDADD += \
 
162
        transmission.res
 
163
 
 
164
transmission_LDFLAGS = \
 
165
        -mwindows
 
166
 
 
167
else
 
168
 
 
169
BUILT_SOURCES = \
 
170
        sexy-marshal.h \
 
171
        sexy-marshal.c
 
172
 
 
173
endif