[DebianBRTeam-commits] r609 - in /packages/jp2a/trunk/debian: README.source changelog compat control copyright patches/00list patches/01-fix_man_page.dpatch patches/01-fix_man_page.patch patches/series rules source/ source/format

eriberto-guest at users.alioth.debian.org eriberto-guest at users.alioth.debian.org
Thu Dec 1 17:43:30 UTC 2011 

Author: eriberto-guest
Date: Thu Dec  1 17:43:30 2011
New Revision: 609

URL: http://svn.debian.org/wsvn/?sc=1&rev=609
Log:
* Debian Revision -4.
* Added source/format file.
* Removed files from dpatch and added files in quilt format (patches).


Added:
    packages/jp2a/trunk/debian/patches/01-fix_man_page.patch
    packages/jp2a/trunk/debian/patches/series
    packages/jp2a/trunk/debian/source/
    packages/jp2a/trunk/debian/source/format
Removed:
    packages/jp2a/trunk/debian/patches/00list
    packages/jp2a/trunk/debian/patches/01-fix_man_page.dpatch
Modified:
    packages/jp2a/trunk/debian/README.source
    packages/jp2a/trunk/debian/changelog
    packages/jp2a/trunk/debian/compat
    packages/jp2a/trunk/debian/control
    packages/jp2a/trunk/debian/copyright
    packages/jp2a/trunk/debian/rules

Modified: packages/jp2a/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/README.source?rev=609&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/README.source (original)
+++ packages/jp2a/trunk/debian/README.source Thu Dec  1 17:43:30 2011
@@ -1,2 +1,3 @@
-This package uses dpatch to fix some errors.
-To know more about dpatch see /usr/share/doc/dpatch/README.source.gz file.
+This package uses quilt to fix some errors or to make the package compliant
+with some situations. To know more about quilt, see the documents at
+/usr/share/doc/quilt/ directory.

