diff -u subtitleeditor-0.20.0/config.sub subtitleeditor-0.20.0/config.sub --- subtitleeditor-0.20.0/config.sub +++ subtitleeditor-0.20.0/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2008-01-16' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +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." @@ -369,14 +369,10 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - # 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. 386bsd) @@ -447,14 +443,6 @@ 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 @@ -680,14 +668,6 @@ 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 ;; @@ -833,14 +813,6 @@ 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 ;; @@ -1049,10 +1021,6 @@ basic_machine=tic6x-unknown os=-coff ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; tx39) basic_machine=mipstx39-unknown ;; diff -u subtitleeditor-0.20.0/config.guess subtitleeditor-0.20.0/config.guess --- subtitleeditor-0.20.0/config.guess +++ subtitleeditor-0.20.0/config.guess @@ -1,10 +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, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2008-01-23' +timestamp='2007-07-22' # 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 @@ -56,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, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +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." @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[45]) 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 @@ -799,9 +799,6 @@ 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 @@ -836,14 +833,7 @@ 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 + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -964,8 +954,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1484,9 +1474,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://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -u subtitleeditor-0.20.0/debian/changelog subtitleeditor-0.20.0/debian/changelog --- subtitleeditor-0.20.0/debian/changelog +++ subtitleeditor-0.20.0/debian/changelog @@ -1,3 +1,12 @@ +subtitleeditor (0.20.0-3ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #231286), remaining Ubuntu changes: + + debian/*.desktop: + - fixed desktop file to show up in gnomes app menu. (LP: #195933) + + Modify Maintainer value to match the DebianMaintainerField specification. + + -- Miguel Ruiz Sat, 17 May 2008 00:28:46 -0400 + subtitleeditor (0.20.0-3) unstable; urgency=medium * Fixed the FTBFS: Document.cc:267: error: 'auto_ptr' is not a member of @@ -24,6 +33,17 @@ -- Anibal Avelar Thu, 27 Mar 2008 00:15:50 +0200 +subtitleeditor (0.20.0-1ubuntu1) hardy; urgency=low + + * debian/*.desktop: + - fixed desktop file to show up in gnomes app menu. (LP: #195933) + - Thx to Paul Matrenchar for the initial fix, but I had to redo some of + the fixes to be desktop-file-validate compliant. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Stephan Hermann Mon, 07 Apr 2008 09:01:53 +0200 + subtitleeditor (0.20.0-1) unstable; urgency=low * New upstream release (Closes: #463781). diff -u subtitleeditor-0.20.0/debian/control subtitleeditor-0.20.0/debian/control --- subtitleeditor-0.20.0/debian/control +++ subtitleeditor-0.20.0/debian/control @@ -1,7 +1,8 @@ Source: subtitleeditor Section: gnome Priority: optional -Maintainer: Anibal Avelar +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Anibal Avelar Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, libgstreamer-plugins-base0.10-dev, x11proto-fixes-dev, libpcre3-dev(>= 7.6-2), libenchant-dev, iso-codes, gstreamer0.10-tools, gstreamer0.10-plugins-good, libxml++2.6-dev Homepage: http://home.gna.org/subtitleeditor/ Standards-Version: 3.7.3 diff -u subtitleeditor-0.20.0/debian/subtitleeditor.desktop subtitleeditor-0.20.0/debian/subtitleeditor.desktop --- subtitleeditor-0.20.0/debian/subtitleeditor.desktop +++ subtitleeditor-0.20.0/debian/subtitleeditor.desktop @@ -1,11 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Subtitle Editor GenericName=Subtitle Editor Comment=A subtitle editor based to GStreamer and Gtk+ Exec=subtitleeditor Terminal=false -Type=Audio -Icon=subtitleeditor-icon.png +Type=Application +Icon=subtitleeditor Categories=Audio;AudioVideo;AudioVideoEditing; StartupNotify=true