Subversion Repositories libdkim

Compare Revisions

Regard whitespace Rev 22 → Rev 21

/branches/using-pmk/debian/libdkim.pc
File deleted
/branches/using-pmk/debian/aclocal.m4
File deleted
/branches/using-pmk/debian/examples
File deleted
/branches/using-pmk/debian/README.Debian
File deleted
/branches/using-pmk/debian/control
File deleted
/branches/using-pmk/debian/Makefile.in
File deleted
/branches/using-pmk/debian/compat
File deleted
/branches/using-pmk/debian/changelog
File deleted
/branches/using-pmk/debian/patches/20_strict_includes.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: using-pmk/debian/patches/20_bad_test.dpatch
===================================================================
--- using-pmk/debian/patches/20_bad_test.dpatch (revision 22)
+++ using-pmk/debian/patches/20_bad_test.dpatch (nonexistent)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bad_test.dpatch by Magnus Holmgren <magnus@kibibyte.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change pfnPolicyCallback to pfnPracticesCallback in test
-## DP: program.
-
-@DPATCH@
-diff -urNad trunk~/src/libdkimtest.cpp trunk/src/libdkimtest.cpp
---- trunk~/src/libdkimtest.cpp 2007-02-22 17:05:46.000000000 +0100
-+++ trunk/src/libdkimtest.cpp 2008-01-19 22:47:48.000000000 +0100
-@@ -256,7 +256,7 @@
-
- DKIMVerifyOptions vopts;
- vopts.pfnSelectorCallback = NULL; //SelectorCallback;
-- vopts.pfnPolicyCallback = NULL; //PolicyCallback;
-+ vopts.pfnPracticesCallback = NULL; //PolicyCallback;
-
- n = DKIMVerifyInit( &ctxt, &vopts );
-
/using-pmk/debian/patches/20_bad_test.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: using-pmk/debian/pmkfile
===================================================================
--- using-pmk/debian/pmkfile (revision 22)
+++ using-pmk/debian/pmkfile (nonexistent)
@@ -1,48 +0,0 @@
-# pmkfile generated by pmkscan (2008-05-17 19:27).
-
-SETTINGS {
-# list of template files
- TARGET = ("Makefile.pmk","libdkim.pc")
- DETECT = ("C++")
- LANG = "C++"
-}
-
-# main defines (NEED MANUAL EDITION)
-DEFINE {
- PACKAGE = "libdkim"
- BINDIR = "\\$(PREFIX)/bin"
- SBINDIR = "\\$(PREFIX)/sbin"
- MANDIR = "\\$(PREFIX)/man"
- DATADIR = "\\$(PREFIX)/share/\\$(PACKAGE)"
- LIBDIR = "\\$(PREFIX)/lib"
- INCDIR = "\\$(PREFIX)/include"
-}
-
-CHECK_PKG_CONFIG {
- NAME = "libcrypto"
- REQUIRED = TRUE
-}
-
-CHECK_LIB {
- NAME = "resolv"
- REQUIRED = FALSE
- LANG = "C"
- FUNCTION = ("__res_query")
-}
-
-CHECK_LIB {
- NAME = "bind"
- REQUIRED = FALSE
- LANG = "C"
- FUNCTION = ("__res_query")
-}
-
-BUILD_LIB_NAME {
- NAME = "dkim"
- STATIC = "LIBDKIM_STATIC"
- SHARED = "LIBDKIM_SHARED"
- MAJOR = "1"
- MINOR = "0"
- VERSION = TRUE
-}
-
Index: using-pmk/debian/rules
===================================================================
--- using-pmk/debian/rules (revision 22)
+++ using-pmk/debian/rules (nonexistent)
@@ -1,84 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-export CXXFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O2
-endif
-
-configure: Makefile
-Makefile: $(DPATCH_STAMPFN) debian/pmkfile
- dh_testdir
- ln -sf $(CURDIR)/debian/libdkim.pc.in src/libdkim.pc.pmk
- pmk -f debian/pmkfile
-
-build: build-stamp
-build-stamp: configure
- dh_testdir
-
- (cd src && $(MAKE) -f ../Makefile)
-
- touch $@
-
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f Makefile ] || (cd src && $(MAKE) -f ../Makefile distclean)
-
- rm -f src/*.in debian/configure
- rm -rf debian/autom4te.cache
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- (cd src && $(MAKE) -f ../Makefile install DESTDIR=$(CURDIR)/debian/tmp)
-#
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install --sourcedir=debian/tmp
- dh_link
- dh_installchangelogs -k README
- dh_installdocs
- dh_installexamples
-# dh_installinfo
-# dh_installman
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: patch unpatch build clean binary-indep binary-arch binary install configure
/using-pmk/debian/rules
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: using-pmk/debian/libdkim-dev.install
===================================================================
--- using-pmk/debian/libdkim-dev.install (revision 22)
+++ using-pmk/debian/libdkim-dev.install (nonexistent)
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig
Index: using-pmk/debian/configure.ac
===================================================================
--- using-pmk/debian/configure.ac (revision 22)
+++ using-pmk/debian/configure.ac (nonexistent)
@@ -1,38 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-AC_INIT(libdkim, 1.0.19)
-AC_CONFIG_SRCDIR([dkim.cpp])
-##AC_CONFIG_HEADER([config.h])
-
-# Checks for programs.
-AC_PROG_CXX
-PKG_PROG_PKG_CONFIG
-
-# Checks for libraries.
-#AC_CHECK_LIB([crypto], [PEM_read_PrivateKey])
-PKG_CHECK_MODULES([libcrypto], [libcrypto])
-AC_SEARCH_LIBS([res_query], [resolv c],,
- [AC_SEARCH_LIBS(__res_query,resolv bind)])
-
-# Checks for header files.
-AC_HEADER_RESOLV
-AC_HEADER_STDC
-AC_CHECK_HEADERS([netdb.h netinet/in.h inttypes.h stdlib.h string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_HEADER_TIME
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-
-# Checks for library functions.
-AC_FUNC_MEMCMP
-AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([select socket strchr])
-
-AC_CONFIG_FILES([Makefile libdkim.pc])
-AC_OUTPUT
Index: using-pmk/debian/Makefile.pmk
===================================================================
--- using-pmk/debian/Makefile.pmk (revision 22)
+++ using-pmk/debian/Makefile.pmk (nonexistent)
@@ -1,311 +0,0 @@
-# Makefile template built by pmkscan (2008-05-17 20:40)
-# @configure_input@
-
-
-# build tools
-CC= @CC@
-CFLAGS= @CFLAGS@
-CLDFLAGS= @CLDFLAGS@
-CXX= @CXX@
-CXXFLAGS= @CXXFLAGS@
-CXXLDFLAGS= @CXXLDFLAGS@ @LIBS@
-SLCXXFLAGS= @SLCXXFLAGS@
-SLCXXLDFLAGS= @SLCXXLDFLAGS@
-AR= @AR@
-ARFLAGS= cru
-RANLIB= @RANLIB@
-INSTALL= @INSTALL@
-RM= rm
-RMFLAGS= -rf
-
-
-# tool aliases
-INSTALL_BIN= $(INSTALL) -m 755
-INSTALL_SBIN= $(INSTALL) -m 755
-INSTALL_STLIB= $(INSTALL) -m 644
-INSTALL_SHLIB= $(INSTALL) -m 755
-INSTALL_DATA= $(INSTALL) -D -m 644
-INSTALL_DIR= $(INSTALL) -d -m 755
-INSTALL_MAN= $(INSTALL) -m 644
-
-
-# specific directories
-PREFIX= @PREFIX@
-BINDIR= @BINDIR@
-SBINDIR= @SBINDIR@
-DATADIR= @DATADIR@
-LIBDIR= @LIBDIR@
-INCDIR= @INCDIR@
-SYSCONFDIR= @SYSCONFDIR@
-
-# packaging
-PACKAGE= @PACKAGE@
-
-
-#
-# list of generated files
-#
-GEN_FILES= Makefile config.h
-
-#
-# source dependency lists
-#
-DKIM_SRCS= dkim.cpp dkim.h dkimbase.h dkimsign.h dkimverify.h resource.h
-
-DKIMBASE_SRCS= dkim.h dkimbase.cpp dkimbase.h
-
-DKIMSIGN_SRCS= dkim.h dkimbase.h dkimsign.cpp dkimsign.h
-
-DKIMVERIFY_SRCS= dkim.h dkimbase.h dkimverify.cpp dkimverify.h dns.h
-
-DNS_SRCS= dkim.h dns.cpp dns.h dnsresolv.h
-
-DNSRESOLV_SRCS= dnsresolv.cpp dnsresolv.h
-
-LIBDKIMTEST_SRCS= dkim.h dns.h libdkimtest.cpp
-
-#
-# binary name macros
-#
-LIBDKIMTEST= libdkimtest
-
-#
-# library name macros
-#
-LIBDKIM= libdkim
-LIBDKIM_STATIC= @LIBDKIM_STATIC@
-LIBDKIM_SHARED= @LIBDKIM_SHARED@
-LIBDKIM_HEADERS= dkim.h
-
-#
-# binary target dependency lists
-#
-LIBDKIMTEST_OBJS= dkim.o dkimbase.o dkimverify.o dkimsign.o dns.o dnsresolv.o libdkimtest.o
-
-#
-# library target dependency lists
-#
-LIBDKIM_OBJS= dkim.o dkimbase.o dkimsign.o dkimverify.o dns.o \
- dnsresolv.o
-
-#
-# target lists
-#
-
-# building
-BUILD_TARGETS= $(ALL_BIN_TARGETS) $(LIB_BUILD_TARGETS)
-
-ALL_BIN_TARGETS= $(LIBDKIMTEST)
-
-LIB_BUILD_TARGETS= static_libs $(SHARED_LIB_TARGETS)
-
-STATIC_LIB_TARGETS= $(LIBDKIM_STATIC)
-
-SHARED_LIB_TARGETS= @SHARED_LIB_TARGETS@
-
-CXX_SHLIB_TARGETS= $(LIBDKIM_SHARED)
-
-# cleaning
-CLEAN_TARGETS= $(BIN_CLEAN_TARGETS) $(LIB_CLEAN_TARGETS)
-
-BIN_CLEAN_TARGETS= $(LIBDKIMTEST)_clean
-
-LIB_CLEAN_TARGETS= static_libs_clean $(SHLIB_CLEAN_TARGETS)
-
-STLIB_CLEAN_TARGETS= $(LIBDKIM)_static_clean
-
-SHLIB_CLEAN_TARGETS= @SHLIB_CLEAN_TARGETS@
-
-CXX_SHLIB_CLEAN_TARGETS= $(LIBDKIM)_shared_clean
-
-# installing
-INSTALL_TARGETS= install_bin install_lib
-
-BIN_INSTALL_TARGETS= $(LIBDKIMTEST)_install
-
-LIB_INSTALL_TARGETS= lib_headers_install static_libs_install $(SHLIB_INST_TARGETS)
-
-STLIB_INST_TARGETS= $(LIBDKIM)_static_install
-
-SHLIB_INST_TARGETS= @SHLIB_INST_TARGETS@
-
-CXX_SHLIB_INST_TARGETS= $(LIBDKIM)_shared_install
-
-# deinstalling
-DEINSTALL_TARGETS= $(BIN_DEINSTALL_TARGETS) $(LIB_DEINSTALL_TARGETS)
-
-BIN_DEINSTALL_TARGETS= $(LIBDKIMTEST)_deinstall
-
-LIB_DEINSTALL_TARGETS= lib_headers_deinstall static_libs_deinstall $(SHLIB_DEINST_TARGETS)
-
-STLIB_DEINST_TARGETS= $(LIBDKIM)_static_deinstall
-
-SHLIB_DEINST_TARGETS= @SHLIB_DEINST_TARGETS@
-
-CXX_SHLIB_DEINST_TARGETS= $(LIBDKIM)_shared_deinstall
-
-# by default we consider all binaries as non privileged
-BIN_FILES= $(ALL_BIN_TARGETS)
-
-# move privileged binaries here if needed
-SBIN_FILES=
-
-.SUFFIXES: .o .s .c .C .cc .cxx .cpp
-
-# C suffixes
-.c.o:
- $(CC) $(CFLAGS) $(SLCFLAGS) -o $@ -c $<
-
-.C.o:
- $(CC) $(CFLAGS) $(SLCFLAGS) -o $@ -c $<
-
-.cc.o:
- $(CC) $(CFLAGS) $(SLCFLAGS) -o $@ -c $<
-
-# C++ suffixes
-.cxx.o:
- $(CXX) $(CXXFLAGS) $(SLCXXFLAGS) -o $@ -c $<
-
-.cpp.o:
- $(CXX) $(CXXFLAGS) $(SLCXXFLAGS) -o $@ -c $<
-
-
-#
-# generic targets
-#
-all: $(BUILD_TARGETS)
-
-clean: $(CLEAN_TARGETS)
-
-install: $(INSTALL_TARGETS)
-
-deinstall: $(DEINSTALL_TARGETS)
-
-distclean: clean
- $(RM) $(RMFLAGS) $(GEN_FILES)
-
-#
-# object rules
-#
-dkim.o: $(DKIM_SRCS)
-
-
-dkimbase.o: $(DKIMBASE_SRCS)
-
-
-dkimsign.o: $(DKIMSIGN_SRCS)
-
-
-dkimverify.o: $(DKIMVERIFY_SRCS)
-
-
-dns.o: $(DNS_SRCS)
-
-
-dnsresolv.o: $(DNSRESOLV_SRCS)
-
-
-libdkimtest.o: $(LIBDKIMTEST_SRCS)
-
-
-#
-# binary target rules
-#
-
-# main binary install target
-install_bin: install_bindir $(BIN_INSTALL_TARGETS)
-
-# install binary directory
-install_bindir:
- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-
-# libdkimtest binary targets
-$(LIBDKIMTEST): $(LIBDKIMTEST_OBJS)
- $(CXX) $(CXXLDFLAGS) -o $@ $(LIBDKIMTEST_OBJS)
-
-$(LIBDKIMTEST)_clean:
- $(RM) $(RMFLAGS) $(LIBDKIMTEST_OBJS)
- $(RM) $(RMFLAGS) $(LIBDKIMTEST)
-
-$(LIBDKIMTEST)_install: $(LIBDKIMTEST)
- $(INSTALL_BIN) $(LIBDKIMTEST) $(DESTDIR)$(BINDIR)/$(LIBDKIMTEST)
-
-$(LIBDKIMTEST)_deinstall:
- $(RM) $(RMFLAGS) $(DESTDIR)$(BINDIR)/$(LIBDKIMTEST)
-
-#
-# library target rules
-#
-
-# main library install target
-install_lib: install_libdir $(LIB_INSTALL_TARGETS)
-
-# install library directory
-install_libdir:
- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-
-
-# library headers install target
-lib_headers_install: $(LIBDKIM)_headers_install
-
-
-# library headers deinstall target
-lib_headers_deinstall: $(LIBDKIM)_headers_deinstall
-
-# static library targets
-static_libs: $(STATIC_LIB_TARGETS)
-
-static_libs_clean: $(STLIB_CLEAN_TARGETS)
-
-static_libs_install: $(STLIB_INST_TARGETS)
-
-static_libs_deinstall: $(STLIB_DEINST_TARGETS)
-
-# C++ language shared library targets
-cxx_shared_libs: $(CXX_SHLIB_TARGETS)
-
-cxx_shared_libs_clean: $(CXX_SHLIB_CLEAN_TARGETS)
-
-cxx_shared_libs_install: $(CXX_SHLIB_INST_TARGETS)
-
-cxx_shared_libs_deinstall: $(CXX_SHLIB_DEINST_TARGETS)
-
-
-# libdkim library targets
-$(LIBDKIM)_headers_install: $(LIBDKIM_HEADERS)
- $(INSTALL_DATA) dkim.h $(DESTDIR)$(INCDIR)/dkim.h
-
-$(LIBDKIM)_headers_deinstall:
- $(RM) $(RMFLAGS) $(DESTDIR)$(INCDIR)/dkim.h
-
-$(LIBDKIM)_clean:
- $(RM) $(RMFLAGS) $(LIBDKIM_OBJS)
-
-$(LIBDKIM_STATIC): $(LIBDKIM_OBJS)
- $(AR) $(ARFLAGS) $@ $(LIBDKIM_OBJS)
- $(RANLIB) $@
-
-$(LIBDKIM)_static_clean: $(LIBDKIM)_clean
- $(RM) $(RMFLAGS) $(LIBDKIM_STATIC)
-
-$(LIBDKIM)_static_install: $(LIBDKIM_STATIC)
- $(INSTALL_STLIB) $(LIBDKIM_STATIC) $(DESTDIR)$(LIBDIR)/$(LIBDKIM_STATIC)
-
-$(LIBDKIM)_static_deinstall:
- $(RM) $(RMFLAGS) $(DESTDIR)$(LIBDIR)/$(LIBDKIM_STATIC)
-
-$(LIBDKIM_SHARED): $(LIBDKIM_OBJS)
- $(CXX) $(CXXLDFLAGS) $(SLCXXLDFLAGS) -o $@ $(LIBDKIM_OBJS)
-
-$(LIBDKIM)_shared_clean: $(LIBDKIM)_clean
- $(RM) $(RMFLAGS) $(LIBDKIM_SHARED)
-
-$(LIBDKIM)_shared_install: $(LIBDKIM_SHARED)
- $(INSTALL_SHLIB) $(LIBDKIM_SHARED) $(DESTDIR)$(LIBDIR)/$(LIBDKIM_SHARED)
- ln -sf $(DESTDIR)$(LIBDIR)/$(LIBDKIM_SHARED) $(DESTDIR)$(LIBDIR)/libdkim.so
-
-$(LIBDKIM)_shared_deinstall:
- $(RM) $(RMFLAGS) $(DESTDIR)$(LIBDIR)/$(LIBDKIM_SHARED)
-
-
-
Index: using-pmk/debian/install
===================================================================
--- using-pmk/debian/install (revision 22)
+++ using-pmk/debian/install (nonexistent)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
Index: using-pmk/debian/watch
===================================================================
--- using-pmk/debian/watch (revision 22)
+++ using-pmk/debian/watch (nonexistent)
@@ -1,4 +0,0 @@
-# Compulsory line, this is a version 3 file
-version=3
-
-http://sf.net/libdkim/libdkim-(.*)\.zip debian uupdate
Index: using-pmk/debian/libdkim-dev.links
===================================================================
--- using-pmk/debian/libdkim-dev.links (revision 22)
+++ using-pmk/debian/libdkim-dev.links (nonexistent)
@@ -1 +0,0 @@
-usr/share/doc/libdkim1 usr/share/doc/libdkim-dev
Index: using-pmk/debian/libdkim.ver
===================================================================
--- using-pmk/debian/libdkim.ver (revision 22)
+++ using-pmk/debian/libdkim.ver (nonexistent)
@@ -1,4 +0,0 @@
-DKIM_0.0 {
- global: DKIM*;
- local: *;
-};
Index: using-pmk/debian/copyright
===================================================================
--- using-pmk/debian/copyright (revision 22)
+++ using-pmk/debian/copyright (nonexistent)
@@ -1,217 +0,0 @@
-This package was debianized by Magnus Holmgren <magnus@kibibyte.se> on
-19 Feb 2007.
-
-It was downloaded from http://libdkim.sf.net (the easiest way to get the
-original zip file is via http://qa.debian.org/watch/sf.php/libdkim/).
-
-Upstream Author: Alt-N Technologies, http://www.altn.com
-
-Copyright 2005 Alt-N Technologies, Ltd.
-
-License:
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-The Debian packaging is (C) 2007, Magnus Holmgren <magnus@kibibyte.se> and
-is, for the sake of simplicity, licensed under the same license.
Index: using-pmk/debian
===================================================================
--- using-pmk/debian (revision 22)
+++ using-pmk/debian (nonexistent)
/using-pmk/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property