[oscache] 03/04: Wrap and sort
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 30 01:09:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository oscache.
commit 3e2d793a90509d625981064c099cda5a9b49ffc6
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Nov 30 01:42:17 2017 +0100
Wrap and sort
---
debian/control | 20 ++++++++++++--------
debian/copyright | 16 ++++++++--------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/debian/control b/debian/control
index f17d777..57d0bbd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,18 @@ Source: oscache
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 10), maven-debian-helper
-Build-Depends-Indep: default-jdk,
- libcommons-logging-java,
- libgeronimo-jms-1.1-spec-java,
- libhibernate3-java,
- libjgroups-java (>= 2.12.2.Final),
- libservlet3.1-java
+Uploaders:
+ Varun Hiremath <varun at debian.org>,
+ Torsten Werner <twerner at debian.org>
+Build-Depends:
+ debhelper (>= 10),
+ default-jdk,
+ libcommons-logging-java,
+ libgeronimo-jms-1.1-spec-java,
+ libhibernate3-java,
+ libjgroups-java (>= 2.12.2.Final),
+ libservlet3.1-java,
+ maven-debian-helper
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/oscache.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/oscache.git
diff --git a/debian/copyright b/debian/copyright
index c06aef0..93e7cb4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,38 +12,38 @@ Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
License:
The OpenSymphony Software License, Version 1.1
-
+
(this license is derived and fully compatible with the Apache Software
License - see http://www.apache.org/LICENSE.txt)
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-
+
2. 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.
-
+
3. The end-user documentation included with the redistribution,
if any, must include the following acknowledgment:
"This product includes software developed by the
OpenSymphony Group (http://www.opensymphony.com/)."
Alternately, this acknowledgment may appear in the software itself,
if and wherever such third-party acknowledgments normally appear.
-
+
4. The names "OpenSymphony" and "The OpenSymphony Group"
must not be used to endorse or promote products derived from this
software without prior written permission. For written
permission, please contact license at opensymphony.com .
-
+
5. Products derived from this software may not be called "OpenSymphony"
or "OSCache", nor may "OpenSymphony" or "OSCache" appear in their
name, without prior written permission of the OpenSymphony Group.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/oscache.git
More information about the pkg-java-commits
mailing list