[Collab-qa-commits] r2432 - in packages-metadata: d f l o p s t z

Charles Plessy plessy at alioth.debian.org
Tue Jul 31 03:01:09 UTC 2012


Author: plessy
Date: 2012-07-31 03:01:08 +0000 (Tue, 31 Jul 2012)
New Revision: 2432

Added:
   packages-metadata/l/libdatetime-timezone-perl.control
   packages-metadata/o/octave-splines.control
   packages-metadata/o/octave-splines.copyright
   packages-metadata/p/python-keyring.control
   packages-metadata/p/python-keyring.copyright
   packages-metadata/t/taglib-sharp.control
   packages-metadata/t/taglib-sharp.copyright
   packages-metadata/z/zabbix.control
Modified:
   packages-metadata/d/desktop-base.control
   packages-metadata/f/fglrx-driver.control
   packages-metadata/l/leaflet.control
   packages-metadata/l/leaflet.copyright
   packages-metadata/o/opennebula.control
   packages-metadata/o/opennebula.copyright
   packages-metadata/s/scilab-celestlab.control
   packages-metadata/s/scim.control
   packages-metadata/s/starpu-contrib.control
   packages-metadata/z/zabbix.copyright
Log:
Daily automatic umegaya push

Modified: packages-metadata/d/desktop-base.control
===================================================================
--- packages-metadata/d/desktop-base.control	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/d/desktop-base.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -17,7 +17,7 @@
 
 Package: desktop-base
 Architecture: all
-Depends: ${misc:Depends}, librsvg2-common
+Depends: librsvg2-common
 Pre-Depends: dpkg (>= 1.15.7.2~)
 Suggests: gnome | kde-standard | xfce4 | wmaker
 Description: common files for the Debian Desktop

Modified: packages-metadata/f/fglrx-driver.control
===================================================================
--- packages-metadata/f/fglrx-driver.control	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/f/fglrx-driver.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -4,13 +4,12 @@
 Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
 Uploaders:
  Patrick Matthäi <pmatthaei at debian.org>,
- Michael Gilbert <michael.s.gilbert at gmail.com>,
+ Michael Gilbert <mgilbert at debian.org>,
  Andreas Beckmann <debian at abeckmann.de>,
 DM-Upload-Allowed: yes
 Build-Depends:
  debhelper (>= 9),
  bzip2,
- ia32-libs [amd64],
  libxrandr2,
  libxext6,
  libgl1-mesa-glx,
@@ -38,44 +37,48 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- libfglrx (= ${binary:Version}),
- xorg-video-abi-12 | xorg-video-abi-11 | xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
+ lib${fglrx} (= ${binary:Version}),
+ ${fglrx:XorgDepends},
  xserver-xorg-core,
  glx-alternative-fglrx (>= 0.2),
 Recommends:
- fglrx-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
- libgl1-fglrx-glx (= ${binary:Version}),
- libgl1-fglrx-glx-i386 [amd64],
- fglrx-glx-ia32 [amd64],
- fglrx-atieventsd,
+ ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
+ libgl1-${fglrx}-glx (= ${binary:Version}),
+ libgl1-${fglrx}-glx-i386 [amd64],
+ ${fglrx}-glx-ia32 [amd64],
+ ${fglrx}-atieventsd,
 Suggests:
- fglrx-control,
+ ${fglrx}-control,
  xvba-va-driver,
- amd-opencl-icd,
+ amd-opencl-icd${fglrx:Variant},
 Provides:
  xorg-driver-video,
  xserver-xorg-video-fglrx,
 Conflicts:
+ xserver-xorg-video-fglrx,
  ia32-fglrx-driver,
 Breaks:
- libgl1-fglrx-glx (<< ${binary:Version}),
- libgl1-fglrx-glx (>> ${binary:Version}),
+ libgl1-${fglrx}-glx (<< ${binary:Version}),
+ libgl1-${fglrx}-glx (>> ${binary:Version}),
  nvidia-glx (<< 275.09.07-3),
 Replaces:
+ xserver-xorg-video-fglrx,
  fglrx-glx (<< 1:11-7-4),
-Description: non-free ATI/AMD RadeonHD display driver
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
+ ${fglrx:Info}
  .
- This package provides display drivers and hardware accelerated OpenGL
- for X.Org. For 3D acceleration to work, you will need to
- compile the fglrx kernel module for your kernel: see the fglrx-modules-dkms
+ .
+ ${fglrx:Models}
+ .
+ This package provides display drivers and hardware accelerated OpenGL for
+ X.Org. For 3D acceleration to work, you will need to compile the fglrx kernel
+ module for your kernel: see the ${fglrx}-modules-dkms
  package. Note that the driver will work without the kernel module, but 3D
  acceleration will be disabled.
  .
  The driver can work with plain MESA libGL, but some applications may require
- the proprietary libGL. This library is shipped in the libgl1-fglrx-glx package.
+ the proprietary libGL. This library is shipped in the
+ libgl1-${fglrx}-glx package.
 
 Package: libfglrx
 Section: non-free/libs
@@ -89,38 +92,49 @@
  ${shlibs:Depends},
  ${misc:Depends},
 Recommends:
- libxvbaw1 (= ${binary:Version}),
+ lib${fglrx}-amdxvba1 (= ${binary:Version}),
+Provides:
+ libfglrx-virtual,
 Conflicts:
+ libfglrx-virtual,
  libfglrx-ia32 [i386],
 Breaks:
  fglrx-driver (<< 1:11-8-2),
 Replaces:
+ libfglrx-virtual,
  fglrx-driver (<< 1:11-8-2),
-Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)${fglrx:VariantDescSuffix}
+ ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package contains the runtime libraries.
- The proprietary libGL library is shipped in the libgl1-fglrx-glx package.
+ The proprietary libGL library is shipped in the
+ libgl1-${fglrx}-glx package.
 
-Package: libxvbaw1
+Package: libfglrx-amdxvba1
 Section: non-free/libs
 Architecture: i386 amd64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libgl1-fglrx-glx (= ${binary:Version}),
