The branch, debian-master has been updated
       via  573a8b55f76dda1151b69aca879bda6d4f3a9d8e (commit)
       via  44c93c3f354ded054d8e07e77a59ee2a5ba4a9fc (commit)
       via  946ffe760e67e966df3578cba400a7c6c9f8687c (commit)
       via  d6bc2102247acbce68debdffa762e14b99aa8b72 (commit)
       via  a25c95422f90812abd754ce588a9fb71de3c1e7f (commit)
       via  994eceb69bd5a8865a51e00b3cfb1c7a1f03f78e (commit)
       via  485fe50d53e3d25a624ab058678891e6c830ee3c (commit)
       via  db2c2a52d46030e294e671c4a94851701553bb9a (commit)
       via  8ac8fa1f369ab0073709518ec2a8d44aa859afcf (commit)
       via  4fe4646140ff04d6b69e2932bcb3591da17e8f5a (commit)
       via  65c3333549a7b7db89fd908a68cc337431e8189b (commit)
       via  ff0b31e3d3d5907391ea398583e77538e0cba72c (commit)
       via  29739290404166a2265eff056b3a5ca8f974f947 (commit)
       via  650faa5d437e10101d7013bc8a7a31f207b00032 (commit)
       via  3aac15ae4d73957a01890d76a610e82d7291e019 (commit)
       via  be67ed8a8d04e9a77f64e008a76afa8e9dcd7860 (commit)
       via  8d87208b82495ee1d9c0d2e9eabdf953f65e3029 (commit)
       via  f884d8966ec53870f4d191b86e8d05f8411b2f6e (commit)
       via  f4a46566051397eda28f2ca92b54edd3c1bcb0fb (commit)
       via  dca4de5b14feaa1befdc86ddba6e373a6cf429e2 (commit)
       via  f9c8aa95d5d6abd095e684bcd3fa6c82ebd02f44 (commit)
       via  e25b8e073f685379d64d2302dc91a3a809af0903 (commit)
       via  3b39a05cdd95fd98b08fc74ec1463f8def465457 (commit)
       via  a725302684e0ccad80cef36914edf994cb35c967 (commit)
       via  5c64f45125495dfb3fd8eb9f7f9a6cf0780ae137 (commit)
       via  eb7a14fed094e6a7629cf5154357ccf16c6163ff (commit)
       via  0826daa3d7e40754506b392b395aaf66974c5598 (commit)
       via  dabf95144b94c761989863941ba70999fb713234 (commit)
       via  f4bd5d6e5488854bc9633fb5629cc70d1045e9fa (commit)
       via  38c34da0ceb31cab5c9c6cd341b7c23ca4557e69 (commit)
       via  ffcfab48fa7474cb9eb33661eaf34544bfc8fa4e (commit)
       via  f26361c6f851af80678295e935d48d8f3ee76927 (commit)
       via  376bc6654631bc29e9532c4f99348b75bed23753 (commit)
       via  3cb141cbaf6a29c81ea464e555df33eaa8a75eec (commit)
       via  2b31e222e12852e8f3ac6a9aa14ae684c1144b8e (commit)
       via  00d2959ac17d719af9cce1c320092e2fbed182a7 (commit)
       via  8bd0c8390b35da9afc1a843ae5875ed620e98dc4 (commit)
       via  9c71b53b2df8be74dd9918b05a37da01790c79e7 (commit)
       via  a82cbd05e8b51865d5be899411f688533f35835b (commit)
      from  0d85baeffdbee362e50be7df7d5910be85a81191 (commit)


- Shortlog ------------------------------------------------------------
573a8b5 Two hotfixes for breakages due to the short desc changes
44c93c3 Merge commit 'origin/master' into debian-master

