[Python-modules-commits] [flask-silk] 01/01: Adopting package in DPMT

Jonathan Cristopher Carter jcc at moszumanska.debian.org
Wed Sep 6 08:36:13 UTC 2017 

This is an automated email from the git hooks/post-receive script.

jcc pushed a commit to branch master
in repository flask-silk.

commit 3dee8f06eadef07589fa5a8a8eea5435f5d9cd2f
Author: Jonathan Carter <jcarter at linux.com>
Date:   Wed Sep 6 10:36:26 2017 +0200

    Adopting package in DPMT
---
 debian/.git-dpm                            | 11 --------
 debian/changelog                           | 40 +++++++++++++++++++++++++++---
 debian/compat                              |  2 +-
 debian/control                             | 36 +++++++++++++++++++++------
 debian/copyright                           |  1 +
 debian/patches/privacy-breach.patch        | 18 +++-----------
 debian/python-flask-silk.install           |  8 +++---
 debian/python-flask-silk.links             |  8 +++---
 debian/python-flask-silk.lintian-overrides |  2 --
 debian/python-flask-silk.pyremove          |  1 +
 debian/python3-flask-silk.install          |  4 +++
 debian/python3-flask-silk.links            |  4 +++
 debian/python3-flask-silk.linktrees        |  1 +
 debian/rules                               |  6 +----
 docs/_themes/flask_small/layout.html       |  4 +++
 15 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index bf28a31..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-380a79d6990775ff6d0932a30583b22ab3a180d9
-380a79d6990775ff6d0932a30583b22ab3a180d9
-dd7e3980d86c3e70c2bf8e3721383c24328d29f4
-dd7e3980d86c3e70c2bf8e3721383c24328d29f4
-flask-silk_0.2.orig.tar.gz
-cef42b469c9ebb69a766d0cd33ad27480800d518
-627171
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/changelog b/debian/changelog
index cab1be2..aa766bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,42 @@
-flask-silk (0.2-4) UNRELEASED; urgency=medium
+flask-silk (0.2-7) unstable; urgency=medium
 
