diff -u root-system-5.18.00/debian/changelog root-system-5.18.00/debian/changelog --- root-system-5.18.00/debian/changelog +++ root-system-5.18.00/debian/changelog @@ -1,3 +1,13 @@ +root-system (5.18.00-2.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #297489): + - xrootd/src/xrootd/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc: Specify mode + argument to open() calls when O_CREAT is one of the flags to fix + "__open_missing_mode' declared with attribute error: open with O_CREAT + in second argument needs 3 arguments". + + -- Nick Ellery Wed, 05 Nov 2008 04:51:55 +0000 + root-system (5.18.00-2.1) unstable; urgency=low * Non-maintainer upload to fix pending l10n issues. @@ -16,6 +26,15 @@ -- Christian Perrier Fri, 18 Jul 2008 09:58:03 +0200 +root-system (5.18.00-2ubuntu1) intrepid; urgency=low + + * xrootd/src/xrootd/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc: Specify mode + argument to open() calls when O_CREAT is one of the flags to fix + "__open_missing_mode' declared with attribute error: open with O_CREAT + in second argument needs 3 arguments". (LP: #285499) + + -- James Westby Sun, 19 Oct 2008 17:25:37 +0100 + root-system (5.18.00-2) unstable; urgency=low * Bug fixes. @@ -109,7 +128,7 @@ * Added gfortran switch for amd64 et al (Closes: #429186). -- Christian Holm Christensen Thu, 26 Jul 2007 23:34:19 +0200 - + root-system (5.15.07-4) experimental; urgency=low * Attempt to fix broken Python dependencies on Ubuntu. @@ -656 +674,0 @@ - diff -u root-system-5.18.00/debian/control.in root-system-5.18.00/debian/control.in --- root-system-5.18.00/debian/control.in +++ root-system-5.18.00/debian/control.in @@ -1,7 +1,8 @@ Source: root-system Section: science Priority: optional -Maintainer: Christian Holm Christensen +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christian Holm Christensen Build-Depends: debhelper (>= 5.0.37.2), po-debconf, libssl-dev, comerr-dev, libxpm-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), libxft-dev@builddepends@ Standards-Version: 3.7.3 diff -u root-system-5.18.00/debian/control root-system-5.18.00/debian/control --- root-system-5.18.00/debian/control +++ root-system-5.18.00/debian/control @@ -1,7 +1,8 @@ Source: root-system Section: science Priority: optional -Maintainer: Christian Holm Christensen +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christian Holm Christensen Build-Depends: debhelper (>= 5.0.37.2), po-debconf, libssl-dev, comerr-dev, libxpm-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), libxft-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgif-dev, libxinerama-dev, libpacklib1-dev [!kfreebsd-i386 !kfreebsd-amd64], gfortran|fortran-compiler, libxmlrpc-c3-dev | libxmlrpc-c-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libfftw3-dev | fftw3-dev, libkrb5-dev|heimdal-dev,krb5-user|heimdal-clients, libldap2-dev | libldap-dev, libgsl0-dev, libmysqlclient15-dev | libmysqlclient14-dev| libmysqlclient12-dev| libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libglu1-mesa-dev | libglu-dev, libftgl-dev, libpq-dev | postgresql-dev, python-support (>= 0.3), libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, ruby (>= 1.8), ruby1.8-dev | ruby-dev (>= 1.8), libxml2-dev Standards-Version: 3.7.3 diff -u root-system-5.18.00/debian/po/sv.po root-system-5.18.00/debian/po/sv.po --- root-system-5.18.00/debian/po/sv.po +++ root-system-5.18.00/debian/po/sv.po @@ -121,0 +122,12 @@ + +#. Type: string +#. Description +#: ../ttf-root-installer.templates:4001 +msgid "" +"If you would like to keep a permanent archive of the compressed Microsoft " +"Core fonts, enter the directory where you'd like them stored. If you leave " +"this blank, the files will be deleted after installation." +msgstr "" +"Om du vill skapa ett permanent arkiv med de komprimerade teckensnittsfilerna " +"från Microsoft så anger du katalogen där de ska sparas här. Om du lämnar " +"fältet tomt så kommer filerna att tas bort efter installationen." diff -u root-system-5.18.00/debian/po/templates.pot root-system-5.18.00/debian/po/templates.pot --- root-system-5.18.00/debian/po/templates.pot +++ root-system-5.18.00/debian/po/templates.pot @@ -102,0 +103,9 @@ + +#. Type: string +#. Description +#: ../ttf-root-installer.templates:4001 +msgid "" +"If you would like to keep a permanent archive of the compressed Microsoft " +"Core fonts, enter the directory where you'd like them stored. If you leave " +"this blank, the files will be deleted after installation." +msgstr "" diff -u root-system-5.18.00/debian/po/fr.po root-system-5.18.00/debian/po/fr.po --- root-system-5.18.00/debian/po/fr.po +++ root-system-5.18.00/debian/po/fr.po @@ -122,0 +123,13 @@ + +#. Type: string +#. Description +#: ../ttf-root-installer.templates:4001 +msgid "" +"If you would like to keep a permanent archive of the compressed Microsoft " +"Core fonts, enter the directory where you'd like them stored. If you leave " +"this blank, the files will be deleted after installation." +msgstr "" +"Si vous souhaitez conserver une archive des polices Microsoft sous forme " +"compressée, veuillez indiquer le répertoire où vous souhaitez la placer. Si " +"ce champ est laissé vide, l'archive des polices sera supprimée après " +"l'installation." only in patch2: unchanged: --- root-system-5.18.00.orig/xrootd/src/xrootd/src/XrdClient/XrdClient.cc +++ root-system-5.18.00/xrootd/src/xrootd/src/XrdClient/XrdClient.cc @@ -1111,7 +1111,7 @@ } Stat(0); - int f = open(localpath, O_CREAT | O_RDWR); + int f = open(localpath, O_CREAT | O_RDWR, 0644); if (f < 0) { Error("Copy", "Error opening local file."); return FALSE; only in patch2: unchanged: --- root-system-5.18.00.orig/xrootd/src/xrootd/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc +++ root-system-5.18.00/xrootd/src/xrootd/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc @@ -1822,7 +1822,7 @@ PwdFile += tag; // // Open file, truncating if it exists already - int fd = open(PwdFile.c_str(),O_WRONLY | O_CREAT | O_TRUNC); + int fd = open(PwdFile.c_str(),O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fd < 0) { PRT("SavePasswd: could not open/create file: "<