Summary of changes:
 bin/create_index_pages              |    4 +-
 bin/debtags-xgettext                |   87 +
 bin/newpkg_info                     |   81 +-
 bin/parse-debtags-voc               |   48 +-
 bin/parse-packages                  |    4 +-
 cron.d/500update_mo                 |   52 +-
 cron.d/600prepare_newpkg            |   20 +-
 lib/Packages/DoFilelist.pm          |    3 -
 lib/Packages/DoIndex.pm             |    2 +-
 lib/Packages/DoNewPkg.pm            |   17 +-
 lib/Packages/DoSearch.pm            |   23 +-
 lib/Packages/DoSearchContents.pm    |    2 -
 lib/Packages/DoShow.pm              |   38 +-
 lib/Packages/Search.pm              |   12 +-
 lib/Packages/Template.pm            |    5 +-
 po/debtags.de.po                    | 3544 +++++++++++++++++++++++++++++++++++
 po/debtags.fi.po                    | 3544 +++++++++++++++++++++++++++++++++++
 po/debtags.fr.po                    | 3544 +++++++++++++++++++++++++++++++++++
 po/debtags.hu.po                    | 3544 +++++++++++++++++++++++++++++++++++
 po/debtags.ja.po                    | 3544 +++++++++++++++++++++++++++++++++++
 po/debtags.nl.po                    | 3544 +++++++++++++++++++++++++++++++++++
 po/debtags.pot                      | 3544 +++++++++++++++++++++++++++++++++++
 po/debtags.uk.po                    | 3544 +++++++++++++++++++++++++++++++++++
 po/langs.de.po                      |   10 +-
 po/pdo.de.po                        |  100 +-
 po/pdo.fi.po                        |   83 +-
 po/pdo.fr.po                        |   78 +-
 po/pdo.hu.po                        |   73 +-
 po/pdo.ja.po                        |  133 +-
 po/pdo.nl.po                        |   78 +-
 po/pdo.pot                          |   73 +-
 po/pdo.uk.po                        |   78 +-
 po/sections.de.po                   |   30 +-
 po/sections.ja.po                   |  100 +-
 po/templates.de.po                  |  720 +++-----
 po/templates.fi.po                  |  522 +++---
 po/templates.fr.po                  |  611 ++++---
 po/templates.hu.po                  |  265 ++--
 po/templates.ja.po                  |  316 ++--
 po/templates.nl.po                  |  591 ++++---
 po/templates.pot                    |  228 ++-
 po/templates.uk.po                  |  605 ++++---
 static/debian.css                   |    2 +-
 templates/config.tmpl               |    3 +
 templates/html/download.tmpl        |   34 +-
 templates/html/foot.tmpl            |    6 +-
 templates/html/search.tmpl          |   20 +-
 templates/html/search_contents.tmpl |    3 +-
 templates/html/show.tmpl            |   47 +-
 templates/rss/newpkg.tmpl           |   10 +-
 50 files changed, 31142 insertions(+), 2427 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 573a8b55f76dda1151b69aca879bda6d4f3a9d8e
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Mon Oct 22 00:44:59 2007 +0000

    Two hotfixes for breakages due to the short desc changes
    
    That's what you get for rushing changes. Will be fixed properly
    in master.

diff --git a/bin/create_index_pages b/bin/create_index_pages
index d76beba..7847d88 100755
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -106,7 +106,7 @@ while (my ($pkg, $data) = each %packages) {
     my ($virt, $p_data) = split /\000/o, $data, 2;
     %virt = split /\01/o, $virt; 
     foreach (split /\000/o, $p_data||'') {
-       my @data = split ( /\s/o, $_, 8 );
+       my @data = split ( /\s/o, $_, 9 );
        $pkg{$data[1]} ||= new Packages::Page( $pkg );
        $pkg{$data[1]}->merge_package( { package => $pkg,
                                         archive => $data[0],
@@ -116,7 +116,7 @@ while (my ($pkg, $data) = each %packages) {
                                         subsection => $data[4],
                                         priority => $data[5],
                                         version => $data[6],
-                                        description => $data[7] } );
+                                        description => $data[8] } );
     }
     foreach (keys %virt) {
        next if $_ eq '-';
diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index e5b9e88..9be98d5 100644
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -45,7 +45,7 @@ sub do_newpkg {
     };
     while (<NEWPKG>) {
        chomp;
-       my @data = split /\s/, $_, 10;
+       my @data = split /\s/, $_, 11;
 
        next unless $data[2]; #removed packages
        next unless $data[3] eq $suite;

commit 44c93c3f354ded054d8e07e77a59ee2a5ba4a9fc
Merge: 0d85baeffdbee362e50be7df7d5910be85a81191 
946ffe760e67e966df3578cba400a7c6c9f8687c
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Sun Oct 21 23:42:24 2007 +0000

    Merge commit 'origin/master' into debian-master

diff --combined templates/config.tmpl
index 7f95493,def9bae..86e7cc9
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -4,7 -4,7 +4,7 @@@
  
     organisation = 'Debian'
     homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -13,6 -13,9 +13,9 @@@
     ddpo_url = 'http://qa.debian.org/developer.php?login='
     src_bugs_url = bugs_url _ 'src:'
     mirror_url = 'http://ftp.debian.org/'
+    security_mirror = 'security.debian.org'
+    security_mirror_url = security_mirror _ '/debian-security'
+    security_suite_suffix = '/updates'
     changelogs_url = 'http://packages.debian.org/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = homepage _ 'intro/cn'
@@@ -46,7 -49,6 +49,7 @@@
  -%]
  [%-
     # possible values for importance: high, normal, low
 -   sitewidemsg = { importance => "high",
 -                 txt => g('Please note that this is an experimental version 
of <a href="http://packages.debian.org/";>packages.debian.org</a>. Errors and 
obsolete information should be expected') }
 +#   sitewidemsg = { importance => "high",
 +#                txt => g('Please note that this is an experimental version 
of <a href="http://packages.debian.org/";>packages.debian.org</a>. Errors and 
obsolete information should be expected') }
 +#                txt => "Site maintainance in progress, some temporary 
problems might occour." }
  -%]

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to