← Back to branch summary

~themuso/ubiquity/a11y-improvements

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Jeremy Bicha
  • Date: 2013-07-11 18:23:07 UTC
  • mto: This revision was merged to the branch mainline in revision 5954.
  • Revision ID: jbicha@ubuntu.com-20130711182307-tevgbbm0cq3wobmo
https://launchpad.net/bugs/1164573
* Automatic update of included source packages: grub-installer
  1.78ubuntu7.
* Don't tell automake to install everything to ubiquity-frontend-gtk and
  try to clean up after
* Reorganize app icon handling
  - Fixes missing app icon in GNOME Shell (LP: #1164573)
  - Use improved icon from Humanity as fallback icon
* Update *.install files for above changes
* Fix minor lintian warning by not installing empty /usr/share/applications/

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
89
89
endif
90
90
        dh_installdirs
91
91
 
92
 
        # For the meantime, nearly everything automake wants to install is
93
 
        # part of the GTK frontend.
94
 
ifndef UBIQUITY_NO_GTK
95
 
        $(MAKE) install DESTDIR=$(CURDIR)/debian/ubiquity-frontend-gtk
96
 
        rm -rf debian/ubiquity-frontend-gtk/usr/share/applications \
97
 
                debian/ubiquity-frontend-gtk/usr/share/ubiquity/pixmaps
98
 
        rm -f debian/ubiquity-frontend-gtk/usr/lib/$(DEB_HOST_MULTIARCH)/libubi*.la
99
 
        mv debian/ubiquity-frontend-gtk/usr/share/polkit-1 debian/ubiquity/usr/share/
100
 
ifneq (,$(DEB_HOST_MULTIARCH))
101
 
        mv debian/ubiquity-frontend-gtk/usr/lib/$(DEB_HOST_MULTIARCH)/girepository-1.0 \
102
 
           debian/ubiquity-frontend-gtk/usr/lib/
103
 
endif
104
 
endif
 
92
        $(MAKE) install DESTDIR=`pwd`/debian/tmp
 
93
 
105
94
        $(MAKE) -C d-i install
106
95
 
107
96
        cp debian/ubiquity.install-any debian/ubiquity.install
117
106
        dh_install
118
107
endif
119
108
endif
 
109
        # We don't need the source files installed
 
110
        rm -rf debian/ubiquity-frontend-gtk/usr/share/ubiquity/pixmaps/u1/assets/
 
111
        rm -rf debian/ubiquity-frontend-kde/usr/share/ubiquity/qt/images/source/
 
112
 
120
113
        dh_di_numbers
121
114
 
122
115
        # Bits of manual installation that can't be done by dh_install
213
206
                debian/ubiquity/usr/lib/ubiquity/yaboot-installer/yaboot-installer
214
207
endif
215
208
 
216
 
        set -e; for size in 16 22 32 48 64 128; do \
217
 
                mkdir -p debian/ubiquity-frontend-kde/usr/share/icons/hicolor/$${size}x$${size}/apps; \
218
 
                cp desktop/hi$${size}-app-ubiquity.png debian/ubiquity-frontend-kde/usr/share/icons/hicolor/$${size}x$${size}/apps/ubiquity.png; \
219
 
        done
220
 
 
221
209
        touch install-stamp
222
210
 
223
211
tests: install-stamp