← Back to branch summary

~michihenning/storage-framework/check-server-side-metadata

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: James Henstridge
  • Date: 2016-08-18 09:25:51 UTC
  • mfrom: (8.2.2 storage-framework)
  • Revision ID: james@jamesh.id.au-20160818092551-9fmvmfctwwxp7zvx
Merge lp:storage-framework into devel, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/control
34
34
# upstream branch
35
35
Vcs-Bzr: lp:storage-framework
36
36
 
37
 
Package: libstorage-framework-provider-1-1
 
37
Package: libstorage-framework-provider-1-2
38
38
Architecture: any
39
39
Multi-Arch: same
40
40
Pre-Depends: ${misc:Pre-Depends},
81
81
Architecture: any
82
82
Multi-Arch: same
83
83
Pre-Depends: ${misc:Pre-Depends},
84
 
Depends: libstorage-framework-provider-1-1 (= ${binary:Version}),
 
84
Depends: libstorage-framework-provider-1-2 (= ${binary:Version}),
85
85
         libboost-thread-dev (>= 1.58) | libboost-thread1.58-dev,
86
86
         ${misc:Depends},
87
87
Description: Header files for the Storage Framework provider library