From 5f4e4421617526dcbd4a197a1271b89c8aa84434 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 13 Dec 2014 19:45:36 -0500 Subject: [PATCH] Merge pull request #636 from manupap1/debian_folder_fix Some fixes to the debian folder Conflicts: distros/debian/install --- distros/debian/README.source | 5 +++++ distros/debian/control | 18 ++++++++--------- distros/debian/install | 12 +++++++++++ distros/debian/patches/01_vendor-perl.diff | 17 ++++++++++++++++ distros/debian/patches/series | 1 + distros/debian/rules | 23 +++++++++------------- 6 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 distros/debian/README.source create mode 100644 distros/debian/install create mode 100644 distros/debian/patches/01_vendor-perl.diff create mode 100644 distros/debian/patches/series diff --git a/distros/debian/README.source b/distros/debian/README.source new file mode 100644 index 0000000000..646e55d86e --- /dev/null +++ b/distros/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream source. +Changes are stored in the source package as diffs in debian/patches and applied +during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. diff --git a/distros/debian/control b/distros/debian/control index 81ed172522..285c2257c2 100644 --- a/distros/debian/control +++ b/distros/debian/control @@ -2,15 +2,15 @@ Source: zoneminder Section: net Priority: optional Maintainer: Isaac Connor -Build-Depends: debhelper (>= 7.0.50), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev|libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9), autoconf, automake, quilt, libphp-serialization-perl, libgnutls-dev|libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev +Standards-Version: 3.9.4 Package: zoneminder Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl Recommends: mysql-server|mariadb-server -Description: A video camera security and surveillance solution - ZoneMinder is intended for use in single or multi-camera video security +Description: Video camera security and surveillance solution + ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child or family member or home monitoring and other care scenarios. It supports capture, analysis, recording, and monitoring of video data coming @@ -22,13 +22,13 @@ Description: A video camera security and surveillance solution via X.10 or other protocols. Package: zoneminder-dbg +Section: debug +Priority: extra Architecture: any -Depends: - zoneminder (= ${binary:Version}), - ${misc:Depends} -Description: debugging syumbols for zoneminder. +Depends: zoneminder (= ${binary:Version}), ${misc:Depends} +Description: Debugging symbols for zoneminder. ZoneMinder is a video camera security and surveillance solution. - ZoneMinder is intended for use in single or multi-camera video security + ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child or family member or home monitoring and other care scenarios. It supports capture, analysis, recording, and monitoring of video data coming diff --git a/distros/debian/install b/distros/debian/install new file mode 100644 index 0000000000..4b0009cea5 --- /dev/null +++ b/distros/debian/install @@ -0,0 +1,12 @@ +usr/bin +usr/lib/cgi-bin +usr/share/man +usr/share/perl5/ZoneMinder +usr/share/perl5/ZoneMinder.pm +usr/share/polkit-1/actions +usr/share/polkit-1/rules.d +usr/share/zoneminder +etc/zm +db/zm_create.sql usr/share/zoneminder/db +db/zm_update-*.sql usr/share/zoneminder/db +debian/apache.conf etc/zm diff --git a/distros/debian/patches/01_vendor-perl.diff b/distros/debian/patches/01_vendor-perl.diff new file mode 100644 index 0000000000..a58ef87781 --- /dev/null +++ b/distros/debian/patches/01_vendor-perl.diff @@ -0,0 +1,17 @@ +Index: ZoneMinder/configure.ac +=================================================================== +--- ZoneMinder.orig/configure.ac 2014-12-13 15:10:27.705191682 +0100 ++++ ZoneMinder/configure.ac 2014-12-13 16:50:07.101049743 +0100 +@@ -443,10 +443,10 @@ + PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"` + PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"` + EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" +- PERL_MM_PARMS="PREFIX=$prefix" ++ PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\"" + else + EXTRA_PERL_LIB="# Include from system perl paths only" +- PERL_MM_PARMS= ++ PERL_MM_PARMS="\"INSTALLDIRS=vendor\"" + fi + AC_SUBST(PERL_MM_PARMS) + AC_SUBST(EXTRA_PERL_LIB) diff --git a/distros/debian/patches/series b/distros/debian/patches/series new file mode 100644 index 0000000000..b479dc5077 --- /dev/null +++ b/distros/debian/patches/series @@ -0,0 +1 @@ +01_vendor-perl.diff diff --git a/distros/debian/rules b/distros/debian/rules index df11f49882..d07d3b8233 100755 --- a/distros/debian/rules +++ b/distros/debian/rules @@ -25,10 +25,10 @@ else endif %: - dh $@ --with autoreconf + dh $@ --with quilt,autoreconf override_dh_auto_configure: - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes override_dh_clean: # Add here commands to clean up after the build process. @@ -36,28 +36,23 @@ override_dh_clean: dh_clean override_dh_install: - # Add here commands to install the package into debian/zm. - $(MAKE) install DESTDIR=$(CURDIR)/debian/zoneminder RUNDIR=$(CURDIR)/debian/zoneminder/var/run ZM_RUNDIR=$(CURDIR)/debian/zoneminder/var/run - install -D -m 0644 db/zm_create.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db - install -D -m 0644 db/zm_update-*.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db - install -D -m 0644 debian/apache.conf $(CURDIR)/debian/zoneminder/etc/zm + dh_install --fail-missing # # NOTE: This is a short-term kludge; hopefully changes in the next # upstream version will render this unnecessary. rm -rf debian/zoneminder/usr/share/zoneminder/events rm -rf debian/zoneminder/usr/share/zoneminder/images rm -rf debian/zoneminder/usr/share/zoneminder/temp - ln -s /var/cache/zoneminder/events debian/zoneminder/usr/share/zoneminder/ - ln -s /var/cache/zoneminder/images debian/zoneminder/usr/share/zoneminder/ - ln -s /var/cache/zoneminder/temp debian/zoneminder/usr/share/zoneminder/ - + dh_link var/cache/zoneminder/events usr/share/zoneminder/events + dh_link var/cache/zoneminder/images usr/share/zoneminder/images + dh_link var/cache/zoneminder/temp usr/share/zoneminder/temp # - # This is a slightly lesser kludge; moving the cgi stuff to + # This is a slightly lesser kludge; moving the cgi stuff to # /usr/share/zoneminder/cgi-bin breaks one set of behavior, - # having it just in /usr/lib/cgi-bin breaks another bit of + # having it just in /usr/lib/cgi-bin breaks another bit of # behavior. # - ln -s /usr/lib/cgi-bin debian/zoneminder/usr/share/zoneminder/ + dh_link usr/lib/cgi-bin usr/share/zoneminder/cgi-bin override_dh_fixperms: dh_fixperms