Merge lp:~rcart/ubuntu/natty/nted/fix-710132 into lp:ubuntu/natty/nted

[Ronny Cardona]

* debian/patches/fix-empty-captions.patch:
  - Removed empty captions of nted.desktop file. (LP: #710132, Closes:
  #614311)

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-21 22:06:20 +0000
+++ debian/changelog	2011-02-21 21:48:12 +0000
@@ -1,3 +1,11 @@
+nted (1.10.7-1ubuntu1) natty; urgency=low
+
+  * debian/patches/fix-empty-captions.patch:
+    - Removed empty captions of nted.desktop file. (LP: #710132, Closes:
+    #614311)
+
+ -- Ronny Cardona (Rcart) <[e-mail]>  Sat, 19 Feb 2011 21:44:18 -0600
+
 nted (1.10.7-1) unstable; urgency=low
 
   * New upstream version:

=== modified file 'debian/control'
--- debian/control	2010-04-06 22:18:34 +0000
+++ debian/control	2011-02-21 21:48:12 +0000
@@ -1,7 +1,8 @@
 Source: nted
 Section: sound
 Priority: optional
-Maintainer: Gilles Filippini <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Gilles Filippini <[e-mail]> 
 Homepage: http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libasound2-dev, libcairo2-dev, libgtk2.0-dev, quilt (>= 0.46-7~), xmlto, poxml
 Standards-Version: 3.8.4

=== added file 'debian/patches/fix-empty-captions.patch'
--- debian/patches/fix-empty-captions.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-empty-captions.patch	2011-02-21 21:48:12 +0000
@@ -0,0 +1,161 @@
+From: Ronny Cardona (Rcart) <[e-mail]>
+Description: Removes empty captions of nted.desktop file.
+Origin: http://bugs.launchpad.net/bugs/710132
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/710132
+Bug-Debian: http://bugs.debian.org/614311
+
+Index: nted.fix-710132/datafiles/applications/nted.desktop
+===================================================================
+--- nted.fix-710132.orig/datafiles/applications/nted.desktop	2011-02-19 21:35:00.154507000 -0600
++++ nted.fix-710132/datafiles/applications/nted.desktop	2011-02-19 21:36:57.174507000 -0600
+@@ -8,150 +8,22 @@
+ Categories=GNOME;Application;AudioVideo;
+ 
+ Name=NtEd
+-Name[ar]=
+-Name[az]=
+-Name[be]=
+-Name[bg]=
+-Name[bn]=
+-Name[bs]=
+-Name[ca]=
+-Name[cs]=
+-Name[cy]=
+-Name[da]=
+ Name[de]=NtEd
+-Name[el]=
+ Name[en]=NtEd
+ Name[es]=NtEd
+-Name[et]=
+-Name[eu]=
+-Name[fa]=
+-Name[fi]=
+ Name[fr]=NtEd
+-Name[gl]=
+-Name[gu]=
+-Name[he]=
+-Name[hi]=
+-Name[hr]=
+-Name[hu]=
+-Name[id]=
+ Name[it]=NtEd
+-Name[ja]=
+-Name[ko]=
+-Name[lt]=
+-Name[lv]=
+-Name[mk]=
+-Name[mn]=
+-Name[ms]=
+-Name[nb]=
+-Name[ne]=
+-Name[nl]=
+-Name[nn]=
+-Name[no]=
+-Name[pa]=
+-Name[pl]=
+-Name[pt]=
+-Name[pt_BR]=
+-Name[ro]=
+-Name[ru]=
+-Name[sk]=
+-Name[sl]=
+-Name[sq]=
+-Name[sr]=
+-Name[sr@Latn]=
+-Name[sv]=
+-Name[ta]=
+-Name[th]=
+-Name[tr]=
+-Name[uk]=
+-Name[vi]=
+-Name[wa]=
+-Name[xh]=
+-Name[zh_CN]=
+-Name[zh_TW]=
+ 
+ GenericName=Score Editor
+-GenericName[ca]=
+-GenericName[cs]=
+-GenericName[da]=
+ GenericName[de]=Partitureditor
+ GenericName[es]=Editor de partituras
+ GenericName[en]=Score Editor
+ GenericName[fr]=Édieur de partition
+-GenericName[hu]=
+ GenericName[it]=Redattore di spartiti
+-GenericName[ja]=
+-GenericName[ko]=
+-GenericName[nb]=
+-GenericName[nl]=
+-GenericName[pl]=
+-GenericName[pt_BR]=
+-GenericName[pt]=
+-GenericName[ro]=
+-GenericName[ru]=
+-GenericName[sl]=
+-GenericName[sq]=
+-GenericName[sv]=
+-GenericName[zh_CN]=
+-GenericName[zh_TW]=
+ 
+ Comment=Edit musical scores
+-Comment[ar]=
+-Comment[az]=
+-Comment[be]=
+-Comment[bg]=
+-Comment[bn]=
+-Comment[bs]=
+-Comment[ca]=
+-Comment[cs]=
+-Comment[cy]=
+-Comment[da]=
+ Comment[de]=Bearbeitet (musikal.) Partituren
+-Comment[el]=
+ Comment[en]=Edit musical scores
+ Comment[es]=Editor musical de partituras
+-Comment[et]=
+-Comment[eu]=
+-Comment[fa]=
+-Comment[fi]=
+ Comment[fr]=Ėdite des partitions musicales
+-Comment[gl]=
+-Comment[gu]=
+-Comment[he]=
+-Comment[hi]=
+-Comment[hr]=
+-Comment[hu]=
+-Comment[id]=
+ Comment[it]=Redige spartiti musicali
+-Comment[ja]=
+-Comment[ko]=
+-Comment[lt]=
+-Comment[lv]=
+-Comment[mk]=
+-Comment[mn]=
+-Comment[ms]=
+-Comment[nb]=
+-Comment[ne]=
+-Comment[nl]=
+-Comment[nn]=
+-Comment[no]=
+-Comment[pa]=
+-Comment[pl]=
+-Comment[pt]=
+-Comment[pt_BR]=
+-Comment[ro]=
+-Comment[ru]=
+-Comment[sk]=
+-Comment[sl]=
+-Comment[sq]=
+-Comment[sr]=
+-Comment[sr@Latn]=
+-Comment[sv]=
+-Comment[ta]=
+-Comment[th]=
+-Comment[tr]=
+-Comment[uk]=
+-Comment[vi]=
+-Comment[wa]=
+-Comment[xh]=
+-Comment[zh_CN]=
+-Comment[zh_TW]=

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-01-18 23:57:11 +0000
+++ debian/patches/series	2011-02-21 21:48:12 +0000
@@ -1,3 +1,4 @@
+fix-empty-captions.patch
 remove-encoding-key-in-desktop-file
 linking
 linking.generated