From 7649661dc12b20b107382a1230c15a13f58d402b Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Fri, 15 May 2009 23:00:31 -0700 Subject: [PATCH 1/1] Fix the pkg-config files for new names. Signed-off-by: Dan Dennedy --- docs/policies.txt | 57 --------------------------------------------- docs/testing-20040110.txt | 35 --------------------------- mlt-melted++.pc.in | 4 +- mlt-melted.pc.in | 6 ++-- mlt-mvcp.pc.in | 6 ++-- 5 files changed, 8 insertions(+), 100 deletions(-) delete mode 100644 docs/policies.txt delete mode 100644 docs/testing-20040110.txt diff --git a/docs/policies.txt b/docs/policies.txt deleted file mode 100644 index f2fb033..0000000 --- a/docs/policies.txt +++ /dev/null @@ -1,57 +0,0 @@ -Open Source Development Policies and Procedures for MLT -by Dan Dennedy - -Policies --------- - -Any contribution to the "core" module must assign copyright to Ushodaya -Enterprises Limited because they need license control over that module. - -The framework and valerie client libraries are covered under LGPL. Miracle, -inigo, albino, and humperdink applications are covered under GPL. Modules -should strive to be LGPL to make them available through the framework as LGPL. - -Comments in the framework and valerie header files must be C-style, not C++. - -Coding Style: -There are not a lot of rules, but we prefer brackets on their own line, -indents using tabs, liberal usage of spaces in statements and expressions, and -no hard line length. The code in src/framework serves as a good example. - -Commit messages must be prefaced with the name of the changed files. This makes -the Subversion log more useful as a ChangeLog. For example, - docs/policies.txt: added policy about commit message - -Increment the version number in ./configure AND mlt.h on the first commit after -a release as well as just prior to a new release. This way we can track if -someone is using an unreleased version from the source code repository. - -Do not write messages to stdout. stdout is reserved for writing streams that -can be redirected: e.g. raw DV in consumer_libdv. I recommended to use the -mlt_log API. For something quick and dirty, use stderr. - - -Procedures ----------- - -Update services.txt when you add or update a service. - -Setting Copyright on Appropriated Code: -You do not want to be accused of copying someone's code and changing copyright -or license without permission. The license is straightforward: you must retain -the original author's license unless you receive explicit permission. There are -a few ways to approach the copyright declaration depending upon the -intermingling and changes. If you heavily comingle original and new code or -lightly modifiy the original code, you can retain the original's copyright -including the years, and then add your copyright for the current year. If you -can separate the MLT integration from the core subroutines, then you can put -the core subroutines into a separate file with the original copyright and just -copyright the MLT integration code as your own. However, if you have heavily -modified the original code beyond nearly all recognition, you can copyright it -as your own and attribute the original author as inspiration. - -Bug Reporting: -First preference is to use the SourceForge tracker: -http://sourceforge.net/tracker/?group_id=96039&atid=613414 -Second preference is in the mailing list: -mlt-devel@lists.sourceforge.net diff --git a/docs/testing-20040110.txt b/docs/testing-20040110.txt deleted file mode 100644 index 14c8dcd..0000000 --- a/docs/testing-20040110.txt +++ /dev/null @@ -1,35 +0,0 @@ -On 1/10/2004, Dan Dennedy ran the testing.txt against mlt albino and miracle. - - -NOTE: Discrepancies cited here may have impact on related functionality. - - -General ------------------------------------------------------------------------------- -Server side error checks and related response error codes are not stringently enforced. - - -Not Implemented ------------------------------------------------------------------------------- -NLS -USET points=ignore -USET eof=terminate - - -Incorrect Behaviour ------------------------------------------------------------------------------- - - -Different Intentional Behaviour ------------------------------------------------------------------------------- - -Different forced Behaviour ------------------------------------------------------------------------------- -killall miracle does not work when the SDL consumer is in use. requires killall -HUP - -MLT Bugs ------------------------------------------------------------------------------- -Please check the services.txt doc for known bugs related to MLT components. - - - diff --git a/mlt-melted++.pc.in b/mlt-melted++.pc.in index e557ff8..c249b76 100644 --- a/mlt-melted++.pc.in +++ b/mlt-melted++.pc.in @@ -1,7 +1,7 @@ -Name: mlt-melted +Name: mlt-melted++ Description: C++ API for MLT Miracle Version: ${version} -Requires: +Requires: mlt-melted Libs: -L${libdir} ${libs} Cflags: ${cflags} diff --git a/mlt-melted.pc.in b/mlt-melted.pc.in index 593055e..611c8d9 100644 --- a/mlt-melted.pc.in +++ b/mlt-melted.pc.in @@ -1,7 +1,7 @@ -Name: mlt-miracle -Description: MLT Miracle server API +Name: mlt-melted +Description: MLT Melted server API Version: ${version} -Requires: +Requires: mlt-framework Libs: -L${libdir} ${libs} Cflags: ${cflags} diff --git a/mlt-mvcp.pc.in b/mlt-mvcp.pc.in index 7750ba3..e13872c 100644 --- a/mlt-mvcp.pc.in +++ b/mlt-mvcp.pc.in @@ -1,7 +1,7 @@ -Name: mlt-valerie -Description: MLT Valerie client API +Name: mlt-mvcp +Description: MLT MVCP client API Version: ${version} -Requires: +Requires: mlt-framework Libs: -L${libdir} ${libs} Cflags: ${cflags} -- 1.7.4.4