From c68a325e8ef253447513309fc3eb34c7feb02a8e Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 14 Mar 2015 23:09:36 +0100 Subject: [PATCH 1/5] Untrack files modified at compile time --- onvif/modules/MYMETA.json | 39 --------------------------------------- onvif/modules/MYMETA.yml | 21 --------------------- onvif/modules/pm_to_blib | 0 onvif/proxy/MYMETA.json | 39 --------------------------------------- onvif/proxy/MYMETA.yml | 21 --------------------- onvif/proxy/pm_to_blib | 0 6 files changed, 120 deletions(-) delete mode 100644 onvif/modules/MYMETA.json delete mode 100644 onvif/modules/MYMETA.yml delete mode 100644 onvif/modules/pm_to_blib delete mode 100644 onvif/proxy/MYMETA.json delete mode 100644 onvif/proxy/MYMETA.yml delete mode 100644 onvif/proxy/pm_to_blib diff --git a/onvif/modules/MYMETA.json b/onvif/modules/MYMETA.json deleted file mode 100644 index fbb5d7c77..000000000 --- a/onvif/modules/MYMETA.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "abstract" : "unknown", - "author" : [ - "Jan Hochstein" - ], - "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.72, CPAN::Meta::Converter version 2.141520", - "license" : [ - "unknown" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" - }, - "name" : "ONVIF", - "no_index" : { - "directory" : [ - "t", - "inc" - ] - }, - "prereqs" : { - "build" : { - "requires" : { - "ExtUtils::MakeMaker" : "0" - } - }, - "configure" : { - "requires" : { - "ExtUtils::MakeMaker" : "0" - } - }, - "runtime" : { - "requires" : {} - } - }, - "release_status" : "stable", - "version" : "" -} diff --git a/onvif/modules/MYMETA.yml b/onvif/modules/MYMETA.yml deleted file mode 100644 index 109544804..000000000 --- a/onvif/modules/MYMETA.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -abstract: unknown -author: - - 'Jan Hochstein' -build_requires: - ExtUtils::MakeMaker: '0' -configure_requires: - ExtUtils::MakeMaker: '0' -dynamic_config: 0 -generated_by: 'ExtUtils::MakeMaker version 6.72, CPAN::Meta::Converter version 2.141520' -license: unknown -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: '1.4' -name: ONVIF -no_index: - directory: - - t - - inc -requires: {} -version: '' diff --git a/onvif/modules/pm_to_blib b/onvif/modules/pm_to_blib deleted file mode 100644 index e69de29bb..000000000 diff --git a/onvif/proxy/MYMETA.json b/onvif/proxy/MYMETA.json deleted file mode 100644 index fbb5d7c77..000000000 --- a/onvif/proxy/MYMETA.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "abstract" : "unknown", - "author" : [ - "Jan Hochstein" - ], - "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.72, CPAN::Meta::Converter version 2.141520", - "license" : [ - "unknown" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" - }, - "name" : "ONVIF", - "no_index" : { - "directory" : [ - "t", - "inc" - ] - }, - "prereqs" : { - "build" : { - "requires" : { - "ExtUtils::MakeMaker" : "0" - } - }, - "configure" : { - "requires" : { - "ExtUtils::MakeMaker" : "0" - } - }, - "runtime" : { - "requires" : {} - } - }, - "release_status" : "stable", - "version" : "" -} diff --git a/onvif/proxy/MYMETA.yml b/onvif/proxy/MYMETA.yml deleted file mode 100644 index 109544804..000000000 --- a/onvif/proxy/MYMETA.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -abstract: unknown -author: - - 'Jan Hochstein' -build_requires: - ExtUtils::MakeMaker: '0' -configure_requires: - ExtUtils::MakeMaker: '0' -dynamic_config: 0 -generated_by: 'ExtUtils::MakeMaker version 6.72, CPAN::Meta::Converter version 2.141520' -license: unknown -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: '1.4' -name: ONVIF -no_index: - directory: - - t - - inc -requires: {} -version: '' diff --git a/onvif/proxy/pm_to_blib b/onvif/proxy/pm_to_blib deleted file mode 100644 index e69de29bb..000000000 From e219b5c86a89cfb5bb0075f76d7cd4e333b64fc9 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 14 Mar 2015 23:14:27 +0100 Subject: [PATCH 2/5] Ignore files modified at compile time --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index ec021d210..aa92c80d0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,11 @@ misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules misc/logrotate.conf misc/syslog.conf +onvif/modules/MYMETA.json +onvif/modules/MYMETA.yml +onvif/proxy/MYMETA.json +onvif/proxy/MYMETA.yml +scripts/ZoneMinder/MYMETA.json scripts/ZoneMinder/MYMETA.yml scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm From 8a1d00dfd6c1c8937e62fc71abc67aff24dcaa3b Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 14 Mar 2015 23:15:56 +0100 Subject: [PATCH 3/5] Ignore file added at compile time --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index aa92c80d0..578d4fa3e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ scripts/ZoneMinder/blib Makefile.in Makefile docs/_build - +compile config.guess config.h config.log From 0f10e2b24d1b1364186ee7db9e8bb809cea4f1cf Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 14 Mar 2015 23:23:21 +0100 Subject: [PATCH 4/5] Add config.h.in~ to the list of files to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 578d4fa3e..b82e2f1f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ configure config.h.in +config.h.in~ autom4te.cache aclocal.m4 depcomp From a4985fb00d69d4f6ab63cec67a26281b00872e61 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sun, 15 Mar 2015 16:46:48 +0100 Subject: [PATCH 5/5] Ignore Makefile.old --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b82e2f1f0..fa066279c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ onvif/modules/MYMETA.json onvif/modules/MYMETA.yml onvif/proxy/MYMETA.json onvif/proxy/MYMETA.yml +scripts/ZoneMinder/Makefile.old scripts/ZoneMinder/MYMETA.json scripts/ZoneMinder/MYMETA.yml scripts/ZoneMinder/lib/ZoneMinder/Base.pm