Viewing all changes in revision 29.
- Committer: Package Import Robot
- Date: 2014-01-19 22:07:18 UTC
- mfrom: (15.1.13 sid)
- Revision ID: package-import@ubuntu.com-20140119220718-idkyepfw1zvr6cm2
* Merge from Debian unstable. Remaining changes:
  - debian/control: Add libnet-sftp-foreign-perl to dependencies.
  - debian/control: Apache2 transition.
  - Port from ffmpeg to avconv.
  - Still build-depending on libgnutls-dev
  - debian/control: Add libnet-sftp-foreign-perl to dependencies.
  - debian/control: Apache2 transition.
  - Port from ffmpeg to avconv.
  - Still build-depending on libgnutls-dev
- files added:
- .gitignore
- cmake
- cmake/Modules
- distros
- distros/debian
- distros/fedora
- distros/fedora/jscalendar.sh
- distros/redhat
- distros/ubuntu1204
- doc-pak
- umutils
- web/scripts
- files removed:
- .pc/Fix-FTBFS-with-gcc-4.7
- .pc/Fix-FTBFS-with-gcc-4.7/src
- .pc/cve-2013-0232
- .pc/cve-2013-0232/web
- .pc/cve-2013-0232/web/includes
- .pc/fix-ftbfs-libav9.patch
- .pc/fix-ftbfs-libav9.patch/src
- .pc/include-avutil-mathematics-header
- .pc/include-avutil-mathematics-header/src
- .pc/suppported-typo
- .pc/suppported-typo/src
- .pc/upgrade_script_loc
- .pc/upgrade_script_loc/scripts
- .pc/zm-ffmpeg-as-c-library
- .pc/zm-ffmpeg-as-c-library/src
- .pc/zoneminder-1.25.0-kernel35.patch
- .pc/zoneminder-1.25.0-kernel35.patch/src
- files modified:
- .pc/applied-patches
- web/ajax/status.php *
expand all
collapse all
added
removed
