--- nrg2iso-0.4.orig/debian/compat +++ nrg2iso-0.4/debian/compat @@ -0,0 +1 @@ +7 --- nrg2iso-0.4.orig/debian/dirs +++ nrg2iso-0.4/debian/dirs @@ -0,0 +1 @@ +usr/bin --- nrg2iso-0.4.orig/debian/control +++ nrg2iso-0.4/debian/control @@ -0,0 +1,20 @@ +Source: nrg2iso +Section: otherosfs +Priority: optional +Maintainer: Xavier Lüthi +Build-Depends: debhelper (>= 7), quilt +Standards-Version: 3.8.1 +Homepage: http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html +Vcs-Browser: http://git.debian.org/?p=collab-maint/nrg2iso.git +Vcs-Git: git://git.debian.org/git/collab-maint/nrg2iso.git + +Package: nrg2iso +Architecture: any +Depends: ${shlibs:Depends} +Description: Extracts ISO9660 data from Nero ".nrg" files + nrg2iso is a very simple command line tool to extract the ISO9660 CD image + data from Nero ".nrg" files. + . + nrg2iso is very simple to use and even displays a progress bar to give the + status of the conversion! + --- nrg2iso-0.4.orig/debian/changelog +++ nrg2iso-0.4/debian/changelog @@ -0,0 +1,49 @@ +nrg2iso (0.4-4) unstable; urgency=low + + * Update maintainer address to the debian.org one. + * Small package fixes to make lintian happy: + + debian/patches/*: added description for all quilt patches + + debian/watch file added + + debian/control: enhanced long description + * debian/control: bump Standard-Version to 3.8.1. + * debian/README.source: file added. + + -- Xavier Lüthi Tue, 21 Apr 2009 15:55:41 +0200 + +nrg2iso (0.4-3) unstable; urgency=low + + * debian/control: remove unnecessary dependency on quilt + (Closes: #475753). + + -- Xavier Luthi Wed, 16 Apr 2008 11:19:19 +0200 + +nrg2iso (0.4-2) unstable; urgency=low + + * New maintainer (Closes: #465878). + * convert package to a non-native one (Closes: #270753). + * nrg2iso.c: handle correctly read/write failures (Closes: #352823). + * Acknowledge NMU, thanks to Baruch (Closes: #278688) + * Use quilt for patches. + + -- Xavier Luthi Tue, 08 Apr 2008 11:54:46 +0200 + +nrg2iso (0.4-1.1) unstable; urgency=low + + * NMU + * Fix reporting of large files, the progress bar now shows correct + percentages. (closes: #278688) + + -- Baruch Even Wed, 10 Aug 2005 12:32:33 +0100 + +nrg2iso (0.4-1) unstable; urgency=low + + * Correctly handle files > 4GB in size. (closes: #266761) + + -- Misha Nasledov Wed, 8 Sep 2004 15:41:40 -0800 + +nrg2iso (0.2-1) unstable; urgency=low + + * Initial Release. + + -- Misha Nasledov Mon, 31 May 2004 03:49:27 -0700 + --- nrg2iso-0.4.orig/debian/watch +++ nrg2iso-0.4/debian/watch @@ -0,0 +1,5 @@ +#version of the watch file +version=3 +# watch control file +http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html nrg2iso-(.*)\.tar\.gz + --- nrg2iso-0.4.orig/debian/rules +++ nrg2iso-0.4/debian/rules @@ -0,0 +1,75 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# source quilt for patch management +include /usr/share/quilt/quilt.make + +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 + +configure: configure-stamp +configure-stamp: + dh_testdir + +build: build-stamp + +build-stamp: configure-stamp $(QUILT_STAMPFN) + dh_testdir + + $(MAKE) CFLAGS="$(CFLAGS)" + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + mkdir -p debian/nrg2iso/usr/bin + cp nrg2iso debian/nrg2iso/usr/bin + +# 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_compress + dh_installchangelogs -k CHANGELOG + dh_installdocs + dh_installman debian/nrg2iso.1 + 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 configure --- nrg2iso-0.4.orig/debian/nrg2iso.1 +++ nrg2iso-0.4/debian/nrg2iso.1 @@ -0,0 +1,33 @@ +.TH NRG2ISO 1 +.SH NAME +nrg2iso \- extract ISO9660 data from Nero ".nrg" files +.SH SYNOPSIS +.B nrg2iso +.RI [ nrg-file ] +.RI [ iso-file ] +.PP +.B nrg2iso +.RI [ \-\-help | \-\-version ] +.SH DESCRIPTION +This manual page documents briefly the +.B nrg2iso +commands. +.PP +\fBnrg2iso\fP is a program that extracts ISO9660 data from Nero ".nrg" +CD-ROM image files. +.SH OPTIONS +.PP +\-\-help +.PP +.RS 3 +Display the help screen. +.RE +.PP +\-\-version +.PP +.RS 3 +Display the version. +.RE +.SH AUTHOR +This manual page was written by Misha Nasledov , +for the Debian project (but may be used by others). --- nrg2iso-0.4.orig/debian/docs +++ nrg2iso-0.4/debian/docs @@ -0,0 +1 @@ +CHANGELOG --- nrg2iso-0.4.orig/debian/README.source +++ nrg2iso-0.4/debian/README.source @@ -0,0 +1,57 @@ +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 + 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 + +where 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 + +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 /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). 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 + +You may need to run quilt pop -a to unapply patches first before running +this command. --- nrg2iso-0.4.orig/debian/copyright +++ nrg2iso-0.4/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Xavier Lüthi on +Mon, 07 Apr 2008 09:43:06 +0200. + +It was downloaded from +http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html + +Upstream Author: + Grégory Kokanosky + +Files: * +Copyright: © 2003-2004 Grégory Kokanosky +License: LGPL-2 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + +Files: debian/* +Copyright: © 2004-2007 Misha Nasledov + © 2008 Xavier Lüthi +License: GPL-2+ + The Debian packaging is licensed under the terms of the GNU + General Public License as published by the Free Software + Fundation; either version 2 of the License, or (at your option) + any later version. + +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in `/usr/share/common-licenses/GPL-2', and the +complete text of the GNU Library General Public License version 2 can +be found in `/usr/share/common-licenses/LGPL-2'. --- nrg2iso-0.4.orig/debian/patches/check_read_write_352823.patch +++ nrg2iso-0.4/debian/patches/check_read_write_352823.patch @@ -0,0 +1,118 @@ +Patch Author: Mikael Berthe + +This patch solves bug #352823. It has been added in version 0.4-2 of nrg2iso on +the 8th April 2008. + + +Patch packaged with quilt by Xavier Luthi +Index: nrg2iso-0.4/nrg2iso.c +=================================================================== +--- nrg2iso-0.4.orig/nrg2iso.c 2008-04-07 12:38:39.000000000 +0200 ++++ nrg2iso-0.4/nrg2iso.c 2008-04-07 12:39:27.000000000 +0200 +@@ -1,5 +1,5 @@ +-/* +- 01/05/2003 Nrg2Iso v 0.1 ++/* ++ 01/05/2003 Nrg2Iso v 0.4 + + Copyright (C) 2003 Grégory Kokanosky + +@@ -39,15 +39,14 @@ + } + + +-int checkIso(char *filename) ++int checkIso(FILE *filestream) + { + int iso = 0 ; +- FILE *f; + char buf[17*2048]; +- +- if(!(f=fopen(filename,"rb"))) return 0; +- +- if( fread( buf, 1,17*2048 ,f) == 17*2048 ) { ++ ++ if(!filestream) return 0; ++ ++ if( fread( buf, 1,17*2048 ,filestream) == 17*2048 ) { + + // taken from k3b + // check if this is an iso9660-image +@@ -66,14 +65,8 @@ + buf[16*2048+6] == 1 && + buf[16*2048+7] == 0 ); + } +- if(iso){ +- printf("It seems that %s is already an ISO 9660 image \n",filename); +- printf("[Aborting conversion]\n"); +- } + +- +- fclose(f); +- return iso; ++ return iso; + } + + #define NUM_OF_COLUMNS 70 +@@ -81,9 +74,9 @@ + int main(int argc, char **argv){ + FILE *nrgFile, *isoFile; + char buffer[1024 * 1024]; +- size_t i=0,j=0; +- size_t size=0,k=0,l; +- size_t nrgSize=0; ++ size_t i=0; ++ off_t size=0,l; ++ off_t nrgSize=0; + int percent = 0; + int old_percent = -1; + struct stat buf; +@@ -101,18 +94,32 @@ + + + if( stat(argv[1],&buf)==0){ +- +- if(!checkIso(argv[1])){ +- +- nrgSize = buf.st_size; +- nrgFile=fopen(argv[1],"rb"); ++ ++ nrgSize = buf.st_size; ++ nrgFile = fopen(argv[1],"rb"); ++ ++ if(nrgFile == NULL){ ++ printf("%s : Cannot open\n",argv[1]); ++ return -1; ++ } ++ ++ if(checkIso(nrgFile)){ ++ printf("It seems that %s is already an ISO 9660 image \n",argv[1]); ++ printf("[Aborting conversion]\n"); ++ }else{ + fseek (nrgFile, 307200, SEEK_SET); + + isoFile=fopen(argv[2],"wb+"); + + while((i= fread( buffer, 1, sizeof(buffer), nrgFile ))>0){ +- fwrite(buffer,i,1,isoFile); +- ++ if(fwrite(buffer,i,1,isoFile) != 1) { ++ printf("\r*** Write failure! ***\n"); ++ printf("[Aborting conversion]\n"); ++ fclose(nrgFile); ++ fclose(isoFile); ++ return -1; ++ } ++ + size+=i; + percent = (int)(size * 100.0 / nrgSize); + +@@ -135,7 +142,7 @@ + + fclose(nrgFile); + fclose(isoFile); +- printf("\n%s written : %lu bytes\n",argv[2],size); ++ printf("\n%s written : %llu bytes\n",argv[2],size); + } + } + else --- nrg2iso-0.4.orig/debian/patches/makefile.patch +++ nrg2iso-0.4/debian/patches/makefile.patch @@ -0,0 +1,14 @@ +Description: patch to take CFLAGS into account to copile nrg2iso + +Index: nrg2iso-0.4/Makefile +=================================================================== +--- nrg2iso-0.4.orig/Makefile 2008-04-07 19:19:14.000000000 +0200 ++++ nrg2iso-0.4/Makefile 2008-04-07 19:20:02.000000000 +0200 +@@ -1,5 +1,5 @@ + all: nrg2iso.c +- gcc nrg2iso.c -o nrg2iso ++ gcc $(CFLAGS) nrg2iso.c -o nrg2iso + + clean: + rm -f nrg2iso + --- nrg2iso-0.4.orig/debian/patches/series +++ nrg2iso-0.4/debian/patches/series @@ -0,0 +1,2 @@ +makefile.patch +check_read_write_352823.patch