← Back to branch summary

~ubuntu-branches/ubuntu/wily/network-manager-applet/wily-proposed

« back to all changes in this revision

Viewing changes to src/connection-editor/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2015-01-26 23:08:58 UTC
  • mfrom: (1.2.37)
  • Revision ID: package-import@ubuntu.com-20150126230858-fmlex10ew00r1u9p
Tags: 0.9.10.1-0ubuntu1
* New upstream release: 0.9.10.1.
* Resync packaging with Debian:
  - debian/rules: Set DEB_HOST_MULTIARCH, use dh_install exclusions rather
    than removing .la and .a files separately. 
  - debian/control: Build-depends: update NM b-deps, 
    bump to dh 9, update libgtk/libglib2.0 b-deps versions and make
    libnm-gtk Multi-Arch-aware.
  - debian/*.install: update paths for multi-arch.
  - debian/compat: bump to compat level 9.
* debian/patches dropped because they were applied upstream:
  - git_use_paths_in_vpn_name_files_4867951.patch,
  - git_revert_system_ca_cert.patch,
  - lp289466_always_show_tray_icon.patch,
  - key-certificate-extensions.patch,
  - lp829673_gconf_hide_applet.patch,
  - 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
* debian/patches/lp328572-dxteam-connect-text.patch,
  debian/patches/lp330571_dxteam_wired_connect_text.patch,
  debian/patches/lp330608_dxteam_gsm_connect_text.patch: stop carrying
  needless string changes causing delta with upstream; any changes to the
  strings should happen there so we stay in sync.
  dropped; included upstream.
* Refreshed remaining patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/connection-editor/Makefile.am
3
3
nm_connection_editor_CPPFLAGS = \
4
4
        $(GTK_CFLAGS) \
5
5
        $(NMA_CFLAGS) \
 
6
        -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_10 \
 
7
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10 \
6
8
        -DICONDIR=\""$(datadir)/icons"\" \
7
9
        -DUIDIR=\""$(uidir)"\" \
8
10
        -DBINDIR=\""$(bindir)"\" \
55
57
        page-master.c \
56
58
        page-bond.h \
57
59
        page-bond.c \
 
60
        page-team.h \
 
61
        page-team.c \
 
62
        page-team-port.h \
 
63
        page-team-port.c \
58
64
        page-bridge.h \
59
65
        page-bridge.c \
60
66
        page-bridge-port.h \
61
67
        page-bridge-port.c \
62
68
        page-vlan.h \
63
69
        page-vlan.c \
 
70
        page-dcb.c \
 
71
        page-dcb.h \
64
72
        vpn-helpers.h \
65
73
        vpn-helpers.c \
66
74
        ip4-routes-dialog.h \
97
105
        ce-page-wimax.ui \
98
106
        ce-page-infiniband.ui \
99
107
        ce-page-bond.ui \
 
108
        ce-page-team.ui \
 
109
        ce-page-team-port.ui \
100
110
        ce-page-bridge.ui \
101
111
        ce-page-bridge-port.ui \
102
112
        ce-page-ip4.ui \
107
117
        ce-page-mobile.ui \
108
118
        ce-page-ppp.ui \
109
119
        ce-ppp-auth-methods.ui \
110
 
        ce-page-vlan.ui
 
120
        ce-page-vlan.ui \
 
121
        ce-page-dcb.ui
111
122
 
112
123
BUILT_SOURCES = nm-connection-editor-service-glue.h
113
124