[Python-apps-commits] r5270 - in packages/oggconvert/trunk/debian (5 files)

[dktrkranz at users.alioth.debian.org]

    Date: Monday, May 24, 2010 @ 18:14:32
  Author: dktrkranz
Revision: 5270

Refresh patches for new upstream release

Modified:
  packages/oggconvert/trunk/debian/changelog
  packages/oggconvert/trunk/debian/patches/default_location
  packages/oggconvert/trunk/debian/patches/desktop_file_validation
  packages/oggconvert/trunk/debian/patches/series
Deleted:
  packages/oggconvert/trunk/debian/patches/schroedinger_version.patch

Modified: packages/oggconvert/trunk/debian/changelog
===================================================================
--- packages/oggconvert/trunk/debian/changelog	2010-05-24 18:08:56 UTC (rev 5269)
+++ packages/oggconvert/trunk/debian/changelog	2010-05-24 18:14:32 UTC (rev 5270)
@@ -1,10 +1,13 @@
 oggconvert (0.3.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches for new upstream release.
+  * debian/patches/schroedinger_version.patch:
+    - Removed, applied upstream.
   * debian/copyright:
     - Adjust copyright years.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Mon, 24 May 2010 20:08:17 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 24 May 2010 20:13:49 +0200
 
 oggconvert (0.3.2-4) unstable; urgency=low
 

Modified: packages/oggconvert/trunk/debian/patches/default_location
===================================================================
--- packages/oggconvert/trunk/debian/patches/default_location	2010-05-24 18:08:56 UTC (rev 5269)
+++ packages/oggconvert/trunk/debian/patches/default_location	2010-05-24 18:14:32 UTC (rev 5270)
@@ -1,11 +1,11 @@
 GNOME provides a Videos directory in $HOME folders, place default "Save Folder" location there.
 https://launchpad.net/bugs/209592
 
-Index: oggconvert-0.3.2/OggConvert/ocv_main.py
+Index: oggconvert-0.3.3/OggConvert/ocv_main.py
 ===================================================================
---- oggconvert-0.3.2.orig/OggConvert/ocv_main.py	2008-11-06 22:12:35.536963832 +0100
-+++ oggconvert-0.3.2/OggConvert/ocv_main.py	2008-11-06 22:13:55.361509458 +0100
-@@ -316,7 +316,11 @@
+--- oggconvert-0.3.3.orig/OggConvert/ocv_main.py	2010-05-24 20:11.35.536963832 +0100
++++ oggconvert-0.3.3/OggConvert/ocv_main.py	2010-05-24 20:11.35.536963832 +0100
+@@ -308,7 +308,11 @@
          self._file_chooser_button.add_filter(audio)
          self._file_chooser_button.add_filter(allfiles)
          

Modified: packages/oggconvert/trunk/debian/patches/desktop_file_validation
===================================================================
--- packages/oggconvert/trunk/debian/patches/desktop_file_validation	2010-05-24 18:08:56 UTC (rev 5269)
+++ packages/oggconvert/trunk/debian/patches/desktop_file_validation	2010-05-24 18:14:32 UTC (rev 5270)
@@ -1,9 +1,9 @@
 Validate .desktop file against current Freedesktop standards.
 
-Index: oggconvert-0.3.2/data/oggconvert.desktop
+Index: oggconvert-0.3.3/data/oggconvert.desktop
 ===================================================================
---- oggconvert-0.3.2.orig/data/oggconvert.desktop	2008-09-15 13:32:38.734574676 +0200
-+++ oggconvert-0.3.2/data/oggconvert.desktop	2008-09-15 13:32:49.927203293 +0200
+--- oggconvert-0.3.3.orig/data/oggconvert.desktop	2010-05-24 20:11.35.536963832 +0100
++++ oggconvert-0.3.3/data/oggconvert.desktop	2010-05-24 20:11.35.536963832 +0100
 @@ -1,6 +1,5 @@
  [Desktop Entry]
  Version=1.0
@@ -11,8 +11,3 @@
  Name=OggConvert
  Comment=Convert media files to Free formats
  Type=Application
-@@ -9,4 +8,3 @@
- Categories=AudioVideo;
- Terminal=false
- StartupNotify=false
--GenericName[en_GB]=

Deleted: packages/oggconvert/trunk/debian/patches/schroedinger_version.patch
===================================================================
--- packages/oggconvert/trunk/debian/patches/schroedinger_version.patch	2010-05-24 18:08:56 UTC (rev 5269)
+++ packages/oggconvert/trunk/debian/patches/schroedinger_version.patch	2010-05-24 18:14:32 UTC (rev 5270)
@@ -1,15 +0,0 @@
-Adjust schroedinger minimum version to match gstreamer0.10-plugins-bad one
-
-Index: oggconvert-0.3.2/OggConvert/ocv_init.py
-===================================================================
---- oggconvert-0.3.2.orig/OggConvert/ocv_init.py	2010-05-02 14:57:08.108258050 +0200
-+++ oggconvert-0.3.2/OggConvert/ocv_init.py	2010-05-02 14:57:42.452252434 +0200
-@@ -37,7 +37,7 @@
-     if gstver[2] > 10:
-         schrofac = gst.element_factory_find("schroenc")
-         if schrofac is not None:
--            if schrofac.check_version(1,0,0):
-+            if schrofac.check_version(0,10,14):
-                 print "Schrödinger encoder found, using"
-                 ocv_constants.HAVE_SCHRO = True
-             else:

Modified: packages/oggconvert/trunk/debian/patches/series
===================================================================
--- packages/oggconvert/trunk/debian/patches/series	2010-05-24 18:08:56 UTC (rev 5269)
+++ packages/oggconvert/trunk/debian/patches/series	2010-05-24 18:14:32 UTC (rev 5270)
@@ -1,3 +1,2 @@
 desktop_file_validation
 default_location
-schroedinger_version.patch