← Back to branch summary

~ubuntu-branches/ubuntu/vivid/hal-info/vivid

« back to all changes in this revision

Viewing changes to fdi/information/10freedesktop/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-11-24 11:59:58 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20081124115958-8qbi628momuilff1
Tags: 20081124-0ubuntu1
https://launchpad.net/bugs/116860
https://launchpad.net/bugs/178359
https://launchpad.net/bugs/282573
https://launchpad.net/bugs/291749
https://launchpad.net/bugs/282957
https://launchpad.net/bugs/284961
https://launchpad.net/bugs/289161
https://launchpad.net/bugs/291333
https://launchpad.net/bugs/294070
https://launchpad.net/bugs/295855
https://launchpad.net/bugs/300620
https://launchpad.net/bugs/301030
* New upstream git snapshot.
  - Add ISCD no-name portable audio player (LP: #116860)
  - hal-info and rhythmbox conflict on audio_folders for PSP (LP: #178359)
  - Add Pantech UM175 phone (LP: #282573)
  - Add another Nokia N82 phone model (LP: #291749)
  - Add Nokia N82 music player (LP: #282957)
  - Add another Option 3G USB Modem (LP: #284961)
  - Add Sony Walkman NWZ-135F (LP: #289161)
  - Add Onda MT505UP / MF632 music player (LP: #291333)
  - Add Nokia E66 phone (LP: #294070)
  - Add Sierra Aircard 880U modem (LP: #295855)
  - Fix typo in 20-video-quirk-pm-asus.fdi (LP: #300620)
  - Add Novatel EU870D modem (LP: #301030)

Show diffs side-by-side

added added

removed removed

Lines of Context:
fdi/information/10freedesktop/Makefile.am
10
10
                10-laptop-panel-hardware.fdi    \
11
11
                10-cd-dvd-burner.fdi            \
12
12
                10-battery.fdi                  \
13
 
                10-modem.fdi
 
13
                10-modem.fdi                    \
 
14
                10-usb-obex.fdi
14
15
 
15
16
if BUILD_KILLSWITCH_DELL_WLAN
16
17
dist_fdi_DATA += 10-dell-rfkill-switch-wlan.fdi 
36
37
dist_fdi_DATA += 10-ipw-rfkill-switch.fdi
37
38
endif
38
39
 
 
40
if BUILD_KILLSWITCH_IWL_WLAN
 
41
dist_fdi_DATA += 10-iwl-rfkill-switch.fdi
 
42
endif
 
43
 
39
44
 
40
45
if BUILD_RECALL
41
46
dist_fdi_DATA +=                                \