Modified: packages/jp2a/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/changelog?rev=609&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/changelog (original)
+++ packages/jp2a/trunk/debian/changelog Thu Dec  1 17:43:30 2011
@@ -1,3 +1,29 @@
+jp2a (1.0.6-4) unstable; urgency=low
+
+  * Acknowledge NMU. Thanks to Matthias Klose. (Closes: #618208)
+  * Changed debhelper compatibility to level 8.
+  * Changed source package format to 3.0 (quilt). A patch was converted.
+
+  * debian/control:
+      - Added ${misc:Depends} as dependency.
+      - Bumped Standards-Version to 3.9.2.
+      - Changed from libjpeg62-dev to libjpeg-dev in Build-Depends.
+        Thanks to Bill Allombert. (Closes: #642983)
+
+  * debian/copyright:
+      - Removed text about licenses of the librariest precompiled
+        into win32 version.
+      - Updated the packaging date (included 2011).
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Mon, 28 Nov 2011 17:43:27 -0200
+
+jp2a (1.0.6-3.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Build-depend on libcurl4-gnutls-dev. Closes: #618208. LP: #836803.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 29 Aug 2011 17:56:28 +0200
+
 jp2a (1.0.6-3) unstable; urgency=low
 
   * Added patch directory and patch 01 to fix man page.

Modified: packages/jp2a/trunk/debian/compat
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/compat?rev=609&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/compat (original)
+++ packages/jp2a/trunk/debian/compat Thu Dec  1 17:43:30 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/jp2a/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/control?rev=609&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/control (original)
+++ packages/jp2a/trunk/debian/control Thu Dec  1 17:43:30 2011
@@ -2,15 +2,15 @@
 Section: graphics
 Priority: optional
 Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-Build-Depends: debhelper (>= 7), autotools-dev, libjpeg62-dev, libcurl4-dev, libncurses5-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 8), autotools-dev, libjpeg-dev, libcurl4-gnutls-dev, libncurses5-dev, quilt
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/jp2a
 Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/jp2a
 Homepage: http://csl.sublevel3.org/jp2a
 
 Package: jp2a
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: converts jpg images to ascii
  Small utility that converts JPG images to ASCII using libjpeg.
  jp2a is very flexible. It can use ANSI colors and html in output.

Modified: packages/jp2a/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/copyright?rev=609&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/copyright (original)
+++ packages/jp2a/trunk/debian/copyright Thu Dec  1 17:43:30 2011
@@ -26,14 +26,5 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/'.
 
-jp2a uses some libraries and the source distribution does not include any
-source-code from these.  However, the win32 version comes with precompiled
-library files. Please see bellow where to find those licenses:
-
-   - JPEG library: /usr/share/doc/libjpeg62;
-   - libcurl: /usr/share/doc/libcurl4;
-   - zlib.dll (for win32 binary distribution): http://www.zlib.org;
-   - OpenSSL binaries (for win32 binary distribution): http://www.openssl.org.
-
-The Debian packaging is Copyright 2007-2009, Joao Eriberto Mota Filho
+The Debian packaging is Copyright 2007-2011, Joao Eriberto Mota Filho
 <eriberto at eriberto.pro.br> and is licensed under the GPL2 or later.

Added: packages/jp2a/trunk/debian/patches/01-fix_man_page.patch
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/patches/01-fix_man_page.patch?rev=609&op=file
==============================================================================
--- packages/jp2a/trunk/debian/patches/01-fix_man_page.patch (added)
+++ packages/jp2a/trunk/debian/patches/01-fix_man_page.patch Thu Dec  1 17:43:30 2011
@@ -1,0 +1,65 @@
+Description: Fix mistakes in upstream man page.
+Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+Last-Update: 2011-11-30
+diff -urNad jp2a-1.0.6~/man/jp2a.1 jp2a-1.0.6/man/jp2a.1
+--- jp2a-1.0.6~/man/jp2a.1	2006-09-04 08:49:46.000000000 -0300
++++ jp2a-1.0.6/man/jp2a.1	2009-08-25 21:00:55.000000000 -0300
+@@ -19,7 +19,7 @@
+ .TP
+ .B \-\-background=light \-\-background=dark
+ If you don't want to mess with \-\-invert all the time, just use these instead.
+-If you are using white characters on a black display, then use --background=dark,
++If you are using white characters on a black display, then use \-\-background=dark,
+ and vice versa.
+ .TP
+ .B \-b \-\-border
+@@ -27,7 +27,7 @@
+ .TP
+ .BI \-\-chars= ...
+ Use the given characters when producing the output ASCII image.  Default is "   ...',;:clodxkO0KXNWM".
+-.Tp
++.TP
+ .BI \-\-colors
+ Use ANSI color for text output and CSS color for HTML output.
+ .TP
+@@ -50,11 +50,11 @@
+ When used with \-\-html and \-\-color, then color each output character's background color.  For instance,
+ if you want to use fill-output on a light background, do
+ 
+-jp2a --color --html --html-fill --background=light somefile.jpg --output=dark.html
++jp2a \-\-color \-\-html \-\-html-fill \-\-background=light somefile.jpg \-\-output=dark.html
+ 
+ To do the same on a light background:
+ 
+-jp2a --color --html --html-fill --background=dark somefile.jpg --output=light.html
++jp2a \-\-color \-\-html \-\-html-fill \-\-background=dark somefile.jpg \-\-output=light.html
+ 
+ The default is to have fill disabled.
+ .TP
+@@ -65,7 +65,7 @@
+ Flip output image vertically
+ .TP
+ .BI \-\-height= N
+-Set output height.  If only --height is specified, then output width will
++Set output height.  If only \-\-height is specified, then output width will
+ be calculated according to the source images aspect ratio.
+ .TP
+ .B \-h \-\-help
+@@ -142,7 +142,7 @@
+ Output picture.jpg and picture2.jpg, each 80x25 characters, using the characters " ...ooxx@@" for output:
+ .PP
+ .B jp2a
+-\-\-size=80x25 --chars=" ...ooxx@@" picture.jpg picture2.jpg
++\-\-size=80x25 \-\-chars=" ...ooxx@@" picture.jpg picture2.jpg
+ .PP
+ Output image.jpg using 76 columns, height is automatically calculated from aspect ratio of image.jpg
+ .PP
+@@ -188,7 +188,7 @@
+ You can extract the red channel by doing this:
+ 
+ .B jp2a
+-somefile.jpg --red=1.0 --green=0.0 --blue=0.0
++somefile.jpg \-\-red=1.0 \-\-green=0.0 \-\-blue=0.0
+ 
+ This will calculate luminance based on Y = R*1.0 + G*0.0 + B*0.0.  The default
+ values is to use Y = R*0.2989 + G*0.5866 + B*0.1145.

Added: packages/jp2a/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/patches/series?rev=609&op=file
==============================================================================
--- packages/jp2a/trunk/debian/patches/series (added)
+++ packages/jp2a/trunk/debian/patches/series Thu Dec  1 17:43:30 2011
@@ -1,0 +1,1 @@
+01-fix_man_page.patch

Modified: packages/jp2a/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/rules?rev=609&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/rules (original)
+++ packages/jp2a/trunk/debian/rules Thu Dec  1 17:43:30 2011
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -42,7 +42,7 @@
 	if [ -e Makefile ]; then $(MAKE) distclean; fi
 	dh_clean
 
-install: build patch-stamp
+install: build $(QUILT_STAMPFN)
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -67,4 +67,4 @@
 
 binary-indep:
 
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install build-arch build-indep

Added: packages/jp2a/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/source/format?rev=609&op=file
==============================================================================
--- packages/jp2a/trunk/debian/source/format (added)
+++ packages/jp2a/trunk/debian/source/format Thu Dec  1 17:43:30 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the debian-br-team-commits mailing list