[Python-modules-commits] r33852 - in packages/python-mkdocs/branches/deduplication/debian (3 files)
fladi at users.alioth.debian.org
fladi at users.alioth.debian.org
Tue Aug 18 13:53:52 UTC 2015
Date: Tuesday, August 18, 2015 @ 13:53:51
Author: fladi
Revision: 33852
Reformat packaging files with cme for better readability.
Modified:
packages/python-mkdocs/branches/deduplication/debian/changelog
packages/python-mkdocs/branches/deduplication/debian/control
packages/python-mkdocs/branches/deduplication/debian/copyright
Modified: packages/python-mkdocs/branches/deduplication/debian/changelog
===================================================================
--- packages/python-mkdocs/branches/deduplication/debian/changelog 2015-08-18 13:48:31 UTC (rev 33851)
+++ packages/python-mkdocs/branches/deduplication/debian/changelog 2015-08-18 13:53:51 UTC (rev 33852)
@@ -1,3 +1,10 @@
+python-mkdocs (0.11.1-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Reformat packaging files with cme for better readability.
+
+ -- Michael Fladischer <fladi at debian.org> Tue, 18 Aug 2015 15:53:22 +0200
+
python-mkdocs (0.11.1-3) unstable; urgency=medium
* Fix typo in suggests. Closes: #782597.
Modified: packages/python-mkdocs/branches/deduplication/debian/control
===================================================================
--- packages/python-mkdocs/branches/deduplication/debian/control 2015-08-18 13:48:31 UTC (rev 33851)
+++ packages/python-mkdocs/branches/deduplication/debian/control 2015-08-18 13:53:51 UTC (rev 33852)
@@ -1,21 +1,30 @@
Source: python-mkdocs
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Brian May <bam at debian.org>
Section: text
Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Brian May <bam at debian.org>
-Build-Depends: debhelper (>= 9), dh-python,
- python3-all (>= 3.2), python3-setuptools, python3-markdown (>= 2.1.0),
- python3-jinja2, python3-yaml, python3-watchdog, python3-pkg-resources,
+Build-Depends: debhelper (>= 9),
+ dh-python,
+ python3-all (>= 3.2),
+ python3-jinja2,
+ python3-markdown,
+ python3-pkg-resources,
+ python3-setuptools,
+ python3-watchdog,
+ python3-yaml
Standards-Version: 3.9.6
-Homepage: http://www.mkdocs.org/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-mkdocs/trunk/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-mkdocs/trunk/
+Homepage: http://www.mkdocs.org/
Package: mkdocs
Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources,
- fonts-font-awesome,
-Suggests: mkdocs-doc, ghp-import
+Depends: fonts-font-awesome,
+ python3-pkg-resources,
+ ${misc:Depends},
+ ${python3:Depends}
+Suggests: ghp-import,
+ mkdocs-doc
Description: Static site generator geared towards building project documentation
MkDocs is a fast, simple and downright gorgeous static site generator
that's geared towards building project documentation. Documentation
@@ -23,8 +32,8 @@
configuration file.
Package: mkdocs-doc
+Architecture: all
Section: doc
-Architecture: all
Depends: ${misc:Depends}
Description: Static site generator (documentation)
MkDocs is a fast, simple and downright gorgeous static site generator
Modified: packages/python-mkdocs/branches/deduplication/debian/copyright
===================================================================
--- packages/python-mkdocs/branches/deduplication/debian/copyright 2015-08-18 13:48:31 UTC (rev 33851)
+++ packages/python-mkdocs/branches/deduplication/debian/copyright 2015-08-18 13:53:51 UTC (rev 33852)
@@ -34,6 +34,22 @@
Copyright: 2015 Brian May <brian at microcomaustralia.com.au>
License: BSD-2-Clause
+License: Apache-2.0
+ 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.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license can be
+ found in /usr/share/common-licenses/Apache-2.0.
+
License: BSD-2-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -65,8 +81,8 @@
* 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.
- * Neither the name of highlight.js nor the names of its contributors
- may be used to endorse or promote products derived from this software
+ * Neither the name of highlight.js 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
@@ -100,22 +116,6 @@
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-License: Apache-2.0
- 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.
- .
- On Debian-based systems the full text of the Apache version 2.0 license can be
- found in /usr/share/common-licenses/Apache-2.0.
-
License: OFL-1.1
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
@@ -126,7 +126,7 @@
.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
- fonts, including any derivative works, can be bundled, embedded,
+ fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
More information about the Python-modules-commits
mailing list