Merge lp:~arky/ubuntu/karmic/envyng-core/fix-411915 into lp:ubuntu/karmic/envyng-core

[arky]

[arky (arky)]

Fix for bug 411915

[James Westby (james-w)]

Hi Alberto,

The change looks good to me, but you are set
as "Maintainer" of this package.

Thanks,

James

[Alberto Milone (albertomilone)]

> Hi Alberto,
>
> The change looks good to me, but you are set
> as "Maintainer" of this package.
>
> Thanks,
>
> James

It looks good to me too. After all it's a typo.

review: Approve

[James Westby (james-w)]

> > Hi Alberto,
> >
> > The change looks good to me, but you are set
> > as "Maintainer" of this package.
> >
> > Thanks,
> >
> > James
>
> It looks good to me too. After all it's a typo.

Thanks Alberto, would you like me to upload?

Thanks,

James

[Alberto Milone (albertomilone)]

> > > Hi Alberto,
> > >
> > > The change looks good to me, but you are set
> > > as "Maintainer" of this package.
> > >
> > > Thanks,
> > >
> > > James
> >
> > It looks good to me too. After all it's a typo.
>
> Thanks Alberto, would you like me to upload?
>
> Thanks,
>
> James

Yes, please proceed with the upload.

Thanks,

Alberto

[James Westby (james-w)]

Ok, because I forgot to upload this straight away it now
fails to build.

There is a new python-distutils-extra in the archive, 2.10,
and so this check now fails:

  assert DistUtilsExtra.auto.__version__ >= '2.4', 'needs DistUtilsExtra.auto >= 2.4'

because it's not a version number comparison.

Not too hard to fix, I'm not sure what an elegant way to do so
is. Any suggestions?

Thanks,

James

[Alberto Milone (albertomilone)]

> Ok, because I forgot to upload this straight away it now
> fails to build.
>
> There is a new python-distutils-extra in the archive, 2.10,
> and so this check now fails:
>
> assert DistUtilsExtra.auto.__version__ >= '2.4', 'needs DistUtilsExtra.auto
> >= 2.4'
>
> because it's not a version number comparison.
>
> Not too hard to fix, I'm not sure what an elegant way to do so
> is. Any suggestions?
>
> Thanks,
>
> James

This works:

assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto >= 2.10'

or, if you want to compare floating point numbers:
assert float(DistUtilsExtra.auto.__version__) >= 2.10, 'needs DistUtilsExtra.auto >= 2.10'

Regards,

Alberto

[James Westby (james-w)]

> assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto
> >= 2.10'
>
> or, if you want to compare floating point numbers:
> assert float(DistUtilsExtra.auto.__version__) >= 2.10, 'needs
> DistUtilsExtra.auto >= 2.10'

Well, that's changing the requirement isn't it? Plus it will make
2.2 pass the check, when it isn't supported.

Thanks,

James

[Alberto Milone (albertomilone)]

> > assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto
> > >= 2.10'
> >
> > or, if you want to compare floating point numbers:
> > assert float(DistUtilsExtra.auto.__version__) >= 2.10, 'needs
> > DistUtilsExtra.auto >= 2.10'
>
> Well, that's changing the requirement isn't it? Plus it will make
> 2.2 pass the check, when it isn't supported.
>
> Thanks,
>
> James

Yes, I know. The problem is really in python-distutils-extra (see bug #428337)

=== modified file 'Envy/packagemanager.py'
--- Envy/packagemanager.py	2009-08-21 14:25:32 +0000
+++ Envy/packagemanager.py	2009-09-04 19:58:49 +0000
@@ -42,7 +42,7 @@
     
     def start(self):
         if self.isText:
-            print >> stderr, '\nDowloading the packages...'
+            print >> stderr, '\nDownloading the packages...'
         #print >> stderr, 'Starting Fetch process'
     
     def stop(self):

=== modified file 'Envy/ui.py'
--- Envy/ui.py	2008-09-13 12:54:52 +0000
+++ Envy/ui.py	2009-09-04 19:58:49 +0000
@@ -155,10 +155,10 @@
         self.string_menu_header_installed = self._('Installed Version')
         self.string_menu_header_compatible = self._('Compatible')
         self.string_menu_header_recommended = self._('Recommended')
-        self.string_text_download = self._('Dowloading File')
+        self.string_text_download = self._('Downloading File')
         self.string_text_error = self._('Error')
         self.string_text_success = self._('Success')
-        self.string_package_download = self._('Dowloading Package')
+        self.string_package_download = self._('Downloading Package')
         self.string_package_install = self._('Installing Package')
         self.string_explanation = self._('Please select the driver you wish to install.\n\
 \n\

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-21 14:25:32 +0000
+++ debian/changelog	2009-09-04 19:58:49 +0000
@@ -1,3 +1,9 @@
+envyng-core (2.0.1ubuntu3) karmic; urgency=low
+
+  * Changed 'Dowloading' to 'Downloading' (LP: #411915) 
+
+ -- Rakesh 'arky' Ambati <[e-mail]>  Sat, 05 Sep 2009 01:26:10 +0530
+
 envyng-core (2.0.1ubuntu2) karmic; urgency=low
 
   * Envy/packagemanager.py