[DebianBRTeam-commits] r574 - in /packages/jp2a/trunk/debian: README.source changelog compat control copyright docs patches/ patches/00list patches/01-fix_man_page.dpatch rules
eriberto-guest at users.alioth.debian.org
eriberto-guest at users.alioth.debian.org
Wed Aug 26 01:27:19 UTC 2009
Author: eriberto-guest
Date: Wed Aug 26 01:27:19 2009
New Revision: 574
URL: http://svn.debian.org/wsvn/?sc=1&rev=574
Log:
* debian/:
- Added patch directory and patch 01 to fix man page.
- Added README.source to describe dpatch use.
* debian/compat:
- Updated version from 5 to 7.
* debian/control:
- Added dpatch to Build-Depends field.
- Added libncurses5-dev to Build-Depends field to avoid a warning from
configure script.
- Updated debhelper version from 5 to 7 in Build-Depends field.
- Updated Standards-Version from 3.7.2 to 3.8.3.
- Updated Vcs-Svn and Vcs-Browser from debian-br-team/unstable/jp2a to
debian-br-team/packages/jp2a.
* debian/copyright:
- Changed, in packaging copyright information, from the expression "(C)"
to word "Copyright".
- Updated path of the local GPL text.
- Updated packaging copyright from 2007 to 2007-2009.
* debian/docs:
- Removed. The README file tells about program compilation. The
man/jp2a.html file has the same content of the man page.
* debian/rules:
- Added binary-indep target.
- Added preparation to use dpatch.
- Added /debian/README.source reference to dh_installdocs.
- Changed from "dh_clean -k" to "dh_prep" in install target.
- Removed binary-indep target.
- Removed comments about binary-indep and binary-arch.
- Removed build redundancy from binary-arch target.
- Removed binary-indep from binary target.
- Removed unused dh_installman from binary-arch target.
- Removed some whitespaces at end of lines.
Added:
packages/jp2a/trunk/debian/README.source
packages/jp2a/trunk/debian/patches/
packages/jp2a/trunk/debian/patches/00list
packages/jp2a/trunk/debian/patches/01-fix_man_page.dpatch (with props)
Removed:
packages/jp2a/trunk/debian/docs
Modified:
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
Added: packages/jp2a/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/README.source?rev=574&op=file
==============================================================================
--- packages/jp2a/trunk/debian/README.source (added)
+++ packages/jp2a/trunk/debian/README.source Wed Aug 26 01:27:19 2009
@@ -1,0 +1,2 @@
+This package uses dpatch to fix some errors.
+To know more about dpatch see /usr/share/doc/dpatch/README.source.gz file.
Modified: packages/jp2a/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/changelog?rev=574&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/changelog (original)
+++ packages/jp2a/trunk/debian/changelog Wed Aug 26 01:27:19 2009
@@ -1,3 +1,45 @@
+jp2a (1.0.6-3) unstable; urgency=low
+
+ * debian/:
+ - Added patch directory and patch 01 to fix man page.
+ - Added README.source to describe dpatch use.
+
+ * debian/compat:
+ - Updated version from 5 to 7.
+
+ * debian/control:
+ - Added dpatch to Build-Depends field.
+ - Added libncurses5-dev to Build-Depends field to avoid a warning from
+ configure script.
+ - Updated debhelper version from 5 to 7 in Build-Depends field.
+ - Updated Standards-Version from 3.7.2 to 3.8.3.
+ - Updated Vcs-Svn and Vcs-Browser from debian-br-team/unstable/jp2a to
+ debian-br-team/packages/jp2a.
+
+ * debian/copyright:
+ - Changed, in packaging copyright information, from the expression "(C)"
+ to word "Copyright".
+ - Updated path of the local GPL text.
+ - Updated packaging copyright from 2007 to 2007-2009.
+
+ * debian/docs:
+ - Removed. The README file tells about program compilation. The
+ man/jp2a.html file has the same content of the man page.
+
+ * debian/rules:
+ - Added binary-indep target.
+ - Added preparation to use dpatch.
+ - Added /debian/README.source reference to dh_installdocs.
+ - Changed from "dh_clean -k" to "dh_prep" in install target.
+ - Removed binary-indep target.
+ - Removed comments about binary-indep and binary-arch.
+ - Removed build redundancy from binary-arch target.
+ - Removed binary-indep from binary target.
+ - Removed unused dh_installman from binary-arch target.
+ - Removed some whitespaces at end of lines.
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br> Tue, 25 Aug 2009 13:07:46 -0300
+
jp2a (1.0.6-2) unstable; urgency=low
* Fixed debian/rules to don't ignore make clean errors.
Modified: packages/jp2a/trunk/debian/compat
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/compat?rev=574&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/compat (original)
+++ packages/jp2a/trunk/debian/compat Wed Aug 26 01:27:19 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/jp2a/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/control?rev=574&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/control (original)
+++ packages/jp2a/trunk/debian/control Wed Aug 26 01:27:19 2009
@@ -2,10 +2,10 @@
Section: graphics
Priority: optional
Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-Build-Depends: debhelper (>= 5), autotools-dev, libjpeg62-dev, libcurl4-dev
-Standards-Version: 3.7.2
-Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/unstable/jp2a
-Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/unstable/jp2a
+Build-Depends: debhelper (>= 7), autotools-dev, libjpeg62-dev, libcurl4-dev, libncurses5-dev, dpatch
+Standards-Version: 3.8.3
+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
Modified: packages/jp2a/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/copyright?rev=574&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/copyright (original)
+++ packages/jp2a/trunk/debian/copyright Wed Aug 26 01:27:19 2009
@@ -24,7 +24,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+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
@@ -35,5 +35,5 @@
- zlib.dll (for win32 binary distribution): http://www.zlib.org;
- OpenSSL binaries (for win32 binary distribution): http://www.openssl.org.
-The Debian packaging is (C) 2007, Joao Eriberto Mota Filho
+The Debian packaging is Copyright 2007-2009, Joao Eriberto Mota Filho
<eriberto at eriberto.pro.br> and is licensed under the GPL2 or later.
Added: packages/jp2a/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/patches/00list?rev=574&op=file
==============================================================================
--- packages/jp2a/trunk/debian/patches/00list (added)
+++ packages/jp2a/trunk/debian/patches/00list Wed Aug 26 01:27:19 2009
@@ -1,0 +1,1 @@
+01-fix_man_page.dpatch
Added: packages/jp2a/trunk/debian/patches/01-fix_man_page.dpatch
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/patches/01-fix_man_page.dpatch?rev=574&op=file
==============================================================================
--- packages/jp2a/trunk/debian/patches/01-fix_man_page.dpatch (added)
+++ packages/jp2a/trunk/debian/patches/01-fix_man_page.dpatch Wed Aug 26 01:27:19 2009
@@ -1,0 +1,69 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-fix_man_page.dpatch by Joao Eriberto Mota Filho (eriberto) <eriberto at eriberto.pro.br>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix mistakes in upstream man page.
+
+ at DPATCH@
+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.
Propchange: packages/jp2a/trunk/debian/patches/01-fix_man_page.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/jp2a/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/rules?rev=574&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/rules (original)
+++ packages/jp2a/trunk/debian/rules Wed Aug 26 01:27:19 2009
@@ -2,6 +2,8 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -28,35 +30,30 @@
build: build-stamp
-build-stamp: config.status
+build-stamp: config.status
dh_testdir
$(MAKE)
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp config.guess config.sub
if [ -e Makefile ]; then $(MAKE) distclean; fi
- dh_clean
+ dh_clean
-install: build
+install: build patch-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/jp2a install
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installman
+ dh_installdocs debian/README.source
dh_strip
dh_compress
dh_fixperms
@@ -66,5 +63,5 @@
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
More information about the debian-br-team-commits
mailing list