[pkg-opensc-commit] [pkcs11-helper] 26/53: New debian stuff from Sandro Wefel, also modifying copyright into m4 so that license will appear only once in tree
Eric Dorland
eric at moszumanska.debian.org
Fri Jan 6 23:39:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to tag pkcs11-helper-1.03
in repository pkcs11-helper.
commit 148da8b570cfb92a6aec69af12c1789318b6006c
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date: Sat Feb 17 09:06:18 2007 +0000
New debian stuff from Sandro Wefel, also modifying copyright into m4 so that license will appear only once in tree
---
configure.ac | 1 +
distro/debian/Makefile.am | 11 ++-
distro/debian/changelog | 8 +++
distro/debian/copyright | 115 --------------------------------
distro/debian/copyright.m4 | 13 ++++
distro/debian/pkcs11-helper-dev.dirs | 3 -
distro/debian/pkcs11-helper-dev.docs | 1 -
distro/debian/pkcs11-helper-dev.install | 1 +
distro/debian/pkcs11-helper.dirs | 1 -
distro/debian/rules | 2 +-
10 files changed, 32 insertions(+), 124 deletions(-)
diff --git a/configure.ac b/configure.ac
index fe3a129..08cf7eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+AC_CHECK_PROGS([M4], [m4])
if test "${enable_doc}" = "yes"; then
AC_CHECK_PROGS([DOXYGEN], [doxygen])
diff --git a/distro/debian/Makefile.am b/distro/debian/Makefile.am
index 4695276..ccfef05 100644
--- a/distro/debian/Makefile.am
+++ b/distro/debian/Makefile.am
@@ -49,6 +49,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
+BUILT_SOURCES=copyright
+
EXTRA_DIST= \
changelog \
README.Debian \
@@ -57,9 +59,12 @@ EXTRA_DIST= \
copyright \
rules \
watch \
- pkcs11-helper-dev.dirs \
- pkcs11-helper-dev.docs \
pkcs11-helper-dev.install \
- pkcs11-helper.dirs \
pkcs11-helper.install \
pkcs11-helper.manpages
+
+copyright: copyright.m4
+ $(M4) $< > $@
+
+clean-local:
+ -rm copyright
diff --git a/distro/debian/changelog b/distro/debian/changelog
index 18ab895..1903fdd 100644
--- a/distro/debian/changelog
+++ b/distro/debian/changelog
@@ -1,3 +1,11 @@
+pkcs11-helper (1.02-99.0saw0) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * upgrade to version 1.03 beta 1
+ - use --with-apidocdir for the path to the api docs
+
+ -- Sandro Wefel (testlaeufer) <sandro.wefel at informatik.uni-halle.de> Fri, 16 Feb 2007 15:54:41 +0100
+
pkcs11-helper (1.02-1.0saw1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/distro/debian/copyright b/distro/debian/copyright
deleted file mode 100644
index 3d67bd0..0000000
--- a/distro/debian/copyright
+++ /dev/null
@@ -1,115 +0,0 @@
-This package was debianized by S. Wefel <wefel at informatik.uni-halle.de> on
-Mon, 29 Jan 2007 16:56:30 +0100.
-
-It was downloaded from http://www.opensc-project.org/files/pkcs11-helper/
-
-Upstream Author: Alon Bar-Lev <alon.barlev at gmail.com>
-
-Copyright: Copyright (c) 2005-2006 Alon Bar-Lev
-
-
-pkcs11-helper License
-
- Copyright (c) 2005-2007 Alon Bar-Lev <alon.barlev at gmail.com>
- All rights reserved.
-
- This software is available to you under a choice of one of two
- licenses. You may choose to be licensed under the terms of the GNU
- General Public License (GPL) Version 2, or the BSD license.
-
- GNU General Public License (GPL) Version 2
- ===========================================
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program (see the file COPYING.GPL included with this
- distribution); if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- BSD License
- ============
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- o Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- o Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- o Neither the name of the <ORGANIZATION> nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-Packeging License
-
- RPM
- Copyright (c) 2006-2007 Eddy Nigg
-
- Debian
- Copyright (c) 2007 Sandro Wefel
-
-m4 Macros License
-
- autoconf/automake
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-
- pkg.m4
- Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-
- AX_CPP_VARARG*
- Copyright (c) James Yonan <jim at yonan.net>
- Copyright (c) Matthias Andree <matthias.andree at web.de>
-
-OpenSSL License (Optional component, parsing certificates, engine)
-
- This product includes software developed by the OpenSSL Project
- for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)
-
- This product includes cryptographic software written by Eric Young
- (eay at cryptsoft.com). This product includes software written by Tim
- Hudson (tjh at cryptsoft.com).
-
-GNUTLS License (Optional component, for a complete GPLed license, replaces OpenSSL)
-
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Nikos Mavroyanopoulos
- See the end for copying conditions.
-
- The copyright holder for Gnutls is Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
-Doxygen License (Optional component, documentation)
-
- Copyright © 1997-2006 by Dimitri van Heesch.
-
- Permission to use, copy, modify, and distribute this software and
- its documentation under the terms of the GNU General Public License
- is hereby granted. No representations are made about the suitability
- of this software for any purpose. It is provided "as is" without express
- or implied warranty. See the GNU General Public License for more details.
-
- Documents produced by doxygen are derivative works derived
- from the input used in their production; they are not affected by this
- license.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/distro/debian/copyright.m4 b/distro/debian/copyright.m4
new file mode 100644
index 0000000..ff8b91e
--- /dev/null
+++ b/distro/debian/copyright.m4
@@ -0,0 +1,13 @@
+This package was debianized by S. Wefel <wefel at informatik.uni-halle.de> on
+Mon, 29 Jan 2007 16:56:30 +0100.
+
+It was downloaded from http://www.opensc-project.org/files/pkcs11-helper/
+
+Upstream Author: Alon Bar-Lev <alon.barlev at gmail.com>
+
+Copyright: Copyright (c) 2005-2006 Alon Bar-Lev
+
+include(../../COPYING)
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/distro/debian/pkcs11-helper-dev.dirs b/distro/debian/pkcs11-helper-dev.dirs
deleted file mode 100644
index 76d6480..0000000
--- a/distro/debian/pkcs11-helper-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/aclocal
diff --git a/distro/debian/pkcs11-helper-dev.docs b/distro/debian/pkcs11-helper-dev.docs
deleted file mode 100644
index d9f7d00..0000000
--- a/distro/debian/pkcs11-helper-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/api/api.out/html/
diff --git a/distro/debian/pkcs11-helper-dev.install b/distro/debian/pkcs11-helper-dev.install
index 9474616..80743d0 100644
--- a/distro/debian/pkcs11-helper-dev.install
+++ b/distro/debian/pkcs11-helper-dev.install
@@ -3,4 +3,5 @@ usr/lib/lib*.so
usr/lib/lib*.la
usr/lib/pkgconfig
usr/share/aclocal
+usr/share/doc/pkcs11-helper-dev/api
usr/include
diff --git a/distro/debian/pkcs11-helper.dirs b/distro/debian/pkcs11-helper.dirs
deleted file mode 100644
index 6845771..0000000
--- a/distro/debian/pkcs11-helper.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/distro/debian/rules b/distro/debian/rules
index 60cd99a..9cbb4f5 100755
--- a/distro/debian/rules
+++ b/distro/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-doc
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-doc --with-apidocdir=${prefix}/usr/share/doc/pkcs11-helper-dev/api
DEB_INSTALL_DOCS_ALL := README AUTHORS THANKS
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git
More information about the pkg-opensc-commit
mailing list