← Back to branch summary

~ubuntu-branches/ubuntu/wily/xmms2/wily

« back to all changes in this revision

Viewing changes to waftools/pkgconfig.py

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2008-07-04 16:23:34 UTC
  • mfrom: (1.1.5 upstream) (6.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080704162334-b3esbkcapt8wbrk4
Tags: 0.5DrLecter-2ubuntu1
https://launchpad.net/bugs/241098
https://launchpad.net/bugs/212566
https://launchpad.net/bugs/222341
* Merge from debian unstable (LP: #241098), remaining changes:
  + debian/control:
    + Update Maintainer field
    + add lpia to xmms2-plugin-alsa supported architectures
    + Added liba52-0.7.4-dev to build depends
  + debian/rules: Added patch, patch-stamp and unpatch
  + changed 01_gcc4.3.patch:
    + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <climits>
* New upstream relase fixes LP: #212566, #222341

Show diffs side-by-side

added added

removed removed

Lines of Context:
waftools/pkgconfig.py
22
22
            val["BINDIR"] = os.path.join("${prefix}", "bin")
23
23
            val["LIBDIR"] = os.path.join("${prefix}", "lib")
24
24
            val["INCLUDEDIR"] = os.path.join("${prefix}", "include", "xmms2")
25
 
            val["VERSION"] = self.version
 
25
            val["VERSION"] = self.env["VERSION"]
26
26
 
27
27
            val["NAME"] = name
28
28
            val["LIB"] = lib
43
43
 
44
44
    def install(self):
45
45
        for task in self.m_tasks:
46
 
            self.install_results('PKGCONFIGDIR', '', task);
 
46
            self.install_results('PKGCONFIGDIR', '', task)
47
47
 
48
48
def setup(env):
49
49
    Object.register('pkgc', pkgcobj)