Emmanuel Papin
ce90a37bb8
Merge branch 'debian_package_split' into plugin_support
...
Conflicts:
distros/debian8/patches/series
2015-01-13 01:11:04 +01:00
Emmanuel Papin
47ef5c999f
Add dependency to apache2 for zoneminder-core package
2015-01-12 22:22:40 +01:00
Emmanuel Papin
f05dc5e2a3
Rename debian patch
2015-01-12 21:03:29 +01:00
Emmanuel Papin
e1824aad4b
Fix a conflict when merging upstream master
2015-01-12 20:52:14 +01:00
Emmanuel Papin
0650ca1de0
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
...
Conflicts:
distros/debian8/patches/01_vendor-perl.diff
distros/debian8/patches/series
2015-01-12 20:48:59 +01:00
Emmanuel Papin
39e6de8f68
Fix conflict when merging from master
2015-01-04 12:29:20 +01:00
Emmanuel Papin
f551b50ec0
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
...
Conflicts:
distros/debian8/patches/01_vendor-perl.diff
distros/debian8/patches/series
2015-01-04 12:23:29 +01:00
Emmanuel Papin
0de7217317
Remove no longer needed patch because applied to master
2015-01-03 14:13:41 +01:00
Emmanuel Papin
7fc359e940
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2015-01-03 13:46:41 +01:00
Emmanuel Papin
d61becb0d7
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2015-01-03 13:22:40 +01:00
Emmanuel Papin
d070b36aec
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2014-12-31 12:23:26 +01:00
Isaac Connor
d958a13114
this patch has been applied to master branch and is no longer needed.
2014-12-30 09:49:14 -05:00
Emmanuel Papin
a9986d6aa0
Merge branch 'debian_package_split' into plugin_support
2014-12-28 11:09:42 +01:00
Emmanuel Papin
bb2cecee8a
Update of build dependencies
2014-12-28 11:04:53 +01:00
Andrew Cook
c69badc70d
Don't check for zmdc.pl when stopping via systemd
...
If this check ever actually returns true, it makes ExecStop a no-op
and systemd will forcefully kill all processes in the service
see man systemd.service
This also prevents a deadlock when running systemctl stop,
zmpkg.pl detects bash as it's parent and attempts to call
systemctl stop itself, which blocks forever waiting for the
task it's in to complete
2014-12-23 20:32:14 +11:00
Emmanuel Papin
7c3ddece88
Remove some remaining files auto-generated by libtool in rules file
2014-12-21 18:50:04 +01:00
Emmanuel Papin
bc89082548
Refresh a patch in the debian directory
2014-12-21 18:23:51 +01:00
Emmanuel Papin
d2b1bfae13
Fix conflict when merging debian_package_split
2014-12-21 17:04:46 +01:00
Emmanuel Papin
db61f93c35
Merge branch 'debian_package_split' into plugin_support_test
...
Conflicts:
distros/debian8/control
2014-12-21 16:56:10 +01:00
Emmanuel Papin
cb3b8a901e
Merge branch 'master' into plugin_support_test
...
Conflicts:
distros/debian/control
web/skins/classic/views/js/Makefile.am
2014-12-21 16:49:25 +01:00
Emmanuel Papin
d8e682c48b
Update of perl library dependencies
2014-12-21 04:02:41 +01:00
Emmanuel Papin
3bfee679f8
Move the refreshed patches to the right folder
2014-12-21 02:38:17 +01:00
Emmanuel Papin
2aa3f7e2da
Refresh the debian patches
2014-12-21 01:52:42 +01:00
Emmanuel Papin
aff6958398
Provide a patch to rename the service file in zmsystemctl.pl.in
2014-12-21 01:38:32 +01:00
Emmanuel Papin
df2473cdf7
Use a wilcard to reference man files
2014-12-20 21:11:44 +01:00
Emmanuel Papin
5bd3b18c7b
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2014-12-20 20:30:54 +01:00
Emmanuel Papin
fb1566c829
Fix package dependencies
2014-12-20 20:26:34 +01:00
Emmanuel Papin
939f126e76
Set the right filename for the systemd service and don't call zmupdate interactively
2014-12-20 20:21:29 +01:00
Emmanuel Papin
6cdb046b34
Do not repeat admin password question if already answered
2014-12-20 20:12:33 +01:00
Emmanuel Papin
5457d5c5e5
Move call to zmupdate.pl in core package because it requires zm.conf file and perl libraries
2014-12-19 16:32:36 +01:00
Emmanuel Papin
ae1bf955e5
Update zm.conf file in package which provide it
2014-12-19 15:49:40 +01:00
Emmanuel Papin
27ca8f7ee4
Rename database package and update descriptions
2014-12-18 20:05:59 +01:00
Emmanuel Papin
9745a1fb0b
Remove useless file libzoneminder-perl.manpages
2014-12-18 15:04:50 +01:00
Emmanuel Papin
5e41665d88
Fix some lintian errors and warning after package spliting
2014-12-18 11:03:54 +01:00
Isaac Connor
b921b6f254
the debian packaging has this, and apparently we need it to build
2014-12-17 16:23:04 -05:00
Isaac Connor
5dd1b6a388
this is in debian
2014-12-17 16:11:26 -05:00
Isaac Connor
9b860fb08c
libjpeg updates to match debian
2014-12-17 16:10:54 -05:00
Isaac Connor
67fc4c5ea9
update to what has been done in debian
2014-12-17 15:43:32 -05:00
Isaac Connor
e9e6d84c7b
bump release #
2014-12-17 15:30:20 -05:00
Emmanuel Papin
9f6e4dd794
Set the new dbg package name in the rules file
2014-12-16 21:15:11 +01:00
Emmanuel Papin
3b3a4772a4
Fix installatino of man files and sql files
2014-12-16 20:58:54 +01:00
Emmanuel Papin
7189de829c
Split files in multiple packages (lb, core, ui...)
2014-12-16 12:42:51 +01:00
Isaac Connor
0251500f09
Merge pull request #634 from manupap1/debconf_support
...
Add debconf / dbconfig support to debian8 folder
2014-12-14 10:08:59 -05:00
Emmanuel Papin
b4f35c20f1
Fix a conflict when merging plugin_support
2014-12-13 22:06:30 +01:00
Emmanuel Papin
f339518787
Merge branch plugin_support
2014-12-13 22:05:11 +01:00
Emmanuel Papin
bff7fc1e2e
Enable build of plugin support and dev package in debian8 folder
2014-12-13 21:58:17 +01:00
Emmanuel Papin
f1ce69a8c1
Update version in changelog for plugin support
2014-12-13 21:49:08 +01:00
Emmanuel Papin
d961831355
Fix conflict when merging upstream master
2014-12-13 19:54:54 +01:00
Emmanuel Papin
af6941f1ef
Fix lintian warning 'description-synopsis-starts-with-article' and more typo in control file
2014-12-13 17:53:53 +01:00
Emmanuel Papin
a27e99b104
Add section 'debug' and priority 'extra' to zoneminder debug package to fix two lintian warnings
2014-12-13 17:50:52 +01:00
Emmanuel Papin
655af1d373
Upgrade Standards-Version in control file to fix a lintian warning
2014-12-13 17:43:24 +01:00
Emmanuel Papin
7cdaf1a41e
Upgrade build dependency to version 9 of debhelper (fix a lintian warning) and fix some typo in control file
2014-12-13 17:39:06 +01:00
Emmanuel Papin
63d75debff
Use dh_install and dh_link in override_dh_install
2014-12-13 17:32:01 +01:00
Emmanuel Papin
59e2d0873d
Add required README.source file when using a patching system
2014-12-13 17:30:21 +01:00
Emmanuel Papin
28516df0ec
Use dh_auto_configure instead of standard configure command
2014-12-13 17:04:07 +01:00
Emmanuel Papin
099529c787
Switch patching system to quilt and add a patch to fix perl install directory
2014-12-13 16:57:46 +01:00
Emmanuel Papin
cd0b85aaa6
Move dbconfig stuff from rules script to postinst and postrm scripts
2014-12-12 15:06:51 +01:00
Emmanuel Papin
aa31c9b292
Fix regex when removing a sql request in zm_create.sql file
2014-12-12 13:22:33 +01:00
Emmanuel Papin
74f08787d4
Remove buggy functions and debug mode
2014-12-12 13:04:17 +01:00
Emmanuel Papin
665ffcb2bc
Fix a premature exit when reconfiguring
2014-12-10 16:11:56 +01:00
Emmanuel Papin
065850ad2b
Improve debconf data input
2014-12-08 16:57:37 +01:00
Emmanuel Papin
b1c25efcd9
Remove dependency to mysql.service in zoneminder.service
2014-12-07 18:48:11 +01:00
Emmanuel Papin
91719ff7f4
Install and remove package without error even if no database
2014-12-07 15:18:08 +01:00
Emmanuel Papin
f2168f50d1
Fix permissions on /etc/zm/zm.conf as requested by the debian policy
2014-12-07 11:51:08 +01:00
Emmanuel Papin
aab181ffa6
Fix some comments in postinst script
2014-12-07 02:43:08 +01:00
Emmanuel Papin
31fda1fc7c
Bring localization to debconf menus and add french language
2014-12-07 02:38:00 +01:00
Emmanuel Papin
9d4c08ff45
Add version to build dependency on po-debconf
2014-12-07 01:51:36 +01:00
Emmanuel Papin
af0770c33f
Use 'true' to prevent config script from dying and fix a bad variable name
2014-12-07 00:04:26 +01:00
Emmanuel Papin
b201ad2d7e
Do not do some actions when upgrading
2014-12-06 21:39:50 +01:00
Emmanuel Papin
328ccc1bc6
Update the database version after dbconfig upgrade
2014-12-06 21:15:04 +01:00
Emmanuel Papin
6c0854f16f
Fix bad setting of admin account
2014-12-06 18:48:09 +01:00
Emmanuel Papin
8def8a7b94
Re-work of debconf dbconfig integration
2014-12-06 17:50:13 +01:00
Emmanuel Papin
01e57dbbe9
Readd dependency to debconf and dbconfig-common
2014-12-06 14:05:16 +01:00
Emmanuel Papin
65bd73b102
Fix conflict when merging from master
2014-12-06 14:03:24 +01:00
Emmanuel Papin
94dce6729f
Add missing dependency to policykit-1
2014-12-05 23:02:20 +01:00
Emmanuel Papin
441b6631e3
Get a chance to enter config
2014-12-03 23:21:41 +01:00
Emmanuel Papin
e5a986376e
Remove unneeded call to db_purge in postrm script and source the debconf file where it is required
2014-12-03 22:52:10 +01:00
Emmanuel Papin
e0e00e7a64
Add some double quote to string for proper coding
2014-12-03 20:30:33 +01:00
Emmanuel Papin
400e656f52
Adjust a debconf message
2014-12-03 20:27:42 +01:00
Emmanuel Papin
bdc2b383de
Fix exit codes in zoneminder.config
2014-12-03 18:22:19 +01:00
Emmanuel Papin
da3467aa77
Remove a potential remaining file when purging and rework of apache deconfiguration
2014-12-03 17:43:39 +01:00
Emmanuel Papin
805933b501
Re-add missing argument to apache_install function
2014-12-03 17:27:27 +01:00
Emmanuel Papin
6c417e02e4
Only link files with zm_update-*.sql pattern
2014-12-03 16:42:31 +01:00
Emmanuel Papin
0f53347133
Fix package name for directory creation
2014-12-03 16:19:42 +01:00
Emmanuel Papin
ae4e13a9c6
Remove some trailing whitespaces
2014-12-03 16:02:39 +01:00
Emmanuel Papin
1e805ca706
Add dependency to debconf and dbconfig-common
2014-12-03 16:01:31 +01:00
Emmanuel Papin
b164f7953d
Create the directories in dbconfig folder
2014-12-03 15:40:13 +01:00
Emmanuel Papin
8a51a754aa
Install the sql files for dbconfig
2014-12-03 15:38:31 +01:00
Emmanuel Papin
9eb21bc3dd
Fix exit code in debian scripts and remove manual database deletion in postrm script
2014-12-03 14:12:26 +01:00
Emmanuel Papin
7cb62cd3a0
Set debug mode
2014-12-03 13:40:30 +01:00
Emmanuel Papin
99c4bce7e2
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into new_debian8_folder_with_debconf
2014-12-02 01:01:47 +01:00
Emmanuel Papin
cc4324ef37
Work on the debconf integration
2014-12-02 00:58:18 +01:00
Isaac Connor
07695ce138
Merge pull request #605 from manupap1/new_debian8_folder
...
New debian folder for jessie release
2014-12-01 11:25:31 -05:00
Emmanuel Papin
df8b625228
Add files for debconf support
2014-11-30 17:55:26 +01:00
Emmanuel Papin
e0f8136b68
Remove warning insserv: warning: current start runlevel(s) of script 'zoneminder' overrides LSB defaults (empty).
2014-11-30 00:11:10 +01:00
Emmanuel Papin
9e39924095
Fix confict when pulling master
2014-11-29 19:11:22 +01:00
Andrew Bauer
e4fa475d87
Merge pull request #588 from ZoneMinder/digest_auth
...
Digest auth
2014-11-29 08:32:08 -06:00
Emmanuel Papin
a4c01435d7
Fix confict when pulling master
2014-11-29 03:37:06 +01:00
Emmanuel Papin
9a0e766e4c
Revert commits to fix source-is-missing errors (does not work as expected)
2014-11-29 02:08:21 +01:00
Emmanuel Papin
b8119a1e58
Files without sources shall be added in the debian/missing-sources folder
2014-11-29 01:48:38 +01:00
Emmanuel Papin
7ceec9979e
Fix remaining lintian errors by adding files with missing sources to debian/missing-sources
2014-11-29 01:31:25 +01:00
Emmanuel Papin
578dcef4b8
Do not attempt to remove database if no mysql instance (fix a piuparts error)
2014-11-28 21:36:11 +01:00
Emmanuel Papin
b0e3671f99
Fix a typo in debian/rules
2014-11-28 21:30:02 +01:00
Emmanuel Papin
2665eaeb88
First attempt to fix lintian warning debug-file-with-no-debug-symbols
2014-11-28 20:17:48 +01:00
Emmanuel Papin
ad474e81a6
Remove lintian warning "possibly-insecure-handling-of-tmp-files-in-maintainer-script"
...
This reverts commit 720f92a6bb
.
2014-11-28 19:37:42 +01:00
Emmanuel Papin
d318a6f2eb
Source init functions in init scrit (remove a lintian warning)
2014-11-28 19:33:36 +01:00
Emmanuel Papin
56234d7d2e
Provide a dummy init file to fix a lintian error
2014-11-28 19:16:30 +01:00
Emmanuel Papin
720f92a6bb
Delete remaining files and folders in postrm script
2014-11-28 18:32:36 +01:00
Emmanuel Papin
8a9ad93b81
Enable apache CGI module in postinst script (not enabled in debian 8 by default)
2014-11-28 18:07:09 +01:00
Emmanuel Papin
d8973d6cbd
Configure apache in postrm script (code taken from phpmyadmin)
2014-11-28 17:46:37 +01:00
Emmanuel Papin
bfb71952fd
Add missing argument in postint script
2014-11-28 17:14:07 +01:00
Emmanuel Papin
6628f29fdc
Configure apache in postinst script (code taken from phpmyadmin)
2014-11-28 16:45:05 +01:00
Emmanuel Papin
d60131925f
Fix a typo in debian/rules
2014-11-28 15:52:22 +01:00
Emmanuel Papin
5a36ab1923
Revert "Attempt to fix lintian error init.d-script-not-included-in-package"
...
This reverts commit c1e98707c4
.
2014-11-28 15:38:45 +01:00
Emmanuel Papin
b75bea3e16
Revert "Attempt to fix error init.d-script-not-included-in-packag"
...
This reverts commit c84f1b644b
.
2014-11-28 15:37:35 +01:00
Emmanuel Papin
c3a72892e6
Revert "Fist attempt to fix lintian error init.d-script-not-included-in-package"
...
This reverts commit f9ae34ae1d
.
2014-11-28 15:36:06 +01:00
Emmanuel Papin
f9ae34ae1d
Fist attempt to fix lintian error init.d-script-not-included-in-package
2014-11-27 23:31:40 +01:00
Emmanuel Papin
c84f1b644b
Attempt to fix error init.d-script-not-included-in-packag
2014-11-27 23:17:49 +01:00
Emmanuel Papin
c1e98707c4
Attempt to fix lintian error init.d-script-not-included-in-package
2014-11-27 22:40:29 +01:00
Emmanuel Papin
537d8b7994
Add instructions in override_dh_clean to delete remaining Makefiles
2014-11-27 21:24:20 +01:00
Emmanuel Papin
ecee33e9a3
Display the name of the tarball when generating it
2014-11-27 20:58:01 +01:00
Emmanuel Papin
4bf1be59cd
Use deb-systemd-invoke instead of systemctl in zoneminder.postinst
2014-11-27 20:21:56 +01:00
Emmanuel Papin
bf945cf6f3
Some lintian fixes in changelog and more information
2014-11-27 20:14:17 +01:00
Emmanuel Papin
aad3475bad
Revert "Add build dependency to build-essential and devscripts"
...
This reverts commit 41c14df2c9
.
2014-11-27 18:36:41 +01:00
Emmanuel Papin
6b6e44bf0e
Fix lintian warning description-synopsis-starts-with-article
2014-11-27 18:32:23 +01:00
Emmanuel Papin
b9b36d6e9d
Fix some lintian warning in control and postrm files
2014-11-27 18:27:59 +01:00
Emmanuel Papin
5e3476b301
Use systemctl to control zoneminder service in postinst script
2014-11-27 18:25:09 +01:00
Emmanuel Papin
3e7e3960f5
Rename an entry in changelog to fix a lintian warning
2014-11-27 17:47:14 +01:00
Emmanuel Papin
cb64a1fadd
No need to escape double quote in get-orig-source
2014-11-27 17:13:47 +01:00
Emmanuel Papin
cdf5dc6bf4
Fix error in get-orig-source if files contain spaces
2014-11-27 15:46:10 +01:00
Emmanuel Papin
716bf6113f
Some clean-up when generating orig tarball
2014-11-27 14:20:13 +01:00
Emmanuel Papin
41c14df2c9
Add build dependency to build-essential and devscripts
2014-11-27 14:01:37 +01:00
Emmanuel Papin
7df006ca9e
Add more information in debian/changelog
2014-11-27 12:16:08 +01:00
Emmanuel Papin
d16fd5e39e
Fix get-orig-source rule for debian packaging
2014-11-27 11:33:35 +01:00
Emmanuel Papin
0d30f5170b
Revert "Remove unneeded build dependency to quilt (a dpkg feature is used)"
...
This reverts commit 4411024420
.
2014-11-26 20:29:01 +01:00
Emmanuel Papin
74e3068f56
Add file README.source as recommanded by debian policy
2014-11-26 19:14:28 +01:00
Emmanuel Papin
3d2f3a8821
Delete remaining file src/zm_config_defines.h with override_dh_clean rule
2014-11-26 18:51:16 +01:00
Emmanuel Papin
236293b8a7
Add a rule to generate original source tarball from github
2014-11-26 18:37:22 +01:00
Emmanuel Papin
441fca34a6
Add more files to extend-diff-ignore
2014-11-26 18:34:07 +01:00
Emmanuel Papin
ed5e42aedc
Convert debian source package to version 3.0 (quilt)
2014-11-26 18:14:50 +01:00
Emmanuel Papin
4411024420
Remove unneeded build dependency to quilt (a dpkg feature is used)
2014-11-26 11:27:35 +01:00
Emmanuel Papin
d790f94ff8
Use dh_systemd to manage service and tmpfile
2014-11-26 10:59:36 +01:00
Emmanuel Papin
f048b5297d
Update changelog
2014-11-26 00:34:51 +01:00
Emmanuel Papin
da75cc4404
Fix file permissions for preinst file
2014-11-26 00:08:15 +01:00
Emmanuel Papin
68e5501004
Rename some debian files to allow building of multiple packages
2014-11-26 00:06:28 +01:00
Emmanuel Papin
6941a7df2e
Remove the deprecated sysVinit script
2014-11-25 23:56:29 +01:00
Emmanuel Papin
441c22ed53
Configure systemd to create the /var/run/zm directory at boot time on debian jessie
2014-11-25 23:51:57 +01:00
Emmanuel Papin
997ab779ac
Provide and install a zoneminder.service file to get zm running with systemd on debian jessie
2014-11-25 23:50:46 +01:00
Emmanuel Papin
be420e65c4
Fix a reference to the build directory in debian package by using dh_install
2014-11-25 23:28:35 +01:00
Emmanuel Papin
319fef80cf
Use dh_link instead of standard ln command
2014-11-25 23:01:06 +01:00