[Python-modules-commits] [kombu] 01/09: Fix "Non-Free ICC profiles in images" (Closes: #855502)

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Sun Feb 19 11:37:05 UTC 2017


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

mans0954 pushed a commit to branch master
in repository kombu.

commit 19d26d4e31a670a0ef703173bbe3633b13bb15bd
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Feb 19 10:47:31 2017 +0000

    Fix "Non-Free ICC profiles in images" (Closes: #855502)
    
    * Team upload.
    * Fix "Non-Free ICC profiles in images" add repack scripts to remove
      (Closes: #855502)
---
 debian/changelog    |  8 +++++
 debian/copyright    |  4 +++
 debian/repack.local | 12 +++++++
 debian/repack.stub  | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/watch        |  5 +--
 5 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47996f6..eec06ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kombu (3.0.35+dfsg-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix "Non-Free ICC profiles in images" add repack scripts to remove
+    (Closes: #855502)
+
+ -- Christopher Hoskin <mans0954 at debian.org>  Sun, 19 Feb 2017 10:39:44 +0000
+
 kombu (3.0.35-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/copyright b/debian/copyright
index aac53c8..003d181 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,6 +31,10 @@ Files: debian/*
 Copyright: 2012-2015, Michael Fladischer <fladi at debian.org>
 License: BSD-solem
 
+Files: debian/repack.stub
+Copyright: 2009 Ryan Niebur <ryan at debian.org>
+License: Artistic or GPL-1+
+
 License: BSD-solem
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
diff --git a/debian/repack.local b/debian/repack.local
new file mode 100644
index 0000000..d3be502
--- /dev/null
+++ b/debian/repack.local
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ ! -f /usr/bin/convert ]
+then
+	echo "This repack script requires the convert program."
+	echo "Please install the graphicsmagick-imagemagick-compat package and try again."
+	exit 1
+fi
+
+rm -rf kombu.egg-info/
+convert -verbose ./docs/images/kombu.jpg +profile "icc" ./docs/images/kombu.jpg 
+convert -verbose ./docs/images/kombusmall.jpg +profile "icc" ./docs/images/kombusmall.jpg
diff --git a/debian/repack.stub b/debian/repack.stub
new file mode 100644
index 0000000..26d6a9a
--- /dev/null
+++ b/debian/repack.stub
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+: <<=cut
+=pod
+
+=head1 NAME
+
+repack.stub - script to repack upstream tarballs from uscan
+
+=head1 INSTRUCTIONS
+
+put this in debian/repack.stub and add "debian sh debian/repack.stub" to
+the end of the line in debian/watch. you will also need to add a version
+mangle to debian/watch.
+
+then create a debian/repack.local. this is a shell script that is
+sourced under "set -e", so be careful to check returns codes.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item rm
+
+rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item mv
+
+mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item requires_version
+
+requires_version is there for future usage for requiring certain versions of the script
+
+=back
+
+=head1 VARIABLES
+
+=over 4
+
+=item SUFFIX
+
+defaults to +dfsg
+
+what to append to the upstream version
+
+=item RM_OPTS
+
+defaults to -vrf
+
+options to pass to rm
+
+=item MANIFEST
+
+defaults to 0, set to 1 to turn on.
+
+this will manipulate MANIFEST files in CPAN tarballs.
+
+=item UP_BASE
+
+this is the directory where the upstream source is.
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2009, Ryan Niebur <ryan at debian.org>
+
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=cut
+
+if [ -z "$REPACK_SH" ]; then
+    if [ -x /usr/share/pkg-perl-tools/repack.sh ]; then
+        REPACK_SH='/usr/share/pkg-perl-tools/repack.sh'
+    elif [ -f ../../scripts/repack.sh ]; then
+        REPACK_SH=../../scripts/repack.sh
+    fi
+    if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
+        REPACK_SH=$(which repack.sh)
+    fi
+fi
+
+if [ ! -f "$REPACK_SH" ]; then
+    echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
+    echo "You can get it from https://anonscm.debian.org/cgit/pkg-perl/packages/pkg-perl-tools.git/plain/scripts/repack.sh"
+    exit 1
+fi
+
+exec "$REPACK_SH" "$@"
diff --git a/debian/watch b/debian/watch
index 4b13622..d6bee62 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ \
-http://pypi.debian.net/kombu/kombu-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file
+opts=uversionmangle=s/(rc|a|b|c)/~$1/,dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg,pgpsigurlmangle=s/$/.asc/ \
+http://pypi.debian.net/kombu/kombu-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \
+debian sh debian/repack.stub

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



More information about the Python-modules-commits mailing list