[Python-modules-commits] r28025 - in packages/stepic/trunk/debian (10 files)

Thu Mar 6 04:30:53 UTC 2014

Date: Thursday, March 6, 2014 @ 04:30:52
  Author: kitterman
Revision: 28025

* Cherrypick from upstream bzr (rev 39) to check for allow image types and
  reject jpeg (Closes: #649053)
* Fixed version in setup.py (Closes: #588049)
* Changed /usr/bin/env python to /usr/bin/python
* Add quilt to build-depends, build with quilt in debian/rules for above
  changes, and add README.source
* Expanded long description to mention support formats
* Bumped standards version to 3.9.5 without further change

Added:
  packages/stepic/trunk/debian/README.source
  packages/stepic/trunk/debian/patches/
  packages/stepic/trunk/debian/patches/fix-shebang
  packages/stepic/trunk/debian/patches/fix-version
  packages/stepic/trunk/debian/patches/no-jpeg
  packages/stepic/trunk/debian/patches/series
Modified:
  packages/stepic/trunk/debian/changelog
  packages/stepic/trunk/debian/control
  packages/stepic/trunk/debian/copyright
  packages/stepic/trunk/debian/rules

Added: packages/stepic/trunk/debian/README.source
===================================================================

--- packages/stepic/trunk/debian/README.source	                        (rev 0)
+++ packages/stepic/trunk/debian/README.source	2014-03-06 04:30:52 UTC (rev 28025)
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/stepic/trunk/debian/changelog
===================================================================
--- packages/stepic/trunk/debian/changelog	2014-03-06 04:27:41 UTC (rev 28024)
+++ packages/stepic/trunk/debian/changelog	2014-03-06 04:30:52 UTC (rev 28025)
@@ -1,9 +1,20 @@
-stepic (0.3-5) UNRELEASED; urgency=low
+stepic (0.3-5) unstable; urgency=medium
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:04:04 +0200
+  [ Scott Kitterman ]
+  * Cherrypick from upstream bzr (rev 39) to check for allow image types and
+    reject jpeg (Closes: #649053)
+  * Fixed version in setup.py (Closes: #588049)
+  * Changed /usr/bin/env python to /usr/bin/python
+  * Add quilt to build-depends, build with quilt in debian/rules for above
+    changes, and add README.source
+  * Expanded long description to mention support formats
+  * Bumped standards version to 3.9.5 without further change
 
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 05 Mar 2014 22:30:55 -0500
+
 stepic (0.3-4) unstable; urgency=low
 
   * Rebuild for python transition

Modified: packages/stepic/trunk/debian/control
===================================================================
--- packages/stepic/trunk/debian/control	2014-03-06 04:27:41 UTC (rev 28024)
+++ packages/stepic/trunk/debian/control	2014-03-06 04:30:52 UTC (rev 28025)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.5-2~)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.5-2~), quilt
+Standards-Version: 3.9.5
 Homepage: http://domnit.org/stepic/doc/
 X-Python-Version: >= 2.4
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/stepic/trunk/
@@ -16,4 +16,5 @@
 Description: Python Steganography in Images
  A Python module and command line tool for hiding arbitrary data within images
  by slightly modifying the colors. These modifications are generally
- imperceptible to humans, but are machine detectable.
+ imperceptible to humans, but are machine detectable.  Works with RGB, RGBA,
+ or CMYK images.

Modified: packages/stepic/trunk/debian/copyright
===================================================================
--- packages/stepic/trunk/debian/copyright	2014-03-06 04:27:41 UTC (rev 28024)
+++ packages/stepic/trunk/debian/copyright	2014-03-06 04:30:52 UTC (rev 28025)
@@ -18,6 +18,6 @@
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-The Debian packaging is Â© 2008-2011, Scott Kitterman <scott at kitterman.com>
+The Debian packaging is Â© 2008-2014, Scott Kitterman <scott at kitterman.com>
 and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 

Added: packages/stepic/trunk/debian/patches/fix-shebang
===================================================================
--- packages/stepic/trunk/debian/patches/fix-shebang	                        (rev 0)
+++ packages/stepic/trunk/debian/patches/fix-shebang	2014-03-06 04:30:52 UTC (rev 28025)
@@ -0,0 +1,20 @@
+Index: stepic-0.3/setup.py
+===================================================================
+--- stepic-0.3.orig/setup.py	2007-11-08 02:15:59.000000000 -0500
++++ stepic-0.3/setup.py	2014-03-05 22:38:13.652583579 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ from distutils.core import setup
+ import os
+Index: stepic-0.3/stepic
+===================================================================
+--- stepic-0.3.orig/stepic	2007-11-11 21:37:59.000000000 -0500
++++ stepic-0.3/stepic	2014-03-05 22:38:27.492583216 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # stepic - Python image steganography
+ # Copyright (C) 2007 Lenny Domnitser

Added: packages/stepic/trunk/debian/patches/fix-version
===================================================================
--- packages/stepic/trunk/debian/patches/fix-version	                        (rev 0)
+++ packages/stepic/trunk/debian/patches/fix-version	2014-03-06 04:30:52 UTC (rev 28025)
@@ -0,0 +1,13 @@
+Index: stepic-0.3/setup.py
+===================================================================
+--- stepic-0.3.orig/setup.py	2014-03-05 22:38:13.652583579 -0500
++++ stepic-0.3/setup.py	2014-03-05 22:54:52.680557392 -0500
+@@ -3,7 +3,7 @@
+ from distutils.core import setup
+ import os
+ 
+-if os.environ.get('RELEASE') == '1':
++if True:
+     import stepic
+     version = stepic.__version__
+ else:

Added: packages/stepic/trunk/debian/patches/no-jpeg
===================================================================
--- packages/stepic/trunk/debian/patches/no-jpeg	                        (rev 0)
+++ packages/stepic/trunk/debian/patches/no-jpeg	2014-03-06 04:30:52 UTC (rev 28025)
@@ -0,0 +1,38 @@
+Upstream bzr rev 39
+Index: stepic-0.3/stepic.py
+===================================================================
+--- stepic-0.3.orig/stepic.py	2007-11-10 17:08:14.000000000 -0500
++++ stepic-0.3/stepic.py	2014-03-05 22:51:35.968562548 -0500
+@@ -40,6 +40,14 @@
+            'Steganographer')
+ 
+ 
++def _validate_image(image):
++    if image.mode not in ('RGB', 'RGBA', 'CMYK'):
++        raise ValueError('Unsupported pixel format: '
++                         'image must be RGB, RGBA, or CMYK')
++    if image.format == 'JPEG':
++        raise ValueError('JPEG format incompatible with steganography')
++
++
+ def encode_imdata(imdata, data):
+     '''given a sequence of pixels, returns an iterator of pixels with
+     encoded data'''
+@@ -70,6 +78,8 @@
+ def encode_inplace(image, data):
+     '''hides data in an image'''
+ 
++    _validate_image(image)
++
+     w = image.size[0]
+     (x, y) = (0, 0)
+     for pixel in encode_imdata(image.getdata(), data):
+@@ -110,6 +120,8 @@
+ def decode(image):
+     '''extracts data from an image'''
+ 
++    _validate_image(image)
++
+     return ''.join(decode_imdata(image.getdata()))
+ 
+ 

Added: packages/stepic/trunk/debian/patches/series
===================================================================
--- packages/stepic/trunk/debian/patches/series	                        (rev 0)
+++ packages/stepic/trunk/debian/patches/series	2014-03-06 04:30:52 UTC (rev 28025)
@@ -0,0 +1,3 @@
+fix-shebang
+fix-version
+no-jpeg

Modified: packages/stepic/trunk/debian/rules
===================================================================
--- packages/stepic/trunk/debian/rules	2014-03-06 04:27:41 UTC (rev 28024)
+++ packages/stepic/trunk/debian/rules	2014-03-06 04:30:52 UTC (rev 28025)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,quilt
 
 override_dh_installchangelogs:
 	rm -rf $(CURDIR)/debian/python-stepic/usr/share/doc/stepic


