[patch] Updates to latest version.

gpar2_0.3-2.3.diff (text/plain), 26.61 KB, created by newkarn on 2010-05-01 16:33:15 UTC

--- gpar2-0.3.orig/config.guess
+++ gpar2-0.3/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-02-23'
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -55,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -160,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -210,7 +212,7 @@
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -328,7 +330,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -530,7 +532,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -770,6 +772,8 @@
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
@@ -777,10 +781,7 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS_NT-*:*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,18 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[345]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -829,6 +836,16 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
@@ -947,6 +964,9 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -989,7 +1009,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -1205,6 +1225,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1455,9 +1484,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- gpar2-0.3.orig/config.sub
+++ gpar2-0.3/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-02-23'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -71,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -240,15 +241,16 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -274,21 +276,19 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,18 +318,18 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,22 +358,24 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -445,6 +447,14 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -477,8 +487,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -670,6 +680,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -685,6 +703,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -811,6 +833,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -912,6 +942,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -923,6 +957,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1012,6 +1049,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1128,7 +1169,7 @@
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1217,7 +1258,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1369,6 +1410,12 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1378,9 +1425,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1406,6 +1453,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
--- gpar2-0.3.orig/gpar2.cc
+++ gpar2-0.3/gpar2.cc
@@ -1,5 +1,5 @@
 #include "gpar2.h"