-  * Fixed VCS URL (https)
+  * Adopting package as part of Python team (DPMT) (Closes: #873653)
+  * Bump compat level to 10
+  * Update standards version to 4.1.0
+  * Remove ancient versioned dependencies
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:36:16 +0200
+ -- Jonathan Carter <jcc at debian.org>  Wed, 06 Sep 2017 10:04:23 +0200
+
+flask-silk (0.2-6) unstable; urgency=medium
+
+  * debian/python3-flask-silk.install: Fix install location of arrow_up.png.
+    (Closes: #857222)
+  * debian/control:
+    - Bump Standards-Version.
+    - Update Vcs-Git.
+  * debian/*.lintian-overrides: Removed, no longer needed.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Fri, 16 Jun 2017 00:37:52 +0200
+
+flask-silk (0.2-5) unstable; urgency=medium
+
+  * Build package for Python 3.
+    - debian/control: Add python3-flask-babel and Build-Depends for Python 3.
+    - debian/rules: Build with --with python3.
+    - debian/*.{install,links,linktree}: Copy for python3-flask-babel and
+      adopt accordingly.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Thu, 21 Jan 2016 00:23:40 +0100
+
+flask-silk (0.2-4) unstable; urgency=medium
+
+  * debian/control:
+    - Move to collab-maint.
+    - Update Standards-Version to 3.9.6.
+  * debian/{rules,python-flask-silk.pyremve}: Remove SOURCES.txt using.
+    pyremove (Closes: #805198).
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Sun, 15 Nov 2015 23:38:41 +0100
 
 flask-silk (0.2-3) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 90800de..40e9a34 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,21 @@ Source: flask-silk
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Sebastian Ramacher <sramacher at debian.org>
+Uploaders: Jonathan Carter <jcc at debian.org>
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
  dh-python,
  dh-linktree,
- python-all (>= 2.6.6-3~),
+ python-all,
+ python3-all,
  python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python-flask (>= 0.8),
+ python3-setuptools,
+ python-sphinx,
+ python-flask,
+ python3-flask,
  famfamfam-silk
 X-Python-Version: >= 2.6
-Standards-Version: 3.9.5
+Standards-Version: 4.1.0
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/flask-silk.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/flask-silk.git
 Homepage: https://github.com/sublee/flask-silk
@@ -23,13 +26,30 @@ Architecture: all
 Depends:
  ${python:Depends},
  ${misc:Depends},
- python-flask (>= 0.8)
+ python-flask
 Suggests: python-flask-silk-doc
-Description: FamFamFam Silk icon set for Flask applications
+Description: FamFamFam Silk icon set for Flask applications (Python 2)
  Flask-Silk is a Flask extension that provides the icons from the FamFamFam
  Silk icon set for Flask applications, blueprints and other extensions. It also
  allows one to serve custom icons replacing or extending those from the
  FamFamFam Silk icon set.
+ .
+ This package contains the module for Python 2.
+
+Package: python3-flask-silk
+Architecture: all
+Depends:
+ ${python3:Depends},
+ ${misc:Depends},
+ python3-flask
+Suggests: python-flask-silk-doc
+Description: FamFamFam Silk icon set for Flask applications (Python 3)
+ Flask-Silk is a Flask extension that provides the icons from the FamFamFam
+ Silk icon set for Flask applications, blueprints and other extensions. It also
+ allows one to serve custom icons replacing or extending those from the
+ FamFamFam Silk icon set.
+ .
+ This package contains the module for Python 3.
 
 Package: python-flask-silk-doc
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 37f2d60..1b68e05 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -322,6 +322,7 @@ License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2013 Sebastian Ramacher <sramacher at debian.org>
+           2017 Jonathan Carter <jcc at debian.org>
 License: BSD-3-clause
 
 License: BSD-3-clause
diff --git a/debian/patches/privacy-breach.patch b/debian/patches/privacy-breach.patch
index 26aabae..361a080 100644
--- a/debian/patches/privacy-breach.patch
+++ b/debian/patches/privacy-breach.patch
@@ -1,19 +1,9 @@
-From 380a79d6990775ff6d0932a30583b22ab3a180d9 Mon Sep 17 00:00:00 2001
-From: Sebastian Ramacher <sramacher at debian.org>
-Date: Thu, 8 Oct 2015 09:06:43 -0700
-Subject: Disable "fork me on GitHub" logo to prevent privacy breach
-
+Description: Disable "fork me on GitHub" logo to prevent privacy breach
+Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-09-10
 
-Patch-Name: privacy-breach.patch
----
- docs/_themes/flask_small/layout.html | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/docs/_themes/flask_small/layout.html b/docs/_themes/flask_small/layout.html
-index aa1716a..707fe01 100644
---- a/docs/_themes/flask_small/layout.html
-+++ b/docs/_themes/flask_small/layout.html
+--- flask-silk-0.2.orig/docs/_themes/flask_small/layout.html
++++ flask-silk-0.2/docs/_themes/flask_small/layout.html
 @@ -13,10 +13,6 @@
  {# do not display relbars #}
  {% block relbar1 %}{% endblock %}
diff --git a/debian/python-flask-silk.install b/debian/python-flask-silk.install
index b8d3a05..8dc0584 100644
--- a/debian/python-flask-silk.install
+++ b/debian/python-flask-silk.install
@@ -1,4 +1,4 @@
-usr/lib/python2.*
-flask_silk/icons/blank.gif usr/share/icons/flask-silk/16x16
-flask_silk/icons/arrow_turn_up.png usr/share/icons/flask-silk/16x16
-flask_silk/icons/*python.png usr/share/icons/flask-silk/16x16
+usr/lib/python2*
+flask_silk/icons/blank.gif usr/share/icons/python-flask-silk/16x16
+flask_silk/icons/arrow_turn_up.png usr/share/icons/python-flask-silk/16x16
+flask_silk/icons/*python.png usr/share/icons/python-flask-silk/16x16
diff --git a/debian/python-flask-silk.links b/debian/python-flask-silk.links
index 2550bc1..efce1a0 100644
--- a/debian/python-flask-silk.links
+++ b/debian/python-flask-silk.links
@@ -1,4 +1,4 @@
-usr/share/icons/flask-silk/16x16/blank.gif usr/lib/python2.7/dist-packages/flask_silk/icons/blank.gif
-usr/share/icons/flask-silk/16x16/arrow_turn_up.png usr/lib/python2.7/dist-packages/flask_silk/icons/arrow_turn_up.png
-usr/share/icons/flask-silk/16x16/python.png usr/lib/python2.7/dist-packages/flask_silk/icons/python.png
-usr/share/icons/flask-silk/16x16/page_white_python.png usr/lib/python2.7/dist-packages/flask_silk/icons/page_white_python.png
+usr/share/icons/python-flask-silk/16x16/blank.gif usr/lib/python2.7/dist-packages/flask_silk/icons/blank.gif
+usr/share/icons/python-flask-silk/16x16/arrow_turn_up.png usr/lib/python2.7/dist-packages/flask_silk/icons/arrow_turn_up.png
+usr/share/icons/python-flask-silk/16x16/python.png usr/lib/python2.7/dist-packages/flask_silk/icons/python.png
+usr/share/icons/python-flask-silk/16x16/page_white_python.png usr/lib/python2.7/dist-packages/flask_silk/icons/page_white_python.png
diff --git a/debian/python-flask-silk.lintian-overrides b/debian/python-flask-silk.lintian-overrides
deleted file mode 100644
index 72add05..0000000
--- a/debian/python-flask-silk.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# they are fine
-package-contains-broken-symlink
diff --git a/debian/python-flask-silk.pyremove b/debian/python-flask-silk.pyremove
new file mode 100644
index 0000000..94440d2
--- /dev/null
+++ b/debian/python-flask-silk.pyremove
@@ -0,0 +1 @@
+*.egg-info/SOURCES.txt
diff --git a/debian/python3-flask-silk.install b/debian/python3-flask-silk.install
new file mode 100644
index 0000000..eed6571
--- /dev/null
+++ b/debian/python3-flask-silk.install
@@ -0,0 +1,4 @@
+usr/lib/python3*
+flask_silk/icons/blank.gif usr/share/icons/python3-flask-silk/16x16
+flask_silk/icons/arrow_turn_up.png usr/share/python3-flask-silk/16x16
+flask_silk/icons/*python.png usr/share/icons/python3-flask-silk/16x16
diff --git a/debian/python3-flask-silk.links b/debian/python3-flask-silk.links
new file mode 100644
index 0000000..9a923f8
--- /dev/null
+++ b/debian/python3-flask-silk.links
@@ -0,0 +1,4 @@
+usr/share/icons/python3-flask-silk/16x16/blank.gif usr/lib/python3/dist-packages/flask_silk/icons/blank.gif
+usr/share/icons/python3-flask-silk/16x16/arrow_turn_up.png usr/lib/python3/dist-packages/flask_silk/icons/arrow_turn_up.png
+usr/share/icons/python3-flask-silk/16x16/python.png usr/lib/python3/dist-packages/flask_silk/icons/python.png
+usr/share/icons/python3-flask-silk/16x16/page_white_python.png usr/lib/python3/dist-packages/flask_silk/icons/page_white_python.png
diff --git a/debian/python3-flask-silk.linktrees b/debian/python3-flask-silk.linktrees
new file mode 100644
index 0000000..f40f595
--- /dev/null
+++ b/debian/python3-flask-silk.linktrees
@@ -0,0 +1 @@
+replace usr/share/icons/silk/16x16 usr/lib/python3/dist-packages/flask_silk/icons
diff --git a/debian/rules b/debian/rules
index bd2b9c2..fe40b52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with=python2,sphinxdoc,linktree --buildsystem pybuild
+	dh $@ --with=python2,python3,sphinxdoc,linktree --buildsystem pybuild
 
 override_dh_clean:
 	dh_clean
@@ -10,7 +10,3 @@ override_dh_clean:
 override_dh_auto_build:
 	dh_auto_build
 	python setup.py build_sphinx
-
-override_dh_auto_install:
-	dh_auto_install
-	rm debian/tmp/usr/lib/python*/*-packages/Flask_Silk-*.egg-info/SOURCES.txt
diff --git a/docs/_themes/flask_small/layout.html b/docs/_themes/flask_small/layout.html
index 707fe01..aa1716a 100644
--- a/docs/_themes/flask_small/layout.html
+++ b/docs/_themes/flask_small/layout.html
@@ -13,6 +13,10 @@
 {# do not display relbars #}
 {% block relbar1 %}{% endblock %}
 {% block relbar2 %}
+  {% if theme_github_fork %}
+    <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
+    src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+  {% endif %}
 {% endblock %}
 {% block sidebar1 %}{% endblock %}
 {% block sidebar2 %}{% endblock %}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flask-silk.git

More information about the Python-modules-commits mailing list