+ libgl1-${fglrx}-glx (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
+Provides:
+ libxvbaw1,
+Conflicts:
+ libxvbaw1,
 Breaks:
  fglrx-driver (<< 1:11-8-3~),
  libfglrx (<< 1:11-8-3~),
 Replaces:
+ libxvbaw1,
  fglrx-driver (<< 1:11-8-3~),
  libfglrx (<< 1:11-8-3~),
-Description: AMD XvBA (X-Video Bitstream Acceleration) runtime libraries
+Description: AMD XvBA (X-Video Bitstream Acceleration) runtime libraries${fglrx:VariantDescSuffix}
  X-Video Bitstream Acceleration (XvBA), designed by AMD for its (ATI) Radeon GPU
  and Fusion APU, is an arbitrary extension of the X video extension (Xv) for the
  X Window System on Linux operating-systems. XvBA API allows video programs to
@@ -136,13 +150,13 @@
 Section: non-free/libdevel
 Architecture: i386 amd64
 Depends:
- libxvbaw1 (= ${binary:Version}),
+ lib${fglrx}-amdxvba1 (= ${binary:Version}),
  ${misc:Depends},
 Breaks:
  fglrx-driver (<< 1:11-8-2),
 Replaces:
  fglrx-driver (<< 1:11-8-2),
-Description: AMD XvBA (X-Video Bitstream Acceleration) development files
+Description: AMD XvBA (X-Video Bitstream Acceleration) development files${fglrx:VariantDescSuffix}
  X-Video Bitstream Acceleration (XvBA), designed by AMD for its (ATI) Radeon GPU
  and Fusion APU, is an arbitrary extension of the X video extension (Xv) for the
  X Window System on Linux operating-systems. XvBA API allows video programs to
@@ -163,74 +177,77 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- libfglrx (= ${binary:Version}),
+ lib${fglrx} (= ${binary:Version}),
  glx-alternative-fglrx (>= 0.2),
+Provides:
+ libgl1-fglrx-glx-virtual,
+ libgl1-${fglrx}-glx-i386 [i386],
 Conflicts:
+ libgl1-fglrx-glx-virtual,
  fglrx-glx-ia32 [i386],
 Breaks:
  fglrx-glx (<< 1:11-8-2),
  nvidia-glx (<< 275.09.07-3),
  libgl1-nvidia-glx (<< 275.09.07-3)
 Replaces:
+ libgl1-fglrx-glx-virtual,
  fglrx-glx (<< 1:11-8-2),
-Provides:
- libgl1-fglrx-glx-i386 [i386],
-Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
+ ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides the proprietary libGL shipped by ATI/AMD.
 
 Package: fglrx-glx
 Section: non-free/oldlibs
 Architecture: i386 amd64
 Depends:
- libgl1-fglrx-glx,
+ libgl1-${fglrx}-glx,
  ${misc:Depends},
-Description: transitional package, use libgl1-fglrx-glx
- This is a transitional package to aid migration to libgl1-fglrx-glx.
+Description: transitional package, use libgl1-${fglrx}-glx
+ This is a transitional package to aid migration to libgl1-${fglrx}-glx.
  It can be safely removed from the system once nothing depends on it.
 
 Package: fglrx-glx-ia32
+Section: non-free/oldlibs
 Architecture: amd64
 Pre-Depends:
  libc6-i386 (>= 2.9-18),
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- libfglrx-ia32 (= ${binary:Version}),
- fglrx-driver (= ${binary:Version}),
 Conflicts:
  nvidia-glx-ia32,
  ia32-fglrx-glx,
-Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver (32-bit)
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Description: please switch to multiarch libgl1-fglrx-glx:i386
+ This is an empty transitional package to aid switching to multiarch.
  .
- This package provides the proprietary 32-bit libGL shipped by ATI/AMD for
- emulated userspace on amd64.
+ Run the following commands to install the multiarch library:
+ * dpkg --add-architecture i386 ; apt-get update
+ * apt-get install libgl1-fglrx-glx:i386
 
 Package: libfglrx-ia32
-Section: non-free/libs
+Section: non-free/oldlibs
 Architecture: amd64
 Pre-Depends:
  libc6-i386 (>= 2.9-18),
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Recommends:
+ libgl1-${fglrx}-glx-i386,
 Breaks:
  fglrx-glx-ia32 (<< 1:11-8-2),
 Replaces:
  fglrx-glx-ia32 (<< 1:11-8-2),
-Description: non-free ATI/AMD RadeonHD display driver (32-bit runtime libraries)
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Description: please switch to multiarch libfglrx:i386
+ This is an empty transitional package to aid switching to multiarch.
  .
- This package contains the 32-bit runtime libraries.
- The proprietary libGL library is shipped in the fglrx-glx-ia32 package.
+ Run the following commands to install the multiarch library:
+ * dpkg --add-architecture i386 ; apt-get update
+ * apt-get install libfglrx:i386
 
 Package: fglrx-modules-dkms
 Section: non-free/kernel
@@ -239,16 +256,22 @@
  ${misc:Depends},
  dkms (>= 2.1),
 Suggests:
- fglrx-driver,
+ ${fglrx}-driver,
 Provides:
- fglrx-kernel-${fglrx:version},
+ fglrx-kernel-dkms,
+ fglrx-kernel-${fglrx:Version},
+Conflicts:
+ fglrx-kernel-dkms,
 Breaks:
  make (= 3.82-1),
-Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Replaces:
+ fglrx-kernel-dkms,
+Description: dkms module source for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
+ ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides the kernel build environment and the fglrx modules,
  which are necessary to have accelerated 3D support within the ATI/AMD
  proprietary display driver.
@@ -267,16 +290,17 @@
 Recommends:
  module-assistant | kernel-package,
 Suggests:
- fglrx-driver,
+ ${fglrx}-driver,
 Conflicts:
  fglrx-kernel-src,
 Breaks:
  make (= 3.82-1),
-Description: kernel module source for the non-free ATI/AMD RadeonHD display driver
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Description: kernel module source for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
+ ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  This package provides the kernel build environment and the fglrx modules,
  which are necessary to have accelerated 3D support within the ATI/AMD
  proprietary display driver.
@@ -289,16 +313,22 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- fglrx-driver,
+ ${fglrx}-driver (= ${binary:Version}),
 Provides:
- fglrx-control-qt3,
-Replaces:
- fglrx-control-qt3,
- fglrx-amdcccle,
+ fglrx-control-virtual,
 Conflicts:
+ fglrx-control-virtual,
  fglrx-control-qt3,
  fglrx-control-qt2,
-Description: control panel for the non-free ATI/AMD RadeonHD display driver
+ fglrx-amdcccle,
+Replaces:
+ fglrx-control-virtual,
+Description: control panel for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
+ ${fglrx:Info}
+ .
+ .
+ ${fglrx:Models}
+ .
  Control panel for the ATI/AMD RadeonHD and FireGL graphics cards.
  .
  The control panel shows detailed information on your display adapter
@@ -314,17 +344,23 @@
  ${shlibs:Depends},
  lsb-base,
 Recommends:
- fglrx-driver (= ${binary:Version}),
+ ${fglrx}-driver (= ${binary:Version}),
  acpid,
+Provides:
+ fglrx-atieventsd-virtual,
+Conflicts:
+ fglrx-atieventsd-virtual,
 Breaks:
  fglrx-driver (<< 1:8-4-2),
 Replaces:
+ fglrx-atieventsd-virtual,
  fglrx-driver (<< 1:8-4-2),
-Description: external events daemon for the non-free ATI/AMD RadeonHD display driver
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
+Description: external events daemon for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
+ ${fglrx:Info}
  .
+ .
+ ${fglrx:Models}
+ .
  The ATI External Events Daemon atieventsd is a user-level application
  that monitors various system events such as ACPI or hotplug, then
  notifies the driver via the X extensions interface that the event has
@@ -344,18 +380,26 @@
 Enhances:
  libopencl1,
 Provides:
+ amd-opencl-icd-virtual,
  opencl-icd,
 Conflicts:
+ amd-opencl-icd-virtual,
+ amd-opencl-icd-ia32,
  amd-app,
+Replaces:
+ amd-opencl-icd-virtual,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
-Description: AMD OpenCL ICD
+Description: AMD OpenCL ICD${fglrx:VariantDescSuffix}
  OpenCL (Open Computing Language) is a multivendor open standard for
  general-purpose parallel programming of heterogeneous systems that include
  CPUs, GPUs and other processors.
  .
+ .
  This package provides the AMD installable client driver (ICD) for OpenCL
  which supports AMD GPUs (requires the fglrx driver) as well as CPUs (from
  any vendor, no driver required).
+ .
+ ${fglrx:Models}
 
 Package: amd-libopencl1
 Architecture: i386 amd64
@@ -373,6 +417,7 @@
  libopencl1,
  nvidia-libopencl1,
  nvidia-libopencl1-ia32 [i386],
+ amd-libopencl1-ia32,
  amd-app,
 Replaces:
  libopencl1,

Modified: packages-metadata/l/leaflet.control
===================================================================
--- packages-metadata/l/leaflet.control	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/l/leaflet.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -5,7 +5,7 @@
 Uploaders: Andrew Harvey <andrew.harvey4 at gmail.com>,
  Jonas Smedegaard <dr at jones.dk>
 Build-Depends: cdbs (>= 0.4.106~),
- debhelper (>= 8~),
+ debhelper,
  dh-buildinfo,
  node-uglify,
  node-jake

Modified: packages-metadata/l/leaflet.copyright
===================================================================
--- packages-metadata/l/leaflet.copyright	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/l/leaflet.copyright	2012-07-31 03:01:08 UTC (rev 2432)
@@ -1,61 +1,87 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?view=co&rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Leaflet
+Upstream-Contact: https://github.com/CloudMade/Leaflet/issues
 Source: https://github.com/CloudMade/Leaflet/
 
 Files: *
-Copyright: 2010-2011 CloudMade, Vladimir Agafonkin
-License: BSD-2
+Copyright: 2010-2012, CloudMade, Vladimir Agafonkin
+License: BSD-2-clause
 
+Files: spec/jasmine/*
+Copyright: 2008-2011, Pivotal Labs
+License: Expat
+
 Files: debian/*
 Copyright: 2011 Andrew Harvey <andrew.harvey4 at gmail.com>
-License: BSD-2 or GPL-2+
+License: BSD-2-clause or GPL-2+
 
 Files: debian/rules
 Copyright: 2011, Andrew Harvey <andrew.harvey4 at gmail.com>
            2010-2011, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
-License: BSD-2
+License: BSD-2-clause
  All rights reserved.
  .
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
  .
-    1. Redistributions of source code must retain the above copyright notice, this list of
-       conditions and the following disclaimer.
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
  .
-    2. Redistributions in binary form must reproduce the above copyright notice, this list
-       of conditions and the following disclaimer in the documentation and/or other materials
-       provided with the distribution.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the
+     distribution.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ Comment:
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems the 'GNU General Public License' version 2 is located
+ in '/usr/share/common-licenses/GPL-2'.
+ .
+ You should have received a copy of the 'GNU General Public License'
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

Added: packages-metadata/l/libdatetime-timezone-perl.control
===================================================================
--- packages-metadata/l/libdatetime-timezone-perl.control	                        (rev 0)
+++ packages-metadata/l/libdatetime-timezone-perl.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,39 @@
+Source: libdatetime-timezone-perl
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
+           gregor herrmann <gregoa at debian.org>,
+           Jonathan Yu <jawnsy at cpan.org>,
+           Ansgar Burchardt <ansgar at debian.org>,
+           Nicholas Bamber <nicholas at periapt.co.uk>
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: perl,
+                     libclass-load-perl,
+                     libclass-singleton-perl,
+                     libdatetime-perl,
+                     libparams-validate-perl,
+                     libtest-output-perl
+Standards-Version: 3.9.3
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libdatetime-timezone-perl.git
+Vcs-Git: git://git.debian.org/pkg-perl/packages/libdatetime-timezone-perl.git
+Homepage: http://datetime.perl.org/
+
+Package: libdatetime-timezone-perl
+Architecture: all
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         libclass-load-perl,
+         libclass-singleton-perl,
+         libparams-validate-perl,
+         perl
+Pre-Depends: dpkg (>= 1.15.6~)
+Description: framework exposing the Olson time zone database to Perl
+ DateTime::TimeZone is a Perl module framework providing an interface to the
+ Olson time zone database. It exposes the database as a set of modules, one
+ for each time zone defined, allowing for various optimizations in doing time
+ zone calculations.
+ .
+ The Olson time zone database is the best available source for worldwide time
+ zone information and is available from <URL:ftp://ftp.iana.org/tz/releases/>.
+

Added: packages-metadata/o/octave-splines.control
===================================================================
--- packages-metadata/o/octave-splines.control	                        (rev 0)
+++ packages-metadata/o/octave-splines.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,24 @@
+Source: octave-splines
+Section: math
+Priority: optional
+Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
+Uploaders: Thomas Weber <tweber at debian.org>,
+           Sébastien Villemot <sebastien.villemot at ens.fr>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.0)
+Standards-Version: 3.9.3
+Homepage: http://octave.sourceforge.net/splines
+Vcs-Git: git://git.debian.org/git/pkg-octave/octave-splines.git
+Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave-splines.git
+
+Package: octave-splines
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
+Description: cubic spline functions for Octave
+ This package provides functionality to work with additional cubic
+ spline functions in octave.
+ .
+ It contains functions to interpolate using cubic splines with various end
+ conditions as well as fucntions for differentiating splines and plotting them.
+ .
+ This Octave add-on package is part of the Octave-Forge project.

Added: packages-metadata/o/octave-splines.copyright
===================================================================
--- packages-metadata/o/octave-splines.copyright	                        (rev 0)
+++ packages-metadata/o/octave-splines.copyright	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,59 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Splines package for Octave
+Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
+Source: http://octave.sourceforge.net/splines/
+
+Files: inst/csape.m inst/csapi.m inst/fnder.m inst/fnplt.m
+Copyright: 2000-2001 Kai Habel
+License: GPL-2+
+
+Files: inst/catmullrom.m
+Copyright: 2008 Carlo de Falco
+License: GPL-2+
+
+Files: inst/fnval.m
+Copyright: 2004 Paul Kienzle
+License: other
+ This program is public domain.
+
+Files: debian/*
+Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+           2008-2009, 2011 Thomas Weber <tweber at debian.org>
+           2008, 2009, 2012 Rafael Laboissiere <rafael at laboissiere.net>
+License: GPL-3+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2,
+ or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 3, can be found in the file
+ `/usr/share/common-licenses/GPL-3'.

Modified: packages-metadata/o/opennebula.control
===================================================================
--- packages-metadata/o/opennebula.control	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/o/opennebula.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -57,6 +57,7 @@
          ruby-json,
          ruby-opennebula (= ${source:Version}),
          ruby-sinatra,
+         ruby-rack-protection,
          thin1.8,
          ${misc:Depends}
 Recommends: novnc

Modified: packages-metadata/o/opennebula.copyright
===================================================================
--- packages-metadata/o/opennebula.copyright	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/o/opennebula.copyright	2012-07-31 03:01:08 UTC (rev 2432)
@@ -63,8 +63,8 @@
 
 Files: debian/*
 Copyright: 2008, Soren Hansen <soren at ubuntu.com>
-Copyright: 2010, Damien Raude-Morvan <drazzib at debian.org>
-Copyright: 2011, Jaime Melis <jmelis at opennebula.org>
+ 2010, Damien Raude-Morvan <drazzib at debian.org>
+ 2011, Jaime Melis <jmelis at opennebula.org>
 License: Apache-2.0
 
 License: MIT

Added: packages-metadata/p/python-keyring.control
===================================================================
--- packages-metadata/p/python-keyring.control	                        (rev 0)
+++ packages-metadata/p/python-keyring.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,32 @@
+Source: python-keyring
+Priority: optional
+Section: python
+X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
+Maintainer: Carl Chenet <chaica at debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7.0.50~), python-all (>=2.6.6-3), python-setuptools, python3-all, python3-setuptools, unzip
+Standards-Version: 3.9.3
+Homepage: http://home.python-keyring.org/
+Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-keyring/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-keyring/trunk/
+
+Package: python-keyring
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Recommends: python-crypto
+Description: store and access your passwords safely
+ The Python keyring library provides an easy way to access the system
+ keyring service (e.g Gnome-Keyring, KWallet) from Python.
+ it can be used in any application that needs safe password storage.
+
+Package: python3-keyring
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Recommends: python3-crypto
+Description: store and access your passwords safely - Python 3 version of the package
+ The Python keyring library provides an easy way to access the system
+ keyring service (e.g Gnome-Keyring, KWallet) from Python.
+ it can be used in any application that needs safe password storage.
+ .
+ This is the Python 3 version of the package.

Added: packages-metadata/p/python-keyring.copyright
===================================================================
--- packages-metadata/p/python-keyring.copyright	                        (rev 0)
+++ packages-metadata/p/python-keyring.copyright	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,286 @@
+This package was debianized by Carl Chenet <chaica at ohmytux.com> on
+Tue, 01 Sep 2009 00:22:25 +0200.
+It was updated in Feb 2012 with the help of a great contribution of Barry
+Warsaw <barry at python.org> from the Ubuntu python-keyring package. Thanks!
+
+It was downloaded from http://pypi.python.org/pypi/keyring
+
+Upstream Author:
+
+    Kang Zhang <jobo.zh at gmail.com>
+
+Copyright:
+
+    Copyright © 2009 Kang Zhang
+
+License:
+
+    Copyright notice 
+    ----------------
+    
+    A. HISTORY OF THE SOFTWARE
+    ==========================
+    
+    Python was created in the early 1990s by Guido van Rossum at Stichting
+    Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
+    as a successor of a language called ABC.  Guido remains Python's
+    principal author, although it includes many contributions from others.
+    
+    In 1995, Guido continued his work on Python at the Corporation for
+    National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
+    in Reston, Virginia where he released several versions of the
+    software.
+    
+    In May 2000, Guido and the Python core development team moved to
+    BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
+    year, the PythonLabs team moved to Digital Creations (now Zope
+    Corporation, see http://www.zope.com).  In 2001, the Python Software
+    Foundation (PSF, see http://www.python.org/psf/) was formed, a
+    non-profit organization created specifically to own Python-related
+    Intellectual Property.  Zope Corporation is a sponsoring member of
+    the PSF.
+    
+    All Python releases are Open Source (see http://www.opensource.org for
+    the Open Source Definition).  Historically, most, but not all, Python
+    releases have also been GPL-compatible; the table below summarizes
+    the various releases.
+    
+        Release         Derived     Year        Owner       GPL-
+    		    from                                compatible? (1)
+    
+        0.9.0 thru 1.2              1991-1995   CWI         yes
+        1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
+        1.6             1.5.2       2000        CNRI        no
+        2.0             1.6         2000        BeOpen.com  no
+        1.6.1           1.6         2001        CNRI        yes (2)
+        2.1             2.0+1.6.1   2001        PSF         no
+        2.0.1           2.0+1.6.1   2001        PSF         yes
+        2.1.1           2.1+2.0.1   2001        PSF         yes
+        2.2             2.1.1       2001        PSF         yes
+        2.1.2           2.1.1       2002        PSF         yes
+        2.1.3           2.1.2       2002        PSF         yes
+        2.2.1           2.2         2002        PSF         yes
+        2.2.2           2.2.1       2002        PSF         yes
+        2.3             2.2.2       2002-2003   PSF         yes
+    
+    Footnotes:
+    
+    (1) GPL-compatible doesn't mean that we're distributing Python under
+        the GPL.  All Python licenses, unlike the GPL, let you distribute
+        a modified version without making your changes open source.  The
+        GPL-compatible licenses make it possible to combine Python with
+        other software that is released under the GPL; the others don't.
+    
+    (2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
+        because its license has a choice of law clause.  According to
+        CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
+        is "not incompatible" with the GPL.
+    
+    Thanks to the many outside volunteers who have worked under Guido's
+    direction to make these releases possible.
+    
+    
+    B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+    ===============================================================
+    
+    PSF LICENSE AGREEMENT FOR PYTHON 2.3
+    ------------------------------------
+    
+    1. This LICENSE AGREEMENT is between the Python Software Foundation
+    ("PSF"), and the Individual or Organization ("Licensee") accessing and
+    otherwise using Python 2.3 software in source or binary form and its
+    associated documentation.
+    
+    2. Subject to the terms and conditions of this License Agreement, PSF
+    hereby grants Licensee a nonexclusive, royalty-free, world-wide
+    license to reproduce, analyze, test, perform and/or display publicly,
+    prepare derivative works, distribute, and otherwise use Python 2.3
+    alone or in any derivative version, provided, however, that PSF's
+    License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+    2001, 2002 Python Software Foundation; All Rights Reserved" are
+    retained in Python 2.3 alone or in any derivative version prepared by
+    Licensee.
+    
+    3. In the event Licensee prepares a derivative work that is based on
+    or incorporates Python 2.3 or any part thereof, and wants to make
+    the derivative work available to others as provided herein, then
+    Licensee hereby agrees to include in any such work a brief summary of
+    the changes made to Python 2.3.
+    
+    4. PSF is making Python 2.3 available to Licensee on an "AS IS"
+    basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+    IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+    DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+    FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT
+    INFRINGE ANY THIRD PARTY RIGHTS.
+    
+    5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+    2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+    A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
+    OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+    
+    6. This License Agreement will automatically terminate upon a material
+    breach of its terms and conditions.
+    
+    7. Nothing in this License Agreement shall be deemed to create any
+    relationship of agency, partnership, or joint venture between PSF and
+    Licensee.  This License Agreement does not grant permission to use PSF
+    trademarks or trade name in a trademark sense to endorse or promote
+    products or services of Licensee, or any third party.
+    
+    8. By copying, installing or otherwise using Python 2.3, Licensee
+    agrees to be bound by the terms and conditions of this License
+    Agreement.
+    
+    
+    BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+    -------------------------------------------
+    
+    BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+    
+    1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+    office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+    Individual or Organization ("Licensee") accessing and otherwise using
+    this software in source or binary form and its associated
+    documentation ("the Software").
+    
+    2. Subject to the terms and conditions of this BeOpen Python License
+    Agreement, BeOpen hereby grants Licensee a non-exclusive,
+    royalty-free, world-wide license to reproduce, analyze, test, perform
+    and/or display publicly, prepare derivative works, distribute, and
+    otherwise use the Software alone or in any derivative version,
+    provided, however, that the BeOpen Python License is retained in the
+    Software, alone or in any derivative version prepared by Licensee.
+    
+    3. BeOpen is making the Software available to Licensee on an "AS IS"
+    basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+    IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+    DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+    FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+    INFRINGE ANY THIRD PARTY RIGHTS.
+    
+    4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+    SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+    AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+    DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+    
+    5. This License Agreement will automatically terminate upon a material
+    breach of its terms and conditions.
+    
+    6. This License Agreement shall be governed by and interpreted in all
+    respects by the law of the State of California, excluding conflict of
+    law provisions.  Nothing in this License Agreement shall be deemed to
+    create any relationship of agency, partnership, or joint venture
+    between BeOpen and Licensee.  This License Agreement does not grant
+    permission to use BeOpen trademarks or trade names in a trademark
+    sense to endorse or promote products or services of Licensee, or any
+    third party.  As an exception, the "BeOpen Python" logos available at
+    http://www.pythonlabs.com/logos.html may be used according to the
+    permissions granted on that web page.
+    
+    7. By copying, installing or otherwise using the software, Licensee
+    agrees to be bound by the terms and conditions of this License
+    Agreement.
+    
+    
+    CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+    ---------------------------------------
+    
+    1. This LICENSE AGREEMENT is between the Corporation for National
+    Research Initiatives, having an office at 1895 Preston White Drive,
+    Reston, VA 20191 ("CNRI"), and the Individual or Organization
+    ("Licensee") accessing and otherwise using Python 1.6.1 software in
+    source or binary form and its associated documentation.
+    
+    2. Subject to the terms and conditions of this License Agreement, CNRI
+    hereby grants Licensee a nonexclusive, royalty-free, world-wide
+    license to reproduce, analyze, test, perform and/or display publicly,
+    prepare derivative works, distribute, and otherwise use Python 1.6.1
+    alone or in any derivative version, provided, however, that CNRI's
+    License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+    1995-2001 Corporation for National Research Initiatives; All Rights
+    Reserved" are retained in Python 1.6.1 alone or in any derivative
+    version prepared by Licensee.  Alternately, in lieu of CNRI's License
+    Agreement, Licensee may substitute the following text (omitting the
+    quotes): "Python 1.6.1 is made available subject to the terms and
+    conditions in CNRI's License Agreement.  This Agreement together with
+    Python 1.6.1 may be located on the Internet using the following
+    unique, persistent identifier (known as a handle): 1895.22/1013.  This
+    Agreement may also be obtained from a proxy server on the Internet
+    using the following URL: http://hdl.handle.net/1895.22/1013".
+    
+    3. In the event Licensee prepares a derivative work that is based on
+    or incorporates Python 1.6.1 or any part thereof, and wants to make
+    the derivative work available to others as provided herein, then
+    Licensee hereby agrees to include in any such work a brief summary of
+    the changes made to Python 1.6.1.
+    
+    4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+    basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+    IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+    DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+    FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+    INFRINGE ANY THIRD PARTY RIGHTS.
+    
+    5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+    1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+    A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+    OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+    
+    6. This License Agreement will automatically terminate upon a material
+    breach of its terms and conditions.
+    
+    7. This License Agreement shall be governed by the federal
+    intellectual property law of the United States, including without
+    limitation the federal copyright law, and, to the extent such
+    U.S. federal law does not apply, by the law of the Commonwealth of
+    Virginia, excluding Virginia's conflict of law provisions.
+    Notwithstanding the foregoing, with regard to derivative works based
+    on Python 1.6.1 that incorporate non-separable material that was
+    previously distributed under the GNU General Public License (GPL), the
+    law of the Commonwealth of Virginia shall govern this License
+    Agreement only as to issues arising under or with respect to
+    Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+    License Agreement shall be deemed to create any relationship of
+    agency, partnership, or joint venture between CNRI and Licensee.  This
+    License Agreement does not grant permission to use CNRI trademarks or
+    trade name in a trademark sense to endorse or promote products or
+    services of Licensee, or any third party.
+    
+    8. By clicking on the "ACCEPT" button where indicated, or by copying,
+    installing or otherwise using Python 1.6.1, Licensee agrees to be
+    bound by the terms and conditions of this License Agreement.
+    
+            ACCEPT
+    
+    
+    CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+    --------------------------------------------------
+    
+    Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+    The Netherlands.  All rights reserved.
+    
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose and without fee is hereby granted,
+    provided that the above copyright notice appear in all copies and that
+    both that copyright notice and this permission notice appear in
+    supporting documentation, and that the name of Stichting Mathematisch
+    Centrum or CWI not be used in advertising or publicity pertaining to
+    distribution of the software without specific, written prior
+    permission.
+    
+    STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+    THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+    FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+    OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The Debian packaging is:
+
+    Copyright © 2009 Carl Chenet <chaica at ohmytux.com>
+
+and is licensed under the GPL version 3, 
+see `/usr/share/common-licenses/GPL-3'.
+

Modified: packages-metadata/s/scilab-celestlab.control
===================================================================
--- packages-metadata/s/scilab-celestlab.control	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/s/scilab-celestlab.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -8,7 +8,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab-toolboxes/celestlab/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab-toolboxes/celestlab/trunk
 Homepage: http://atoms.scilab.org/toolboxes/celestlab
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 
 Package: scilab-celestlab
 Architecture: all

Modified: packages-metadata/s/scim.control
===================================================================
--- packages-metadata/s/scim.control	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/s/scim.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -132,6 +132,7 @@
 
 Package: scim-clutter-immodule
 Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: scim, scim-im-agent (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Enhances: scim

Modified: packages-metadata/s/starpu-contrib.control
===================================================================
--- packages-metadata/s/starpu-contrib.control	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/s/starpu-contrib.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -17,7 +17,7 @@
 	qt4-qmake, libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev,
 	hardening-wrapper,
 	gcc-4.6, g++-4.6, gcc-4.6-plugin-dev,
-#	gcc-4.5, g++-4.5,
+#	gcc-4.4, g++-4.4,
 	help2man,
 #	nvidia-cuda-toolkit,
 #	libcuda1,

Added: packages-metadata/t/taglib-sharp.control
===================================================================
--- packages-metadata/t/taglib-sharp.control	                        (rev 0)
+++ packages-metadata/t/taglib-sharp.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,52 @@
+Source: taglib-sharp
+Section: cli-mono
+Priority: optional
+Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>,
+           Sebastian Dröge <slomo at debian.org>,
+           Chow Loong Jin <hyperair at debian.org>
+Build-Depends: debhelper (>= 7.0.50),
+               dh-autoreconf,
+               cli-common-dev (>= 0.5.7),
+               mono-devel (>= 2.4.3),
+               pkg-config,
+               libexiv2-dev,
+               monodoc-base
+Standards-Version: 3.9.3
+Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/taglib-sharp.git
+Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/taglib-sharp.git
+
+Package: libtaglib2.1-cil
+Architecture: all
+Depends: ${cli:Depends}, ${misc:Depends}
+Description: CLI library for accessing audio and video files metadata
+ TagLib# is a CLI library used to read and manipulate metadata
+ in different audio and video file formats.
+ .
+ This package contains the TagLib# assembly
+
+Package: libtaglib-cil-dev
+Architecture: all
+Depends: libtaglib2.1-cil (= ${binary:Version}), ${misc:Depends}
+Replaces: libtaglib2.0-cil (<< 2.0.3.3+dfsg-2)
+Description: CLI library for accessing audio and video files metadata
+ TagLib# is a CLI library used to read and manipulate metadata
+ in different audio and video file formats.
+ .
+ This package contains development files for TagLib#, and should be used
+ for development
+
+Package: monodoc-taglib-manual
+Section: doc
+Architecture: all
+Depends: monodoc-manual, ${misc:Depends}
+Description: compiled XML documentation for taglib-sharp
+ The MonoDoc Project is the documentation framework of the Mono project which
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
+ .
+ TagLib# is a CLI library used to read and manipulate metadata
+ in different audio and video file formats.
+ .
+ This package contains the compiled XML documentation for taglib-sharp.
+

Added: packages-metadata/t/taglib-sharp.copyright
===================================================================
--- packages-metadata/t/taglib-sharp.copyright	                        (rev 0)
+++ packages-metadata/t/taglib-sharp.copyright	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,328 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Taglib Sharp
+Upstream-Contact: Gabriel Burt <gabriel.burt at gmail.com>
+Source: http://download.banshee.fm/taglib-sharp/
+
+Files: src/*
+Copyright: 2005-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/Gif/GifCommentTag.cs
+       src/TagLib/IFD/Entries/*
+       src/TagLib/IFD/IFDEntry.cs
+       src/TagLib/IFD/IFDEntryType.cs
+       src/TagLib/IFD/IFDReader.cs
+       src/TagLib/IFD/IFDRenderer.cs
+       src/TagLib/IFD/IFDStructure.cs
+       src/TagLib/IFD/IFDTag.cs
+       src/TagLib/IFD/Makernotes/Nikon3MakernoteReader.cs
+       src/TagLib/IFD/Tags/CanonMakerNoteEntryTag.cs
+       src/TagLib/IFD/Tags/ExifEntryTag.cs
+       src/TagLib/IFD/Tags/GPSEntryTag.cs
+       src/TagLib/IFD/Tags/IFDEntryTag.cs
+       src/TagLib/IFD/Tags/IOPEntryTag.cs
+       src/TagLib/IFD/Tags/NikonPreviewMakerNoteEntryTag.cs
+       src/TagLib/Image/Codec.cs
+       src/TagLib/Jpeg/Codec.cs
+Copyright: 2009-2012, Mike Gemuende <mike at gemuende.de>
+           2009-2010, Ruben Vermeersch <ruben at savanne.be>
+License: LGPL-2.1
+
+Files: src/TagLib/IFD/Entries/SubIFDArrayEntry.cs
+       src/TagLib/IFD/IFDDirectory.cs
+       src/TagLib/IFD/Tags/CanonFileInfoEntryTag.cs
+       src/TagLib/IFD/Tags/CanonPictureInfoEntryTag.cs
+       src/TagLib/IFD/Tags/Nikon3MakerNoteEntryTag.cs
+       src/TagLib/IFD/Tags/NikonIsoInfoEntryTag.cs
+       src/TagLib/IFD/Tags/NikonLensData3EntryTag.cs
+       src/TagLib/IFD/Tags/NikonPictureControlEntryTag.cs
+       src/TagLib/IFD/Tags/NikonShotInfoEntryTag.cs
+       src/TagLib/IFD/Tags/NikonVibrationReductionEntryTag.cs
+       src/TagLib/IFD/Tags/NikonWorldTimeEntryTag.cs
+       src/TagLib/IFD/Tags/OlympusMakerNoteEntryTag.cs
+       src/TagLib/IFD/Tags/PanasonicMakerNoteEntryTag.cs
+       src/TagLib/IFD/Tags/PentaxMakerNoteEntryTag.cs
+       src/TagLib/IFD/Tags/SonyMakerNoteEntryTag.cs
+       src/TagLib/Image/File.cs
+       src/TagLib/Image/NoMetadata/File.cs
+       src/TagLib/Jpeg/JpegCommentTag.cs
+       src/TagLib/Tiff/*
+       src/TagLib/Xmp/*
+Copyright: 2009-2010, Ruben Vermeersch
+License: LGPL-2.1
+
+Files: src/TagLib/Genres.cs
+       src/TagLib/Id3v1/StringHandler.cs
+       src/TagLib/Id3v1/Tag.cs
+       src/TagLib/Id3v2/ExtendedHeader.cs
+       src/TagLib/Id3v2/Footer.cs
+       src/TagLib/Id3v2/Frame.cs
+       src/TagLib/Id3v2/FrameFactory.cs
+       src/TagLib/Id3v2/Frames/AttachedPictureFrame.cs
+       src/TagLib/Id3v2/Frames/CommentsFrame.cs
+       src/TagLib/Id3v2/Frames/GeneralEncapsulatedObjectFrame.cs
+       src/TagLib/Id3v2/Frames/RelativeVolumeFrame.cs
+       src/TagLib/Id3v2/Frames/UniqueFileIdentifierFrame.cs
+       src/TagLib/Id3v2/Frames/UnknownFrame.cs
+       src/TagLib/Id3v2/Header.cs
+       src/TagLib/Id3v2/SynchData.cs
+       src/TagLib/Mpeg/AudioFile.cs
+       src/TagLib/Mpeg/AudioHeader.cs
+       src/TagLib/Ogg/File.cs
+       src/TagLib/Ogg/Page.cs
+       src/TagLib/Ogg/PageHeader.cs
+       src/TagLib/Ogg/Paginator.cs
+       src/TagLib/Ogg/XiphComment.cs
+       src/TagLib/Properties.cs
+Copyright: 2002-2007, Scott Wheeler
+           2005-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/Gif/Codec.cs
+       src/TagLib/Gif/File.cs
+       src/TagLib/IFD/Entries/StripOffsetsIFDEntry.cs
+       src/TagLib/Image/CombinedImageTag.cs
+       src/TagLib/Image/ImageBlockFile.cs
+       src/TagLib/Image/ImageTag.cs
+       src/TagLib/Png/Codec.cs
+       src/TagLib/Png/File.cs
+       src/TagLib/Png/PngTag.cs
+       src/TagLib/Tiff/BaseTiffFile.cs
+       src/TagLib/Tiff/Cr2/File.cs
+Copyright: 2009-2010, Mike Gemuende <mike at gemuende.be>
+License: LGPL-2.1
+
+Files: src/TagLib/Matroska/*
+Copyright: 2011, FLUENDO S.A
+License: LGPL-2.1
+
+Files: src/TagLib/ICodec.cs
+       src/TagLib/Id3v2/Frames/MusicCdIdentifierFrame.cs
+       src/TagLib/Id3v2/Frames/PlayCountFrame.cs
+       src/TagLib/Id3v2/Frames/PopularimeterFrame.cs
+       src/TagLib/NonContainer/EndTag.cs
+       src/TagLib/NonContainer/File.cs
+       src/TagLib/NonContainer/StartTag.cs
+       src/TagLib/NonContainer/Tag.cs
+       src/TagLib/ReadOnlyByteVector.cs
+Copyright: 2007, Brian Nickel <brian.nickel at gmail.com>
+License: MIT/X11
+
+Files: src/TagLib/Ape/Item.cs
+       src/TagLib/Ape/Tag.cs
+       src/TagLib/Flac/File.cs
+       src/TagLib/Flac/StreamHeader.cs
+       src/TagLib/Mpc/File.cs
+       src/TagLib/Mpc/StreamHeader.cs
+Copyright: 2003-2004, Allan Sandfeld Jensen
+           2005-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/ByteVector.cs
+       src/TagLib/ByteVectorList.cs
+       src/TagLib/File.cs
+       src/TagLib/Id3v2/FrameHeader.cs
+       src/TagLib/Id3v2/Tag.cs
+       src/TagLib/Picture.cs
+Copyright: 2002-2004, Scott Wheeler
+           2005-2007, Brian Nickel <brian.nickel at gmail.com>
+           2006, 2010, Novell, Inc
+License: LGPL-2.1
+
+Files: src/TagLib/Ape/File.cs
+       src/TagLib/Ape/StreamHeader.cs
+       src/TagLib/Mpeg/VBRIHeader.cs
+Copyright: 2005-2007, Brian Nickel <brian.nickel at gmail.com>
+           2007, Helmut Wahrmann
+License: LGPL-2.1
+
+Files: src/TagLib/CorruptFileException.cs
+       src/TagLib/FileTypes.cs
+       src/TagLib/UnsupportedFormatException.cs
+Copyright: 2005-2006, Novell, Inc
+License: LGPL-2.1
+
+Files: src/TagLib/Aac/AudioHeader.cs
+       src/TagLib/Aac/BitStream.cs
+       src/TagLib/Aac/File.cs
+Copyright: 2009, Patrick Dehne
+License: LGPL-2.1
+
+Files: src/TagLib/WavPack/File.cs
+       src/TagLib/WavPack/StreamHeader.cs
+Copyright: 2004, Allan Sandfeld Jensen
+           2006, Lukáš Lalinský
+           2006-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/StringList.cs
+       src/TagLib/SupportedMimeType.cs
+Copyright: 2005-2007, Brian Nickel <brian.nickel at gmail.com>
+           2006, Novell, Inc
+License: LGPL-2.1
+
+Files: src/TagLib/Audible/File.cs
+       src/TagLib/Audible/Tag.cs
+Copyright: 2009, Guy Taylor
+License: LGPL-2.1
+
+Files: src/TagLib/Aiff/File.cs
+       src/TagLib/Aiff/StreamHeader.cs
+Copyright: 2009, Helmut Wahrmann
+License: LGPL-2.1
+
+Files: src/TagLib/Mpeg4/Boxes/TextBox.cs
+       src/TagLib/Mpeg4/Boxes/UrlBox.cs
+Copyright: 2012, Alan McGovern
+License: LGPL-2.1+
+
+Files: src/AssemblyInfo.cs
+Copyright: 2006-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/Asf/ContentDescriptionObject.cs
+Copyright: 2006-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/Ape/Footer.cs
+Copyright: 2002-2003, Scott Wheeler
+           2004, Allan Sandfeld Jensen
+           2005-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/Mpeg/XingHeader.cs
+Copyright: 2003, Ismael Orenstein
+           2005-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/Id3v2/Frames/TextIdentificationFrame.cs
+Copyright: 2002-2003, Scott Wheeler
+           2005-2007, Brian Nickel <brian.nickel at gmail.com>
+           2000, Martin Nilsson
+License: LGPL-2.1
+
+Files: src/TagLib/Tag.cs
+Copyright: 2003, Scott Wheeler
+           2005-2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+
+Files: src/TagLib/Id3v2/Frames/UnsynchronisedLyricsFrame.cs
+Copyright: 2002-2003, Scott Wheeler
+           2007, Brian Nickel <brian.nickel at gmail.com>
+License: LGPL-2.1
+ FIXME
+
+Files: src/TagLib/Jpeg/File.cs
+Copyright: 2009, Mike Gemuende <mike at gemuende.de>
+           2009, Ruben Vermeersch <ruben at savanne.be>
+           2009, Stephane Delcroix <stephane at delcroix.org>
+License: LGPL-2.1
+
+Files: src/TagLib/ListBase.cs
+Copyright: 2002-2003, Scott Wheeler
+           2006, Novell, Inc
+License: LGPL-2.1
+
+Files: src/TagLib/Image/ImageOrientation.cs
+Copyright: 2009, Paul Lange <palango at gmx.de>
+License: LGPL-2.1
+
+Files: src/TagLib/Jpeg/Marker.cs
+Copyright: 2009, Ruben Vermeersch <ruben at savanne.be>
+           2009, Stephane Delcroix <stephane at delcroix.org>
+License: LGPL-2.1
+
+Files: src/TagLib/Jpeg/Table.cs
+Copyright: 2009, Stephane Delcroix <stephane at delcroix.org>
+License: LGPL-2.1
+
+Files: src/TagLib/IIM/IIMTag.cs
+Copyright: 2012, Eberhard Beilharz <eb1 at sil.org>
+License: LGPL-2.1+
+
+Files: src/TagLib/IIM/IIMReader.cs
+Copyright: 2012, Eberhard Beilharz <eb1 at sil.org>
+License: LGPL-2.1+
+
+Files: docs/XmlInjector.cs
+Copyright: 2008, Brian Nickel <brian.nickel at gmail.com>
+License: MIT/X11
+
+Files: debian/*
+Copyright: 2007, Jose Carlos Garcia Sogo <jsogo at debian.org>
+           2007, Sebastian Dröge <slomo at debian.org>
+           2009-2012, Chow Loong Jin <hyperair at debian.org>
+License: GPL-2+
+
+License: MIT/X11
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of this license can be found in
+ /usr/share/common-licenses/GPL-2.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of this license can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation;
+ version 2.1 of the License.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of this license can be found in
+ /usr/share/common-licenses/LGPL-2.1.

Added: packages-metadata/z/zabbix.control
===================================================================
--- packages-metadata/z/zabbix.control	                        (rev 0)
+++ packages-metadata/z/zabbix.control	2012-07-31 03:01:08 UTC (rev 2432)
@@ -0,0 +1,190 @@
+Source: zabbix
+Section: net
+Priority: optional
+Maintainer: Christoph Haas <haas at debian.org>
+Uploaders: Fabio Tranchitella <kobold at debian.org>, Michael Ablassmeier <abi at debian.org>, Dmitry Smirnov <onlyjob at member.fsf.org>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 9), automake1.9, dh-autoreconf, po-debconf
+ ,libcurl4-gnutls-dev | libcurl3-gnutls-dev
+ ,libgcrypt-dev
+ ,libiksemel-dev
+ ,libldap2-dev
+ ,libmysqlclient-dev
+# libopenipmi-dev is not available on some architectures
+ ,libopenipmi-dev [!hurd-any !arm]
+ ,libpq-dev
+ ,libsnmp9-dev | libsnmp-dev
+ ,libsqlite3-dev
+ ,libssh2-1-dev (>= 1.0.0)
+Standards-Version: 3.9.3
+Homepage: http://zabbix.com
+Vcs-Git: git://git.debian.org/git/collab-maint/zabbix.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/zabbix.git
+
+Package: zabbix-agent
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, adduser, lsb-base
+Suggests: logrotate
+Description: network monitoring solution - agent
+ Zabbix is a server/client network monitoring system with many features.
+ It can be used for:
+ .
+  - high level monitoring of IT services;
+  - centralized monitoring of your servers and applications;
+  - monitoring of SNMP-enabled devices;
+  - performance monitoring (process load, network activity, disk
+    activity, memory usage, OS parameters etc.);
+  - data visualization.
+ .
+ This package provides the software needed to monitor a host using a
+ Zabbix agent.
+
+Package: zabbix-frontend-php
+Architecture: all
+Depends: ${misc:Depends}, ucf, apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, php5-gd, ttf-dejavu-core
+Suggests: libapache2-mod-php5 | php5-fpm, php5-pgsql | php5-mysql
+Description: network monitoring solution - PHP front-end
+ Zabbix is a server/client network monitoring system with many features.
+ It can be used for:
+ .
+  - high level monitoring of IT services;
+  - centralized monitoring of your servers and applications;
+  - monitoring of SNMP-enabled devices;
+  - performance monitoring (process load, network activity, disk
+    activity, memory usage, OS parameters etc.);
+  - data visualization.
+ .
+ This package provides a web-browsable front-end to the Zabbix server, which
+ can display graphs of the data collected from clients.
+
+Package: zabbix-proxy-mysql
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, adduser, lsb-base
+Recommends: mysql-server (>= 5.0)
+Suggests: logrotate
+Conflicts: zabbix-proxy-pgsql, zabbix-proxy-sqite3, zabbix-server-mysql, zabbix-server-pgsql, zabbix-server-sqlite3
+Description: network monitoring solution - proxy (using MySQL)
+ Zabbix is a server/client network monitoring system with many features.
+ It can be used for:
+ .
+  - high level monitoring of IT services;
+  - centralized monitoring of your servers and applications;
+  - monitoring of SNMP-enabled devices;
+  - performance monitoring (process load, network activity, disk
+    activity, memory usage, OS parameters etc.);
+  - data visualization.
+ .
+ This package provides the software needed to integrate a host as a Zabbix
+ proxy. It collects information from Zabbix agents, temporarily stores it
+ in a MySQL database and then passes it to a Zabbix server.
+
+Package: zabbix-proxy-pgsql
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, adduser, lsb-base
+Recommends: postgresql
+Conflicts: zabbix-proxy-mysql, zabbix-proxy-sqlite3, zabbix-server-mysql, zabbix-server-pgsql, zabbix-server-sqlite3
+Suggests: logrotate
+Description: network monitoring solution - proxy (using PostgreSQL)
+ Zabbix is a server/client network monitoring system with many features.
+ It can be used for:
+ .
+  - high level monitoring of IT services;
+  - centralized monitoring of your servers and applications;
+  - monitoring of SNMP-enabled devices;
+  - performance monitoring (process load, network activity, disk
+    activity, memory usage, OS parameters etc.);
+  - data visualization.
+ .
+ This package provides the software needed to integrate a host as a Zabbix
+ proxy. It collects information from Zabbix agents, temporarily stores it
+ in a PostgreSQL database and then passes it to a Zabbix server.
+
+Package: zabbix-proxy-sqlite3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, adduser, lsb-base, sqlite3
+Suggests: logrotate
+Conflicts: zabbix-proxy-pgsql, zabbix-proxy-mysql, zabbix-server-mysql, zabbix-server-pgsql, zabbix-server-sqlite3
+Description: network monitoring solution - proxy (using SQLite3)
+ Zabbix is a server/client network monitoring system with many features.
+ It can be used for:
+ .
+  - high level monitoring of IT services;
+  - centralized monitoring of your servers and applications;
+  - monitoring of SNMP-enabled devices;
+  - performance monitoring (process load, network activity, disk
+    activity, memory usage, OS parameters etc.);
+  - data visualization.
+ .
+ This package provides the software needed to integrate a host as a Zabbix
+ proxy. It collects information from Zabbix agents, temporarily stores it
+ in an SQLite3 database and then passes it to a Zabbix server.
+
+Package: zabbix-server-mysql
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, adduser, lsb-base
+Pre-Depends: debconf
+Recommends: mysql-server (>= 5.0), snmpd
+Suggests: zabbix-frontend-php, logrotate
+Conflicts: zabbix-server-pgsql, zabbix-server-sqlite3, zabbix-proxy-mysql, zabbix-proxy-pgsql, zabbix-proxy-sqlite3
+Description: network monitoring solution - server (using MySQL)
+ Zabbix is a server/client network monitoring system with many features.
+ It can be used for:
+ .
+  - high level monitoring of IT services;
+  - centralized monitoring of your servers and applications;
+  - monitoring of SNMP-enabled devices;
+  - performance monitoring (process load, network activity, disk
+    activity, memory usage, OS parameters etc.);
+  - data visualization.
+ .
+ This package provides the software needed to integrate a host as a Zabbix
+ client. It collects information from Zabbix clients and stores it in a
+ MySQL database.
+
+Package: zabbix-server-pgsql
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, adduser, lsb-base
+Pre-Depends: debconf
+Recommends: postgresql, snmpd
+Suggests: zabbix-frontend-php, logrotate
+Conflicts: zabbix-server-mysql, zabbix-server-sqlite3, zabbix-proxy-mysql, zabbix-proxy-pgsql, zabbix-proxy-sqlite3
+Description: network monitoring solution - server (using PostgreSQL)
+ Zabbix is a server/client network monitoring system with many features.
+ It can be used for:
+ .
+  - high level monitoring of IT services;
+  - centralized monitoring of your servers and applications;
+  - monitoring of SNMP-enabled devices;
+  - performance monitoring (process load, network activity, disk
+    activity, memory usage, OS parameters etc.);
+  - data visualization.
+ .
+ This package provides the software needed to integrate a host as a Zabbix
+ client. It collects information from Zabbix clients and stores it in a
+ PostgreSQL database.
+
+#Package: zabbix-server-sqlite3
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, fping, adduser, lsb-base
+#Pre-Depends: debconf
+#Recommends: snmpd
+#Suggests: logrotate
+#Conflicts: zabbix-server-mysql, zabbix-server-pgsql, zabbix-proxy-mysql, zabbix-proxy-pgsql, zabbix-proxy-sqlite3
+#Description: network monitoring solution - server (using SQLite3)
+# Zabbix is a server/client network monitoring system with many features.
+# It can be used for:
+# .
+#  - high level monitoring of IT services;
+#  - centralized monitoring of your servers and applications;
+#  - monitoring of SNMP-enabled devices;
+#  - performance monitoring (process load, network activity, disk
+#    activity, memory usage, OS parameters etc.);
+#  - data visualization.
+# .
+# This package provides the software needed to integrate a host as a Zabbix
+# client. It collects information from Zabbix clients and stores it in a
+# Sqlite3 file/database
+# .
+# Warning: zabbix-server/SQLite3 is experimental and may be unstable.
+# Upstream do not support it.
+# KNOWN BUG: Causing deadlock with frontend-php.

Modified: packages-metadata/z/zabbix.copyright
===================================================================
--- packages-metadata/z/zabbix.copyright	2012-07-30 03:01:14 UTC (rev 2431)
+++ packages-metadata/z/zabbix.copyright	2012-07-31 03:01:08 UTC (rev 2432)
@@ -1,33 +1,150 @@
-This package was debianized by Michael Ablassmeier <abi at debian.org> on
-Tue, 23 Mar 2004 22:46:45 +0100. It is actually maintained by Michael
-Ablassmeier and Fabio Tranchitella <kobold at debian.org>. Today it is mainly
-maintained by Christoph Haas <haas at debian.org> and Fabio Tranchitella
-<kobold at debian.org>.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Zabbix
+Upstream-Contact: Alexei Vladishev <alexei.vladishev at zabbix.com>
+Source: http://www.zabbix.com/download.php
+Copyright: 2000-2012 Zabbix SIA
+License: GPL-2+
+Comment:
+ This package was debianized by Michael Ablassmeier <abi at debian.org>
+ on Tue, 23 Mar 2004 22:46:45 +0100.
 
-It was downloaded from http://www.zabbix.com/download.php 
+Files: debian/*
+Copyright: 2009-2012 Christoph Haas <haas at debian.org>
+           2012      Dmitry Smirnov <onlyjob at member.fsf.org>
+           2006-2009 Fabio Tranchitella <kobold at debian.org>
+           2006-2011 Michael Ablassmeier <abi at debian.org>
+License: GPL-2+
 
-Upstream Author: Alexei Vladishev <alexei.vladishev at zabbix.com>
+Files: *
+Copyright: 2000-2012 Zabbix SIA
+License: GPL-2+
+Comment:
+ Author: Alexei Vladishev <alexei.vladishev at zabbix.com>
 
-Copyright:
+Files: include/gnuregex.h
+       include/zbxgetopt.h
+       src/libs/zbxcommon/zbxgetopt.c
+       src/libs/zbxcommon/gnuregex.c
+Copyright: 1985,1987,1988-1993 Free Software Foundation, Inc
+License: GPL-2+
 
-    Copyright (C) 2000-2005 SIA Zabbix
-    Author: Alexei Vladishev <alexei.vladishev at zabbix.com>
+Files: include/md5.h src/libs/zbxcrypto/md5.c
+Copyright: 1999,2000,2002 Aladdin Enterprises. All rights reserved
+License:
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ .
+ L. Peter Deutsch
+ ghost at aladdin.com
 
-    For the win32 agent:
-      Copyright (C) 2002,2003 Victor Kirhenshtein
+Files: src/libs/zbxcommon/str.c
+Copyright: 2000-2011 Zabbix SIA
+License: GPL-2+
+Comment: with portions
+ Copyright: 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ License:
+  Permission to use, copy, modify, and distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-    For the md5 implementations:
-      Copyright (C) 1999, 2002 Aladdin Enterprises
+Files: src/libs/zbxsys/mutexs.c
+Copyright: 2000-2011 Zabbix SIA
+License: GPL-2+
+Comment:
+ Part of source file is subject to version 3.01 of the PHP license
+ that is available at http://www.php.net/license/3_01.txt
+ Copyright: 1997-2006 The PHP Group
+ License: PHP-3.01
+  The PHP License, version 3.01
+  Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
+  --------------------------------------------------------------------
+  Redistribution and use in source and binary forms, with or without
+  modification, is permitted provided that the following conditions
+  are met:
+  .
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+  .
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+  .
+   3. The name "PHP" must not be used to endorse or promote products
+      derived from this software without prior written permission. For
+      written permission, please contact group at php.net.
+  .
+   4. Products derived from this software may not be called "PHP", nor
+      may "PHP" appear in their name, without prior written permission
+      from group at php.net.  You may indicate that your software works in
+      conjunction with PHP by saying "Foo for PHP" instead of calling
+      it "PHP Foo" or "phpfoo"
+  .
+   5. The PHP Group may publish revised and/or new versions of the
+      license from time to time. Each version will be given a
+      distinguishing version number.
+      Once covered code has been published under a particular version
+      of the license, you may always continue to use it under the terms
+      of that version. You may also choose to use such covered code
+      under the terms of any subsequent version of the license
+      published by the PHP Group. No one other than the PHP Group has
+      the right to modify the terms applicable to covered code created
+      under this License.
+  .
+   6. Redistributions of any form whatsoever must retain the following
+      acknowledgment:
+      "This product includes PHP software, freely available from
+      <http://www.php.net/software/>".
+   .
+  THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
+  ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+  DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+  OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    For the init.d for SuSE in misc/init.d/suse:
-      Copyright (c) 07/2004 A.Tophofen, Germany
+Files: misc/init.d/suse/*
+Copyright: 2004 A.Tophofen
+License: GPL-2+
+Comment: assuming the same license as for the whole application
 
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as
-  published by the Free Software Foundation.
-
-  On Debian GNU/Linux systems, the complete text of the GNU General
-  Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in `/usr/share/common-licenses/GPL-2'.




More information about the Collab-qa-commits mailing list