-
+#include <libintl.h> 
 
 int main(int argc, char *argv[])
 {
--- gpar2-0.3.orig/debian/changelog
+++ gpar2-0.3/debian/changelog
@@ -1,42 +1,40 @@
-gpar2 (0.3-1) unstable; urgency=low
+gpar2 (0.3-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium priority due to RC bugfix
+  * include libintl.h, thank Peter Green
+    -closes: #474795
+  * Move homepage description to correct place
+
+ -- Riku Voipio <[e-mail]>  Mon, 21 Apr 2008 17:18:33 +0300
+
+gpar2 (0.3-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * fix FTBFS by removing build-dep on non-existing libstdc++6-dev
+    Closes: #444585
+  * Depend on gnome-desktop-data (fixes #392472 which maintainer
+    closed without fixing it...)
+
+ -- Riku Voipio <[e-mail]>  Fri, 02 Nov 2007 23:08:04 +0200
 
-  * Changed version to match policy
+gpar2 (0.3-2.1) unstable; urgency=medium
 
- -- John Augustine <[e-mail]>  Mon, 27 Feb 2006 12:42:33 -0800
+  * NMU
+  * Fix postrm to test for programs before running them in purse. 
+    Closes: #416757
 
-gpar2 (0.3) unstable; urgency=low
+ -- Joey Hess <[e-mail]>  Fri, 30 Mar 2007 22:08:12 -0400
+
+gpar2 (0.3-2) unstable; urgency=low
+
+  * Add depends on desktop-file-utils and shared-mime-info (Closes: #392462). 
+
+ -- Khalid El Fathi <[e-mail]>  Thu, 12 Oct 2006 15:33:13 +0200
+
+gpar2 (0.3-1) unstable; urgency=low
 
-  * Version 0.3 released
-  * Changed general text outputs for English fluency
-  * Changed Open dialog title to Open Recovery Volume
-  * Changed Scanned files dialog text printing direction, prints text top to bottom
-  * Changed Scanned files scrollbar policy from Automatic to Always
-  * Fixed users being able to write to Scanned files window
-  * Fixed Open dialog remaining open while Scanning Headers...
-  * Fixed SegFault when performing Verify and no file is loaded
-  * Fixed SegFault when performing Repair and no file is loaded
-  * Fixed GlobalProgressBar, Scanned files, and Status not clearing when new volume loaded
-  * Added Quit button to toolbar
-  * Added MINIMAL original PAR(PAR1) support
-  * Added 'application/x-par' system mime-type ready for packaging
-  * Added auto-scrolling to Scanned files window, newest output is always visible
-  * Added error funtion and dialogs for common errors while performing verify and repair
-  * Added gnome-logo-icon-transparent.png to application
-  * Added tooltips to Open, Verify, Repair, and Quit buttons
-
- -- Francois Lesueur <[e-mail]>  Sun, 26 Feb 2006 00:00:00 +0100
-
-gpar2 (0.2) unstable; urgency=low
-
-  * Version 0.2 released
-  * Added detailed output about archived files
-  * Fixed some bugs with the progress bars
-  * Added a progress bar for the repair process
-  
- -- Francois Lesueur <[e-mail]>  Thu, 3 Feb 2006 00:00:00 +0100
- 
-gpar2 (0.1) unstable; urgency=low
+  * Initial release (Closes: #387813).
 
-  * Initial alpha release
+ -- Khalid El Fathi <[e-mail]>  Mon, 18 Sep 2006 10:21:31 +0200
 
- -- Francois Lesueur <[e-mail]>  Mon, 21 Nov 2005 00:00:00 +0100
--- gpar2-0.3.orig/debian/compat
+++ gpar2-0.3/debian/compat
@@ -1 +1 @@
-4
+5
--- gpar2-0.3.orig/debian/control
+++ gpar2-0.3/debian/control
@@ -1,18 +1,18 @@
 Source: gpar2
 Section: utils
 Priority: optional
-Maintainer: John Augustine <[e-mail]>
-Build-Depends: debhelper (>= 4.1.0), autotools-dev, libsigc++-2.0-dev, libstdc++6-dev, libgtkmm-2.4-dev, libpar2-0-dev (>= 0.2), gnome-desktop-data
-Standards-Version: 3.6.2
+Maintainer: Khalid El Fathi <[e-mail]>
+Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libpar2-0-dev (>= 0.2), libsigc++-2.0-dev
+Standards-Version: 3.7.3
+Homepage: http://sourceforge.net/projects/parchive/
 
 Package: gpar2
 Architecture: any
-Depends: libpar2-0 (>= 0.2), libsigc++-2.0-0c2 | libsigc++-2.0-0c2a, libstdc++6 (>= 3.4.4), libgtkmm-2.4-1c2 | libgtkmm-2.4-1c2a, gnome-desktop-data
+Depends: ${shlibs:Depends}, desktop-file-utils, shared-mime-info, gnome-desktop-data
 Description: A GUI for verifying and repairing PAR and PAR2 recovery sets
- A simple, easy to use graphical interface for verification and
- repairation of PAR v1.0 and PAR v2.0(PAR2) recovery sets.  PAR1
- support is currently minimal, as it is deprecated this most
- likely will not change, so do not expect the headers, progress,
- output, and status to update when performing actions on these.
- GPar2 is based on GTKMM, a wrapper for GTK+, and requires the
- standard par2 library, libpar2, to run.
+ A simple, easy to use graphical interface for verification and repair of 
+ PAR v1.0 and PAR v2.0(PAR2) recovery sets. PAR1 support is currently minimal, 
+ as it is deprecated this most likely will not change, so do not expect the 
+ headers, progress, output, and status to update when performing actions
+ on these.
+ .
--- gpar2-0.3.orig/debian/copyright
+++ gpar2-0.3/debian/copyright
@@ -1,26 +1,29 @@
-This package was debianized by John Augustine <[e-mail]> on
-Sun, 26 Feb 2006 04:38:29 -0800.
+This package was debianized by Khalid El Fathi <[e-mail]> on
+Mon, 18 Sep 2006 10:21:31 +0200.
 
-It was downloaded from http://prdownloads.sf.net/parchive/gpar2-0.3.tar.gz?download
+It was downloaded from http://sourceforge.net/projects/parchive/
 
-Copyright Holder: (C) 2005 Francois LESUEUR
-                  (C) 2006 John Augustine
+Upstream Author: Francois Lesueur <[e-mail]>
+                 John Augustine <[e-mail]>
+
+Copyright: (C) 2005 Francois Lesueur <[e-mail]>
+           (C) 2006 John Augustine <[e-mail]>
 
 License:
 
-  This program 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 program 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
+   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/GPL'.
+The Debian packaging is (C) 2006, Khalid El Fathi <[e-mail]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--- gpar2-0.3.orig/debian/dirs
+++ gpar2-0.3/debian/dirs
@@ -1,4 +1,4 @@
 usr/bin
-usr/share/mime/packages
 usr/share/applications
 usr/share/man/man1
+usr/share/mime/packages
--- gpar2-0.3.orig/debian/docs
+++ gpar2-0.3/debian/docs
@@ -1 +1,4 @@
+ABOUT-NLS
+AUTHORS
+NEWS
 README
--- gpar2-0.3.orig/debian/gpar2.1
+++ gpar2-0.3/debian/gpar2.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH GPAR2 1 "February 27, 2006"
+.TH GPAR2 1 "septembre 18, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,30 +16,32 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-gpar2 0.3 \- GUI for PAR and PAR2 sets
+gpar2 \- A GUI for verifying and repairing PAR and PAR2 recovery sets
 .SH SYNOPSIS
 .B gpar2
-[options]
+.RI
 .br
 .B gpar2
-[options]
-.I filename..
+.RI "filename" ...
+.br
+.B gpar2
+.RI "directoryname" ...
 .SH DESCRIPTION
 This manual page documents briefly the
 .B gpar2
-program.
+commands.
 .PP
-.B gpar2
-is a GUI utilizing the
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBgpar2\fP is a GUI utilizing the
 .B libpar2
 library and allows to verify and repair PAR and PAR2 recovery sets,
 and provides semi-detailed output of the process.
-.PP
 .SH OPTIONS
-Program options and usage:
+A summary of options is included below.
 .TP
 .B gpar2
-.br
 Open the GUI
 .TP
 .B gpar2 /foo/bar
@@ -52,10 +54,9 @@
 .BR libpar2 (1),
 .BR par2cmdline (1),
 .BR parcmdline (1).
-.PP
-These are common programs also related to PAR and PAR2 sets.
 .SH AUTHOR
-gpar2 was written by Francois Lesueur and John Augustine.
+gpar2 was written by Francois Lesueur <[e-mail]> and
+John Augustine <[e-mail]>
 .PP
-This manual page was written by John Augustine <[e-mail]>,
-for the Ubuntu project (but may be used by others).
+This manual page was written by Khalid El Fathi <[e-mail]>,
+for the Debian project (but may be used by others).
--- gpar2-0.3.orig/debian/postinst
+++ gpar2-0.3/debian/postinst
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # postinst script for gpar2
 #
 # see: dh_installdeb(1)
@@ -19,9 +19,8 @@
 
 case "$1" in
     configure)
-    
-       update-mime-database /usr/share/mime
-       update-desktop-database
+    	update-mime-database /usr/share/mime
+	update-desktop-database
 
     ;;
 
--- gpar2-0.3.orig/debian/postrm
+++ gpar2-0.3/debian/postrm
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # postrm script for gpar2
 #
 # see: dh_installdeb(1)
@@ -20,9 +20,12 @@
 
 case "$1" in
        purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-        update-mime-database /usr/share/mime
-        update-desktop-database
+	if [ -x "`which update-mime-database 2>/dev/null`" ]; then
+        	update-mime-database /usr/share/mime
+	fi
+	if which update-desktop-database >/dev/null 2>&1 ; then
+	        update-desktop-database -q
+	fi
 
         ;;
 
@@ -37,4 +40,4 @@
 
 #DEBHELPER#
 
-exit 0
+exit 
--- gpar2-0.3.orig/debian/rules
+++ gpar2-0.3/debian/rules
@@ -27,20 +27,26 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
 build: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
+
+	# Add here commands to compile the package.
 	$(MAKE)
-	touch build-stamp
+	#docbook-to-man debian/gpar2.sgml > gpar2.1
+
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -49,6 +55,7 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
+
 	dh_clean 
 
 install: build
@@ -56,6 +63,8 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+
+	# Add here commands to install the package into debian/gpar2.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/gpar2
 	cp $(CURDIR)/gpar2.xml $(CURDIR)/debian/gpar2/usr/share/mime/packages/gpar2.xml
 	cp $(CURDIR)/gpar2.desktop $(CURDIR)/debian/gpar2/usr/share/applications/gpar2.desktop
@@ -64,6 +73,7 @@
 
 # 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
@@ -71,9 +81,27 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
+#	dh_installexamples
+#	dh_install
+	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
 	dh_strip
 	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_makeshlibs
 	dh_installdeb
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
--- gpar2-0.3.orig/debian/menu
+++ gpar2-0.3/debian/menu
@@ -0,0 +1,2 @@
+?package(gpar2):needs="X11" section="Apps/Tools"\
+  title="GPar2" command="/usr/bin/gpar2"
--- gpar2-0.3.orig/debian/watch
+++ gpar2-0.3/debian/watch
@@ -0,0 +1,20 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage 
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php gpar2-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/gpar2-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/gpar2-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for debscripts >= 2.9
+http://sf.net/parchive/gpar2-(.*)\.tar\.gz