← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
23
23
DIST_RELEASE := $(DIST_NAME)/$(shell lsb_release -sc)
24
24
 
25
25
XSERVER_VERSION = 17
26
 
INSTALL_XORGCONFD = new
27
26
XORG_PKG_ABI = 3
28
27
 
29
28
ifeq ($(DIST_RELEASE),Debian/squeeze)
35
34
endif
36
35
 
37
36
ifeq ($(DIST_RELEASE),Ubuntu/lucid)
38
 
        INSTALL_XORGCONFD = old
39
37
        XORG_PKG_ABI = 1
40
38
endif
41
39
 
132
130
            VBOX_BUILD_PUBLISHER=_$(DIST_NAME) \
133
131
            VBOX_WITH_REGISTRATION_REQUEST= \
134
132
            VBOX_WITH_UPDATE_REQUEST= \
135
 
            $(if $(DH_VERBOSE),KBUILD_VERBOSE=2,)
 
133
            KBUILD_VERBOSE=2
136
134
 
137
135
        mkdir -p out/vdfuse
138
136
        gcc debian/vdfuse/vdfuse.c -o out/vdfuse/vdfuse -pipe -g -Wl,--as-needed -Wl,--rpath,$(INSTALL_PATH) -Wall \
167
165
        echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars
168
166
        echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars
169
167
 
 
168
ifeq ($(DIST_NAME),Ubuntu)
 
169
        echo "modaliases=vboxguest(pci:v000080EEd0000CAFEsv00000000sd00000000bc*sc*i*)" >> debian/$(gdkms).substvars
 
170
endif
 
171
 
170
172
override_dh_install:
171
173
        dh_install
172
174
 
173
 
ifeq ($(INSTALL_XORGCONFD),new)
174
 
        dh_install -p$(uxname) --ignore debian/$(uxname).install \
175
 
            src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
176
 
            /usr/share/X11/xorg.conf.d
177
 
else
178
 
        dh_install -p$(uxname) --ignore debian/$(uxname).install \
179
 
            src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
180
 
            /usr/lib/X11/xorg.conf.d
181
 
endif
182
 
 
183
175
        convert debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox.png \
184
176
            debian/$(sxname)/usr/share/pixmaps/virtualbox.xpm
185
177
 
 
178
ifeq ($(DIST_NAME),Ubuntu)
 
179
        install -m 644 -p -D debian/apport-hook.py \
 
180
            debian/$(sname)/usr/share/apport/package-hooks/source_$(sname).py
 
181
        install -m 644 -p -D debian/apport-hook.py \
 
182
            debian/$(gdkms)/usr/share/apport/package-hooks/$(gdkms).py
 
183
endif
 
184
 
186
185
override_dh_fixperms:
187
186
        dh_fixperms
188
187
 
221
220
        chmod 644 debian/$(gsource)/usr/src/$(gname).tar.bz2
222
221
endif
223
222
 
224
 
override_dh_installudev:
225
 
        dh_installudev -p$(uxname) --priority=69
226
 
        dh_installudev --remaining-packages
227
 
 
228
223
override_dh_installinit:
229
224
        dh_installinit --no-start
230
225
 
249
244
override_dh_compress:
250
245
        dh_compress -X.pdf
251
246
 
 
247
override_dh_pycentral:
 
248
        dh_pycentral -p$(sname)
 
249
 
252
250
override_dh_auto_clean:
253
251
        dh_auto_clean
254
252