Merge branch 'debian/sid' into ubuntu/master

1 files changed, 6 insertions, 6 deletions

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 017c69a0a..2c674087e 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -100,8 +100,8 @@ class debTranslationsIndex : public pkgIndexFile
    std::string URI;
    std::string Dist;
    std::string Section;
-   const char * const Language;
-   
+   std::string Language;
+
    std::string Info(const char *Type) const;
    std::string IndexFile(const char *Type) const;
    std::string IndexURI(const char *Type) const;
@@ -109,13 +109,13 @@ class debTranslationsIndex : public pkgIndexFile
    inline std::string TranslationFile() const {return std::string("Translation-").append(Language);};
 
    public:
-   
+
    virtual const Type *GetType() const APT_CONST;
 
    // Interface for acquire
-   virtual std::string Describe(bool Short) const;   
+   virtual std::string Describe(bool Short) const;
    virtual bool GetIndexes(pkgAcquire *Owner) const;
-   
+
    // Interface for the Cache Generator
    virtual bool Exists() const;
    virtual bool HasPackages() const;
@@ -123,7 +123,7 @@ class debTranslationsIndex : public pkgIndexFile
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
-   debTranslationsIndex(std::string URI,std::string Dist,std::string Section, char const * const Language);
+   debTranslationsIndex(std::string URI,std::string Dist,std::string Section, std::string const &Language);
    virtual ~debTranslationsIndex() {};
 };