diff -Nru mp3wrap-0.5/debian/changelog mp3wrap-0.5/debian/changelog --- mp3wrap-0.5/debian/changelog 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/changelog 2016-04-17 19:01:23.000000000 +0000 @@ -1,3 +1,35 @@ +mp3wrap (0.5-4) unstable; urgency=medium + + * New maintainer. Thanks Emanuele, Nico, Michael + and Paul. (Closes: #457131). + * Created the directory debian/source and format file. + * Created the files mp3wrap.doc-base.* to register doc/*.html + in doc-base. + * Removed the debian/dirs because is unnecessary. + * Updated DH level to 9. + * Updated the file debian/docs to remove the files AUTHORS and README. + * debian/control: + - Added ${misc:Depends} in Depends field. + - Added Vcs-Browser and Vcs-Git. + - Bumped Standards-Version to 3.9.7. + * debian/copyright: + - Migrated to 1.0 format. + - Rolled back license to LGPL-2+. + - Updated file. + * debian/patches: + - Created the patch avoid_direct_changes.patch. + - Created the patch fix_manpage.patch. + - Created the patch fix_spelling.patch. + * debian/rules: + - Enabled hardening options. + - Updated to use autoreconf. + - Updated to small format. + * debian/watch: + - Updated to version 4. + - Updated file. + + -- Marcio de Souza Oliveira Mon, 11 Apr 2016 00:17:41 +0000 + mp3wrap (0.5-3) unstable; urgency=low * QA upload. diff -Nru mp3wrap-0.5/debian/compat mp3wrap-0.5/debian/compat --- mp3wrap-0.5/debian/compat 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/compat 2016-04-11 01:15:54.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru mp3wrap-0.5/debian/control mp3wrap-0.5/debian/control --- mp3wrap-0.5/debian/control 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/control 2016-04-14 23:14:57.000000000 +0000 @@ -1,15 +1,16 @@ Source: mp3wrap Section: sound Priority: optional -Maintainer: Debian QA Group -Build-Depends: debhelper (>= 5.0.0) -Standards-Version: 3.8.0 +Maintainer: Marcio de Souza Oliveira +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.7 Homepage: http://mp3wrap.sourceforge.net/ - +Vcs-Git: https://github.com/marciosouza20/mp3wrap.git +Vcs-Browser: https://github.com/marciosouza20/mp3wrap.git Package: mp3wrap Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends},${misc:Depends} Recommends: mp3splt Description: Utility for MP3 wrapping (rolling multiple MP3s into one) Command-line utility that wraps multiple MP3 files into a single, playable diff -Nru mp3wrap-0.5/debian/copyright mp3wrap-0.5/debian/copyright --- mp3wrap-0.5/debian/copyright 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/copyright 2016-04-15 02:28:25.000000000 +0000 @@ -1,27 +1,34 @@ -This package was debianized by Paul Melnikow on -Mon, 13 Sep 2004 12:47:52 -0400. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mp3wrap +Upstream-Contact: Matteo Trotta +Source: http://mp3wrap.sourceforge.net/ + +Files: * +Copyright: 2002 Matteo Trotta +License: LGPL-2+ + +Files: debian/* +Copyright: 2004 Paul Melnikow + 2006 Michael Ablassmeier + 2008 Emanuele Rocca + 2008 Nico Golde + 2016 Marcio de Souza Oliveira +License: LGPL-2+ + +License: LGPL-2+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2" -It was downloaded from http://mp3wrap.sourceforge.net/ - -Upstream Author: 2002 M. Trotta - - -Copyright (c) 2002 M. Trotta - - -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; version 2 dated June, 1991. - - 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 GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. diff -Nru mp3wrap-0.5/debian/dirs mp3wrap-0.5/debian/dirs --- mp3wrap-0.5/debian/dirs 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/bin diff -Nru mp3wrap-0.5/debian/docs mp3wrap-0.5/debian/docs --- mp3wrap-0.5/debian/docs 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/docs 2016-04-15 02:14:22.000000000 +0000 @@ -1,4 +1,2 @@ -README -AUTHORS doc/man.html doc/faq.html diff -Nru mp3wrap-0.5/debian/mp3wrap.doc-base.faq mp3wrap-0.5/debian/mp3wrap.doc-base.faq --- mp3wrap-0.5/debian/mp3wrap.doc-base.faq 1970-01-01 00:00:00.000000000 +0000 +++ mp3wrap-0.5/debian/mp3wrap.doc-base.faq 2016-04-15 01:37:25.000000000 +0000 @@ -0,0 +1,10 @@ +Document: mp3wrap-faq +Title: Mp3wrap Frequently Asked Questions (FAQ) +Author: M. Trotta. +Abstract: This documents provides answers to frequently asked questions + about the mp3wrap. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mp3wrap/faq.html +Files: /usr/share/doc/mp3wrap/faq.html diff -Nru mp3wrap-0.5/debian/mp3wrap.doc-base.manual mp3wrap-0.5/debian/mp3wrap.doc-base.manual --- mp3wrap-0.5/debian/mp3wrap.doc-base.manual 1970-01-01 00:00:00.000000000 +0000 +++ mp3wrap-0.5/debian/mp3wrap.doc-base.manual 2016-04-15 01:37:12.000000000 +0000 @@ -0,0 +1,9 @@ +Document: mp3wrap +Title: Mp3wrap User Manual +Author: M. Trotta. +Abstract: This manual describes the usage of the mp3wrap. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mp3wrap/man.html +Files: /usr/share/doc/mp3wrap/man.html diff -Nru mp3wrap-0.5/debian/patches/avoid_direct_changes.patch mp3wrap-0.5/debian/patches/avoid_direct_changes.patch --- mp3wrap-0.5/debian/patches/avoid_direct_changes.patch 1970-01-01 00:00:00.000000000 +0000 +++ mp3wrap-0.5/debian/patches/avoid_direct_changes.patch 2016-04-11 01:05:00.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fixes problems with arguments +Author: T. A. McLeay +Last-Update: 2006-08-28 + +Index: mp3wrap-0.5/mp3wrap.c +=================================================================== +--- mp3wrap-0.5.orig/mp3wrap.c ++++ mp3wrap-0.5/mp3wrap.c +@@ -70,8 +70,8 @@ int main (int argc, char *argv[]) { + FILE *file_output, *file_input; + unsigned long splitpoints[MAXNUMFILE+1], begin=0, end, len=0, crc, fcrc; + unsigned char filename[512], *wrapindex, c, ext[512]; +- char option, *ptr; +- int i = 0, j = 0, files, oldfiles = 0, indexsize=0, id3offset=0; ++ char *ptr; ++ int option, i = 0, j = 0, files, oldfiles = 0, indexsize=0, id3offset=0; + short optoffset = 0, addoption = 0, listoption = 0, verboption = 0, ismp3wrap = 0; + + printf (NAME" Version "VERSION" "DATE". See README and COPYING for more!\n"); diff -Nru mp3wrap-0.5/debian/patches/fix_manpage.patch mp3wrap-0.5/debian/patches/fix_manpage.patch --- mp3wrap-0.5/debian/patches/fix_manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ mp3wrap-0.5/debian/patches/fix_manpage.patch 2016-04-15 02:11:43.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Removes macro not defined. +Author: Marcio de Souza Oliveira +Last-Update: 2016-04-14 + +Index: mp3wrap-0.5/mp3wrap.1 +=================================================================== +--- mp3wrap-0.5.orig/mp3wrap.1 ++++ mp3wrap-0.5/mp3wrap.1 +@@ -1,10 +1,10 @@ + .\" This -*- nroff -*- file has been generated from + .\" DocBook SGML with docbook-to-man on Debian GNU/Linux. +-...\" +-...\" transcript compatibility for postscript use. +-...\" +-...\" synopsis: .P! +-...\" ++.\" ++.\" transcript compatibility for postscript use. ++.\" ++.\" synopsis: .P! ++.\" + .de P! + \\&. + .fl \" force out current output buffer +@@ -164,4 +164,4 @@ Matteo Trotta +Last-Update: 2016-04-14 + +Index: mp3wrap-0.5/mp3wrap.c +=================================================================== +--- mp3wrap-0.5.orig/mp3wrap.c ++++ mp3wrap-0.5/mp3wrap.c +@@ -107,7 +107,7 @@ int main (int argc, char *argv[]) { + printf ("\tmp3wrap [options] OUTPUTFILE MP3FILE1 MP3FILE2 [MP3FILE3]...\n"); + printf ("\nDESCRIPTION\n"); + printf ("\tMp3Wrap joins two or more mp3 files in one large playable mp3\n"); +- printf ("\twithout losing filename and ID3 informations. You will obtain\n"); ++ printf ("\twithout losing filename and ID3 information. You will obtain\n"); + printf ("\ta file named OUTPUTFILE_MP3WRAP.mp3. Do not remove the MP3WRAP\n"); + printf ("\tstring because it's useful to let split program to detect that\n"); + printf ("\tfile is wrapped with this utility.\n"); +@@ -115,7 +115,7 @@ int main (int argc, char *argv[]) { + printf ("\nOPTIONS\n"); + printf ("\t-a Add the specified files to an existing wrap file\n"); + printf ("\t-l List files wrapped in OUTPUTFILE. (-lv for complete infos)\n"); +- printf ("\t-v Verbose mode. Will display additional informations.\n"); ++ printf ("\t-v Verbose mode. Will display additional information.\n"); + printf ("\nEXAMPLES\n"); + printf ("\tmp3wrap album.mp3 01.mp3 02.mp3 03.mp3 04.mp3\n"); + printf ("\tmp3wrap -a album_MP3WRAP.mp3 ACDC*.mp3\n"); +Index: mp3wrap-0.5/mp3wrap.1 +=================================================================== +--- mp3wrap-0.5.orig/mp3wrap.1 ++++ mp3wrap-0.5/mp3wrap.1 +@@ -65,7 +65,7 @@ mp3wrap \(em Utility for mp3 wrapping + .PP + \fBMp3Wrap\fP is a free command-line utility, + which wraps two or more mp3 files in one large playable file, +-without losing filename and ID3 informations. It's useful to make ++without losing filename and ID3 information. It's useful to make + large files easy to download on internet and then easy to split again + in few seconds. You can split original files + using \fBmp3splt\fP: http://mp3splt.sourceforge.net +@@ -73,14 +73,14 @@ using \fBmp3splt\fP: http://mp3splt.sour + Mp3Wrap will create a file named: OUTPUTFILE_MP3WRAP.mp3. + It's important you don't remove the MP3WRAP string, because + this will tell the split program Mp3Splt that the file is wrapped +-and can be splitted just with -w option. ++and can be split just with -w option. + There is also the possibility to specify a custom extension to created file (such as + "OUTPUTFILE - MP3WRAP - wrapped by me.mp3"). This can be done + using config file (see below), just adding the line "EXT=my ext.mp3" into it. + Note that your custom extension must contain MP3WRAP string anywhere, + otherwise program will add it by itself. + .sp +-Mp3Wrap will also add to the file a ID3v2 containing informations ++Mp3Wrap will also add to the file a ID3v2 containing information + on how to split the file; you can change Title and Album tags but + PLEASE DO NOT REMOVE THE COMMENT. + .SH "OPTIONS" +@@ -89,7 +89,7 @@ Add specified files to an existing Mp3Wr + .IP "\fB-l\fP " 10 + List all files wrapped into a Mp3Wrap file. Doesn't extract anything + .IP "\fB-v\fP " 10 +-Verbose mode. Mp3Wrap will display additional informations on process and, when using list option ++Verbose mode. Mp3Wrap will display additional information on process and, when using list option + (-l) it will show many extra infos on wrapped files. + + .SH "CONFIGURATION FILE" diff -Nru mp3wrap-0.5/debian/patches/series mp3wrap-0.5/debian/patches/series --- mp3wrap-0.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ mp3wrap-0.5/debian/patches/series 2016-04-15 00:13:39.000000000 +0000 @@ -0,0 +1,3 @@ +fix_spelling.patch +avoid_direct_changes.patch +fix_manpage.patch diff -Nru mp3wrap-0.5/debian/rules mp3wrap-0.5/debian/rules --- mp3wrap-0.5/debian/rules 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/rules 2016-04-15 02:31:29.000000000 +0000 @@ -1,99 +1,7 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +#export DH_VERBOSE = 1 -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# 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) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info - - -build: build-stamp - -build-stamp: config.status - 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 - - # Add here commands to compile the package. - $(MAKE) - #/usr/bin/docbook-to-man debian/mp3wrap.sgml > mp3wrap.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - - # the package ships with config.status -- this causes configure not to run - # and breaks the build - rm -f config.status - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/mp3wrap. - $(MAKE) install DESTDIR=$(CURDIR)/debian/mp3wrap - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --parallel --with-autoreconf diff -Nru mp3wrap-0.5/debian/source/format mp3wrap-0.5/debian/source/format --- mp3wrap-0.5/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ mp3wrap-0.5/debian/source/format 2016-04-11 00:22:17.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru mp3wrap-0.5/debian/watch mp3wrap-0.5/debian/watch --- mp3wrap-0.5/debian/watch 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/debian/watch 2016-04-17 19:47:45.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -http://sf.net/mp3wrap/mp3wrap-(.*)-src\.tar\.gz +version=4 +http://sf.net/mp3wrap/mp3wrap-(.*)-src\.(?:tgz|tar\.(?:gz|bz2|xz)) diff -Nru mp3wrap-0.5/mp3wrap.c mp3wrap-0.5/mp3wrap.c --- mp3wrap-0.5/mp3wrap.c 2016-04-27 12:10:11.000000000 +0000 +++ mp3wrap-0.5/mp3wrap.c 2003-01-17 09:15:52.000000000 +0000 @@ -70,8 +70,8 @@ FILE *file_output, *file_input; unsigned long splitpoints[MAXNUMFILE+1], begin=0, end, len=0, crc, fcrc; unsigned char filename[512], *wrapindex, c, ext[512]; - char *ptr; - int option, i = 0, j = 0, files, oldfiles = 0, indexsize=0, id3offset=0; + char option, *ptr; + int i = 0, j = 0, files, oldfiles = 0, indexsize=0, id3offset=0; short optoffset = 0, addoption = 0, listoption = 0, verboption = 0, ismp3wrap = 0; printf (NAME" Version "VERSION" "DATE". See README and COPYING for more!\n");