Browse Source

* Fix compilation warnings:

- apt-pkg/indexfile.cc: conversion from string constant to 'char*';
debian/1.8.y
Otavio Salvador 15 years ago
parent
commit
bc36c37bdb
  1. 4
      apt-pkg/indexfile.cc
  2. 2
      debian/changelog

4
apt-pkg/indexfile.cc

@ -113,8 +113,8 @@ string pkgIndexFile::LanguageCode()
// we have a mapping of the language codes that contains all the language
// codes that need the country code as well
// (like pt_BR, pt_PT, sv_SE, zh_*, en_*)
char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
for(char **s = need_full_langcode;*s != NULL; s++)
const char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
for(const char **s = need_full_langcode;*s != NULL; s++)
if(lang.find(*s) == 0)
return lang.substr(0,5);

2
debian/changelog

@ -56,6 +56,8 @@ apt (0.7.7) UNRELEASED; urgency=low
Ryan Murray <rmurray@debian.org> for the patch (closes: #437150)
* Add support to apt-key to export keys to stdout. Thanks to "Dwayne
C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)
* Fix compilation warnings:
- apt-pkg/indexfile.cc: conversion from string constant to 'char*';
[ Ian Jackson ]
* dpkg-triggers: Deal properly with new package states.

Loading…
Cancel
Save