diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-05-10 09:02:58 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-05-10 09:02:58 +0200 |
| commit | 46d7c201796de04e5857285327c6b210c52e1d22 (patch) | |
| tree | 1e6c9d5d678648ec86c225bc27d1f80f58af7413 | |
| parent | 7316bfbd75055373101e28869b306b01d4fe8796 (diff) | |
It's Jessie, not Jessy
| -rw-r--r-- | cerbero/bootstrap/linux.py | 2 | ||||
| -rw-r--r-- | cerbero/enums.py | 2 | ||||
| -rw-r--r-- | cerbero/utils/__init__.py | 4 | ||||
| -rw-r--r-- | packages/gstreamer-1.0-net.package | 2 | ||||
| -rw-r--r-- | packages/gstreamer-networking.package | 2 | ||||
| -rw-r--r-- | recipes/glib.recipe | 2 | ||||
| -rw-r--r-- | recipes/gtk.recipe | 2 | ||||
| -rw-r--r-- | recipes/libsoup.recipe | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/cerbero/bootstrap/linux.py b/cerbero/bootstrap/linux.py index 8ff3ba1..127543d 100644 --- a/cerbero/bootstrap/linux.py +++ b/cerbero/bootstrap/linux.py @@ -55,7 +55,7 @@ class DebianBootstraper (UnixBootstraper): DistroVersion.UBUNTU_LUCID: ['libgtk2.0-dev'], DistroVersion.UBUNTU_NATTY: ['libgtk2.0-dev'], DistroVersion.DEBIAN_WHEEZY: ['libgdk-pixbuf2.0-dev'], - DistroVersion.DEBIAN_JESSY: ['libgdk-pixbuf2.0-dev'], + DistroVersion.DEBIAN_JESSIE: ['libgdk-pixbuf2.0-dev'], DistroVersion.UBUNTU_ONEIRIC: ['libgdk-pixbuf2.0-dev'], DistroVersion.UBUNTU_PRECISE: ['libgdk-pixbuf2.0-dev'], } diff --git a/cerbero/enums.py b/cerbero/enums.py index 71c45ef..40d51c4 100644 --- a/cerbero/enums.py +++ b/cerbero/enums.py @@ -51,7 +51,7 @@ class DistroVersion: ''' Enumeration of supported distribution versions ''' DEBIAN_SQUEEZE = 'debian_squeeze' DEBIAN_WHEEZY = 'debian_wheezy' - DEBIAN_JESSY = 'debian_jessy' + DEBIAN_JESSIE = 'debian_jessy' UBUNTU_MAVERICK = 'ubuntu_maverick' UBUNTU_LUCID = 'ubuntu_lucid' UBUNTU_NATTY = 'ubuntu_natty' diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py index 40ef7f3..030e946 100644 --- a/cerbero/utils/__init__.py +++ b/cerbero/utils/__init__.py @@ -148,8 +148,8 @@ def system_info(): distro_version = DistroVersion.DEBIAN_SQUEEZE elif d[1].startswith('7.') or d[1].startswith('wheezy'): distro_version = DistroVersion.DEBIAN_WHEEZY - elif d[1].startswith('jessy'): - distro_version = DistroVersion.DEBIAN_JESSY + elif d[1].startswith('jessie'): + distro_version = DistroVersion.DEBIAN_JESSIE else: raise FatalError("Distribution '%s' not supported" % str(d)) elif d[0] in ['RedHat', 'Fedora']: diff --git a/packages/gstreamer-1.0-net.package b/packages/gstreamer-1.0-net.package index b56ff65..342d67f 100644 --- a/packages/gstreamer-1.0-net.package +++ b/packages/gstreamer-1.0-net.package @@ -45,7 +45,7 @@ class Package(package.Package): if self.config.target_platform != Platform.LINUX or \ self.config.target_distro_version not in \ [DistroVersion.DEBIAN_WHEEZY, - DistroVersion.DEBIAN_JESSY, + DistroVersion.DEBIAN_JESSIE, DistroVersion.UBUNTU_NATTY, DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, diff --git a/packages/gstreamer-networking.package b/packages/gstreamer-networking.package index bae8cbb..755f315 100644 --- a/packages/gstreamer-networking.package +++ b/packages/gstreamer-networking.package @@ -45,7 +45,7 @@ class Package(package.Package): if self.config.target_platform != Platform.LINUX or \ self.config.target_distro_version not in \ [DistroVersion.DEBIAN_WHEEZY, - DistroVersion.DEBIAN_JESSY, + DistroVersion.DEBIAN_JESSIE, DistroVersion.UBUNTU_NATTY, DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 3889721..85d7658 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -104,7 +104,7 @@ class Recipe(recipe.Recipe): self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/gio/modules/', '/usr/lib/i386-linux-gnu/gio/modules') elif self.config.target_arch == Architecture.X86_64: self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/gio/modules/', '/usr/lib/x86_64-linux-gnu/gio/modules') - elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY, DistroVersion.DEBIAN_JESSY]: + elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY, DistroVersion.DEBIAN_JESSIE]: if self.config.target_arch == Architecture.X86: self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/i386-linux-gnu/gio/modules') elif self.config.target_arch == Architecture.X86_64: diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe index 046d1b6..ae7a110 100644 --- a/recipes/gtk.recipe +++ b/recipes/gtk.recipe @@ -87,7 +87,7 @@ class Recipe(recipe.Recipe): self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/gtk-2.0', '/usr/lib/i386-linux-gnu/gtk-2.0', '/usr/share/themes') elif self.config.target_arch == Architecture.X86_64: self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/gtk-2.0', '/usr/lib/x86_64-linux-gnu/gtk-2.0', '/usr/share/themes') - elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY, DistroVersion.DEBIAN_JESSY]: + elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY, DistroVersion.DEBIAN_JESSIE]: if self.config.target_arch == Architecture.X86: self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/i386-linux-gnu/gtk-2.0', None, '/usr/share/themes') elif self.config.target_arch == Architecture.X86_64: diff --git a/recipes/libsoup.recipe b/recipes/libsoup.recipe index d3a526b..400a8b7 100644 --- a/recipes/libsoup.recipe +++ b/recipes/libsoup.recipe @@ -19,7 +19,7 @@ class Recipe(recipe.Recipe): if self.config.target_platform != Platform.LINUX or \ self.config.target_distro_version not in \ [DistroVersion.DEBIAN_WHEEZY, - DistroVersion.DEBIAN_JESSY, + DistroVersion.DEBIAN_JESSIE, DistroVersion.UBUNTU_NATTY, DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, |