October 2018 - rpmfusion-commits

by Andrew Bauer

commit d56ddcc5f8cdbfb0762d1b9a104e42f6c7b0ff67 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Tue Oct 2 08:11:56 2018 -0500 fix merge conflict sources | 4 ---- 1 file changed, 4 deletions(-) --- diff --git a/sources b/sources index ee30735..56949e4 100644 --- a/sources +++ b/sources @@ -1,7 +1,3 @@ 9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz 86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz -<<<<<<< HEAD -020459b357f66987700a8ab63fd7aeea zoneminder-1.32.0.tar.gz -======= 7c2a358a1a22b13f0bd5e346eab4b84a zoneminder-1.32.1.tar.gz ->>>>>>> master

5 years, 6 months

1
0
0 / 0

[zoneminder/el7: 3/3] Merge branch 'master' into el7

by Andrew Bauer

commit e29b84d9186b4a38a478fd4c39fc0cbc811203ed Merge: 7d51487 d06a60f Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Tue Oct 2 08:05:55 2018 -0500 Merge branch 'master' into el7 .gitignore | 1 + sources | 2 +- zoneminder.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) ---

5 years, 6 months

1
0
0 / 0

[zoneminder/el7] (3 commits) ...Merge branch 'master' into el7

by Andrew Bauer

Summary of changes: 90e8b14... 1.32.1 release Bug fix release (*) d06a60f... 1.32.1 release Bug fix release (*) e29b84d... Merge branch 'master' into el7 (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

[zoneminder/f27: 10/10] Merge branch 'master' into f27

by Andrew Bauer

commit 6e733433a8ba294634eb13935611e51e6ed4d8b6 Merge: e19166f d06a60f Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Tue Oct 2 08:05:21 2018 -0500 Merge branch 'master' into f27 .gitignore | 1 + sources | 4 ++++ zoneminder.spec | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) --- diff --cc sources index c5b1f39,56949e4..ee30735 --- a/sources +++ b/sources @@@ -1,3 -1,3 +1,7 @@@ 9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz 86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz ++<<<<<<< HEAD +020459b357f66987700a8ab63fd7aeea zoneminder-1.32.0.tar.gz ++======= + 7c2a358a1a22b13f0bd5e346eab4b84a zoneminder-1.32.1.tar.gz ++>>>>>>> master

5 years, 6 months

1
0
0 / 0

[zoneminder/f27] (10 commits) ...Merge branch 'master' into f27

by Andrew Bauer

Summary of changes: 1757a1e... Rebuilt for ffmpeg-3.5 git (*) ce8fb61... fix build with ffmpeg-3.5 (*) 4d8974c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*) 06b926c... - Rebuilt for new ffmpeg snapshot (*) ccfda52... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*) 43e84d2... - Rebuilt for Fedora 29 Mass Rebuild binutils issue (*) 2116515... zoneminder 1.32.0 release (*) 90e8b14... 1.32.1 release Bug fix release (*) d06a60f... 1.32.1 release Bug fix release (*) 6e73343... Merge branch 'master' into f27 (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

[zoneminder/f28] fix merge conflicts

by Andrew Bauer

commit e358eefc3851609512ff8cddf3153ed81d5da8ce Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Tue Oct 2 08:04:09 2018 -0500 fix merge conflicts zoneminder.spec | 7 ------- 1 file changed, 7 deletions(-) --- diff --git a/zoneminder.spec b/zoneminder.spec index 1065c01..32f052e 100644 --- a/zoneminder.spec +++ b/zoneminder.spec @@ -25,11 +25,7 @@ %global _hardened_build 1 Name: zoneminder -<<<<<<< HEAD -Version: 1.32.0 -======= Version: 1.32.1 ->>>>>>> master Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@ -324,13 +320,10 @@ EOF %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder %changelog -<<<<<<< HEAD -======= * Tue Oct 2 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.32.1-1 - 1.32.1 release - Bug fix release ->>>>>>> master * Wed Sep 12 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.32.0-1 - 1.32.0 release - remove el6 (sys v init) support

5 years, 6 months

1
0
0 / 0

[zoneminder/f28: 6/6] Merge branch 'master' into f28

by Andrew Bauer

commit 19a47ecf6ce9a8fed11db2e7c53b201231a3c93c Merge: 73f4d84 d06a60f Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Tue Oct 2 08:02:07 2018 -0500 Merge branch 'master' into f28 .gitignore | 1 + sources | 4 ++++ zoneminder.spec | 11 +++++++++++ 3 files changed, 16 insertions(+) --- diff --cc sources index c5b1f39,56949e4..ee30735 --- a/sources +++ b/sources @@@ -1,3 -1,3 +1,7 @@@ 9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz 86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz ++<<<<<<< HEAD +020459b357f66987700a8ab63fd7aeea zoneminder-1.32.0.tar.gz ++======= + 7c2a358a1a22b13f0bd5e346eab4b84a zoneminder-1.32.1.tar.gz ++>>>>>>> master diff --cc zoneminder.spec index 52a0e3c,32f052e..1065c01 --- a/zoneminder.spec +++ b/zoneminder.spec @@@ -25,7 -25,7 +25,11 @@@ %global _hardened_build 1 Name: zoneminder ++<<<<<<< HEAD +Version: 1.32.0 ++======= + Version: 1.32.1 ++>>>>>>> master Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@@ -320,6 -320,10 +324,13 @@@ EO %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder %changelog ++<<<<<<< HEAD ++======= + * Tue Oct 2 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.32.1-1 + - 1.32.1 release + - Bug fix release + ++>>>>>>> master * Wed Sep 12 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.32.0-1 - 1.32.0 release - remove el6 (sys v init) support

5 years, 6 months

1
0
0 / 0

[zoneminder/f28] (6 commits) ...Merge branch 'master' into f28

by Andrew Bauer

Summary of changes: ccfda52... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*) 43e84d2... - Rebuilt for Fedora 29 Mass Rebuild binutils issue (*) 2116515... zoneminder 1.32.0 release (*) 90e8b14... 1.32.1 release Bug fix release (*) d06a60f... 1.32.1 release Bug fix release (*) 19a47ec... Merge branch 'master' into f28 (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

[zoneminder/f29: 3/3] Merge branch 'master' into f29

by Andrew Bauer

commit 776ab9890ab06fb0b4d8176b70283e69c4ace5ee Merge: 3026a50 d06a60f Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Tue Oct 2 08:00:30 2018 -0500 Merge branch 'master' into f29 .gitignore | 1 + sources | 2 +- zoneminder.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) ---

5 years, 6 months

1
0
0 / 0

[zoneminder/f29] (3 commits) ...Merge branch 'master' into f29

by Andrew Bauer

Summary of changes: 90e8b14... 1.32.1 release Bug fix release (*) d06a60f... 1.32.1 release Bug fix release (*) 776ab98... Merge branch 'master' into f29 (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits October 2018