[DebianBRTeam-commits] r626 - in /packages/jp2a/trunk/debian: README.source changelog compat control copyright patches/01-fix_man_page.patch patches/manpage.patch patches/series rules

eriberto-guest at users.alioth.debian.org eriberto-guest at users.alioth.debian.org
Thu May 2 17:10:08 UTC 2013 

Author: eriberto-guest
Date: Thu May  2 17:10:08 2013
New Revision: 626

URL: http://svn.debian.org/wsvn/?sc=1&rev=626
Log:
  * Migrations:
      - debian format from 1.0 to 3.0. (Closes: #664410)
      - debian/copyright to new format (1.0).
      - debian/rules: updated to new (reduced) format.
      - debhelper version from 7 to 9.
      - patch system from dpatch to quilt.
  * debian/control:
      - Added dpkg-dev in Build-Depends field.
      - Added ${misc:Depends} in Depends field.
      - Improved long description.
      - Updated Standards-Version from 3.8.3 to 3.9.4.
  * debian/README.source: removed because it is useless now.
  * debian/rules: added "LDFLAGS += -Wl,--as-needed" to avoid
    messages from dpkg-shlibdeps about ununsed linked libraries.

Added:
    packages/jp2a/trunk/debian/patches/manpage.patch
Removed:
    packages/jp2a/trunk/debian/README.source
    packages/jp2a/trunk/debian/patches/01-fix_man_page.patch
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/patches/series
    packages/jp2a/trunk/debian/rules

Modified: packages/jp2a/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/changelog?rev=626&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/changelog (original)
+++ packages/jp2a/trunk/debian/changelog Thu May  2 17:10:08 2013
@@ -1,21 +1,30 @@
 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.
+  * Acknowledge NMU. Thanks to Matthias Klose and Julien Cristau.
+    (Closes: #618208, #642983)
+  * Migrations:
+      - debian format from 1.0 to 3.0. (Closes: #664410)
+      - debian/copyright to new format (1.0).
+      - debian/rules: updated to new (reduced) format.
+      - debhelper version from 7 to 9.
+      - patch system from dpatch to quilt.
+  * debian/control:
+      - Added dpkg-dev in Build-Depends field.
+      - Added ${misc:Depends} in Depends field.
+      - Improved long description.
+      - Updated Standards-Version from 3.8.3 to 3.9.4.
+  * debian/README.source: removed because it is useless now.
+  * debian/rules: added "LDFLAGS += -Wl,--as-needed" to avoid
+    messages from dpkg-shlibdeps about ununsed linked libraries.
 
-  * 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)
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Thu, 02 May 2013 11:07:33 -0300
 
-  * debian/copyright:
-      - Removed text about licenses of the librariest precompiled
-        into win32 version.
-      - Updated the packaging date (included 2011).
+jp2a (1.0.6-3.2) unstable; urgency=low
 
- -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Mon, 28 Nov 2011 17:43:27 -0200
+  * Non-maintainer upload.
+  * Build-Depend on libjpeg-dev, not libjpeg62-dev (closes: #642983)
+
+ -- Julien Cristau <jcristau at debian.org>  Sun, 29 Jan 2012 18:14:41 +0100
 
 jp2a (1.0.6-3.1) unstable; urgency=low
 

Modified: packages/jp2a/trunk/debian/compat
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/compat?rev=626&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/compat (original)
+++ packages/jp2a/trunk/debian/compat Thu May  2 17:10:08 2013
@@ -1,1 +1,1 @@
-8
+9

Modified: packages/jp2a/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/control?rev=626&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/control (original)
+++ packages/jp2a/trunk/debian/control Thu May  2 17:10:08 2013
@@ -2,8 +2,9 @@
 Section: graphics
 Priority: optional
 Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-Build-Depends: debhelper (>= 8), autotools-dev, libjpeg-dev, libcurl4-gnutls-dev, libncurses5-dev, quilt
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), autotools-dev,
+               libjpeg-dev, libcurl4-gnutls-dev, libncurses5-dev
+Standards-Version: 3.9.4
 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
@@ -15,4 +16,7 @@
  Small utility that converts JPG images to ASCII using libjpeg.
  jp2a is very flexible. It can use ANSI colors and html in output.
  .
+ It can also download and convert images from Internet via command
+ line.
+ .
  Screenshot: http://www.eriberto.pro.br/debian/screenshots/jp2a.jpg

Modified: packages/jp2a/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/copyright?rev=626&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/copyright (original)
+++ packages/jp2a/trunk/debian/copyright Thu May  2 17:10:08 2013
@@ -1,30 +1,28 @@
-This package was debianized by Joao Eriberto Mota Filho
-<eriberto at eriberto.pro.br> on Fri, 16 Mar 2007 11:40:04 -0300.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jp2a
+Source: http://jp2a.sf.net
 
-It was downloaded from http://sourceforge.net/projects/jp2a
+Files: *
+Copyright: 2006 Christian Stigen Larsen <csl at sublevel3.org>
+License: GPL-2.0+
 
-Upstream Author: Christian Stigen Larsen <csl at sublevel3.org>
+Files: debian/*
+Copyright: 2007-2013 Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+License: GPL-2.0+
 
-Copyright: 2006, Christian Stigen Larsen
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   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/'.
-
-The Debian packaging is Copyright 2007-2011, Joao Eriberto Mota Filho
-<eriberto at eriberto.pro.br> and is licensed under the GPL2 or later.
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

Added: packages/jp2a/trunk/debian/patches/manpage.patch
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/patches/manpage.patch?rev=626&op=file
==============================================================================
--- packages/jp2a/trunk/debian/patches/manpage.patch (added)
+++ packages/jp2a/trunk/debian/patches/manpage.patch Thu May  2 17:10:08 2013
@@ -1,0 +1,65 @@
+Description: fix mistakes in upstream manpage.
+Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+Last-Update: 20130502
+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.

Modified: packages/jp2a/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/patches/series?rev=626&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/patches/series (original)
+++ packages/jp2a/trunk/debian/patches/series Thu May  2 17:10:08 2013
@@ -1,1 +1,1 @@
-01-fix_man_page.patch
+manpage.patch

Modified: packages/jp2a/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/jp2a/trunk/debian/rules?rev=626&op=diff
==============================================================================
--- packages/jp2a/trunk/debian/rules (original)
+++ packages/jp2a/trunk/debian/rules Thu May  2 17:10:08 2013
@@ -3,68 +3,14 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+# HARDENING in GCC (needed to use LDFLAGS below)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# Avoids warnings from dpkg-shlibdeps
+# (package could avoid an useless dependency...)
+LDFLAGS += -Wl,--as-needed
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man  CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp config.guess config.sub
-	if [ -e Makefile ]; then $(MAKE) distclean; fi
-	dh_clean
-
-install: build $(QUILT_STAMPFN)
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/jp2a install
-
-binary: binary-arch
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs debian/README.source
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-
-.PHONY: build clean binary-indep binary-arch binary install build-arch build-indep
+%:
+	dh $@ --parallel

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