From ddce7807fd7aa1d5e1d1041b559fa5e8f8c7bd58 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 3 Oct 2008 13:49:34 +0100 Subject: trivial: eork around automake oddness --- etc/.gitignore | 1 - etc/Makefile.am | 7 ++++-- etc/Vendor.conf | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ etc/Vendor.conf.in | 63 ------------------------------------------------------ 4 files changed, 68 insertions(+), 66 deletions(-) create mode 100644 etc/Vendor.conf delete mode 100644 etc/Vendor.conf.in (limited to 'etc') diff --git a/etc/.gitignore b/etc/.gitignore index 3ccfb7265..3475160db 100644 --- a/etc/.gitignore +++ b/etc/.gitignore @@ -1,5 +1,4 @@ Makefile Makefile.in PackageKit.conf -Vendor.conf diff --git a/etc/Makefile.am b/etc/Makefile.am index ca11e2741..352f80233 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,17 +1,20 @@ NULL = confdir = $(PK_CONF_DIR) -conf_in_files = PackageKit.conf.in Vendor.conf.in +conf_in_files = PackageKit.conf.in conf_DATA = $(conf_in_files:.conf.in=.conf) $(conf_DATA): $(conf_in_files) Makefile @sed -e "s|\@defaultbackend\@|$(DEFAULT_BACKEND)|" $< > $@ +vendordir = $(PK_CONF_DIR) +vendor_DATA = Vendor.conf + EXTRA_DIST = \ $(conf_in_files) \ + $(vendor_DATA) \ $(NULL) DISTCLEANFILES = \ - Vendor.conf \ PackageKit.conf diff --git a/etc/Vendor.conf b/etc/Vendor.conf new file mode 100644 index 000000000..ed1f5a977 --- /dev/null +++ b/etc/Vendor.conf @@ -0,0 +1,63 @@ +# Only the system vendor should modify this file, ordinary users +# should not have to change anything. + +# Distributions should patch or replace this file when generating packages + +[PackagesNotFound] + +# This is a link to a vendor URL which is shown when a suitable package +# could not be found in any remote software source. +# The page set here should explain how to add new software sources if required. +# +# If the value is set to 'none' then no link is shown. +# +# default=http://www.packagekit.org/pk-package-not-found.html +DefaultUrl=http://www.packagekit.org/pk-package-not-found.html + +# The URL which is shown to the user when a codec could not be found. +# It should explain why certain codecs cannot be used, and perhaps show +# links to web stores where the codec can be legally purchased. +# +# If the value is set to 'none' then the value of DefaultUrl is used. +# +# default=none +CodecUrl=none + +# The URL which is shown to the user when hardware drivers could not be found. +# It should explain why some hardware is not supported, and links to futher +# information. +# +# If the value is set to 'none' then the value of DefaultUrl is used. +# +# default=none +HardwareUrl=none + +# The URL which is shown to the user when fonts could not be found. +# Alternatives should probably be suggested where possible. +# +# If the value is set to 'none' then the value of DefaultUrl is used. +# +# default=none +FontUrl=none + +# The URL which is shown to the user when programs handing a mime tpye could not +# be found. It should probably explain how to use wine if the program is a +# Windows program, or suggest alternatives. +# +# If the value is set to 'none' then the value of DefaultUrl is used. +# +# default=none +MimeUrl=none + +[Groups] + +# The vendor name shown for the 'vendor' group +# +# default=My Vendor +VendorName=My Vendor + +# The vendor icon name shown for the 'vendor' group +# +# default=emblem-favorite +VendorIcon=emblem-favorite + diff --git a/etc/Vendor.conf.in b/etc/Vendor.conf.in deleted file mode 100644 index 80b90328a..000000000 --- a/etc/Vendor.conf.in +++ /dev/null @@ -1,63 +0,0 @@ -# Only the system vendor should modify this file, ordinary users -# should not have to change anything. - -# Distributions should patch or replace this file when generating packages - -[PackagesNotFound] - -# This is a link to a vendor URL which is shown when a suitable package -# could not be found in any remote software source. -# The page set here should explain how to add new software sources if required. -# -# If the value is set to 'none' then no link is shown. -# -# default=http://www.packagekit.org/pk-package-not-found.html -DefaultUrl=http://www.packagekit.org/pk-package-not-found.html - -# The URL which is shown to the user when a codec could not be found. -# It should explain why certain codecs cannot be used, and perhaps show -# links to web stores where the codec can be legally purchased. -# -# If the value is set to 'none' then the value of DefaultUrl is used. -# -# default=none -CodecUrl=none - -# The URL which is shown to the user when hardware drivers could not be found. -# It should explain why some hardware is not supported, and links to futher -# information. -# -# If the value is set to 'none' then the value of DefaultUrl is used. -# -# default=none -HardwareUrl=none - -# The URL which is shown to the user when fonts could not be found. -# Alternatives should probably be suggested where possible. -# -# If the value is set to 'none' then the value of DefaultUrl is used. -# -# default=none -FontsUrl=none - -# The URL which is shown to the user when programs handing a mime tpye could not -# be found. It should probably explain how to use wine if the program is a -# Windows program, or suggest alternatives. -# -# If the value is set to 'none' then the value of DefaultUrl is used. -# -# default=none -MimeUrl=none - -[Groups] - -# The vendor name shown for the 'vendor' group -# -# default=My Vendor -VendorName=My Vendor - -# The vendor icon name shown for the 'vendor' group -# -# default=emblem-favorite -VendorIcon=emblem-favorite - -- cgit v1.2.3