← Back to branch summary

~udienz/blankon/network-manager-applet.head

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2010-11-29 15:36:51 UTC
  • mfrom: (164.1.6 network-manager-applet)
  • Revision ID: mathieu-tl@ubuntu.com-20101129153651-othu4n02qch2wx3x
(merging lp:~mathieu-tl/network-manager-applet/appindicator-support)
* upstream snapshot 2010-11-23 16:16:08 (GMT)
  + f143e7629749acdb20de072372fbd471ec2c19a8
* more workflow updates to get the daily builds to work with different branches
  - update debian/rules
* Now draw the applet and applet's menus using libappindicator.
  - add debian/patches/nm-applet-use-indicator.patch
  - update debian/patches/series
* Explicitly turn on libappindicator support with --enable-indicator.
  - update debian/rules
* Add Build-Depends for libappindicator-dev
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
19
19
        --without-gnutls \
20
20
        --with-nss \
21
21
        --with-mbca \
 
22
        --enable-indicator \
22
23
        $(NULL)
23
24
 
24
25
GIT_URL := git://git.gnome.org/network-manager-applet
92
93
        $(call GET_SOURCE, $$git_version, "current")
93
94
 
94
95
get-orig-source:: $(if $(LOCAL_BRANCH),update-local-branch)
95
 
        $(call GET_SOURCE, $(GIT_BRANCH), "orig")
 
96
        $(call GET_SOURCE, "HEAD", "orig")
96
97
 
97
98
update-local-branch::
98
99
        @echo "updating local branch ($(LOCAL_BRANCH))"
99
100
        @set -e; if ! test -d $(LOCAL_BRANCH); then mkdir -p $(LOCAL_BRANCH); fi
100
101
        @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi
101
102
        @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); if ! `git branch | grep -q -c "$(GIT_BRANCH)"`; then git branch $(GIT_BRANCH) remotes/origin/$(GIT_BRANCH); fi
102
 
        @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git pull -f
 
103
        @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git checkout $(GIT_BRANCH); git pull -f
103
104
        @echo "updated local branch ($(LOCAL_BRANCH))"
104
105
 
105
106
get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch)