[Pkg-cli-apps-commits] r4177 - in /packages/podsleuth/trunk/debian: changelog patches/ patches/01_update-model-info.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Nov 1 19:17:23 UTC 2008
Author: slomo
Date: Sat Nov 1 19:17:23 2008
New Revision: 4177
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4177
Log:
* debian/patches/01_update-model-info.patch:
+ Patch from upstream SVN to update model info for many new ipod models.
Added:
packages/podsleuth/trunk/debian/patches/
packages/podsleuth/trunk/debian/patches/01_update-model-info.patch
Modified:
packages/podsleuth/trunk/debian/changelog
Modified: packages/podsleuth/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/podsleuth/trunk/debian/changelog?rev=4177&op=diff
==============================================================================
--- packages/podsleuth/trunk/debian/changelog (original)
+++ packages/podsleuth/trunk/debian/changelog Sat Nov 1 19:17:23 2008
@@ -1,3 +1,10 @@
+podsleuth (0.6.3-2) experimental; urgency=low
+
+ * debian/patches/01_update-model-info.patch:
+ + Patch from upstream SVN to update model info for many new ipod models.
+
+ -- Sebastian Dröge <slomo at debian.org> Sat, 01 Nov 2008 20:16:56 +0100
+
podsleuth (0.6.3-1) experimental; urgency=low
* New upstream release.
Added: packages/podsleuth/trunk/debian/patches/01_update-model-info.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/podsleuth/trunk/debian/patches/01_update-model-info.patch?rev=4177&op=file
==============================================================================
--- packages/podsleuth/trunk/debian/patches/01_update-model-info.patch (added)
+++ packages/podsleuth/trunk/debian/patches/01_update-model-info.patch Sat Nov 1 19:17:23 2008
@@ -1,0 +1,304 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (revision 64)
++++ ChangeLog (revision 68)
+@@ -1,3 +1,30 @@
++2008-10-01 Gabriel Burt <gabriel.burt at gmail.com>
++
++ * data/ipod-model-table: Add a lot of new info taken from libgpod.
++
++2008-10-01 Gabriel Burt <gabriel.burt at gmail.com>
++
++ * data/ipod-model-table: Fix model number for new Nanos. I wasn't aware
++ that the "Model No." listed on the back of the device is not what we want.
++ Instead, we want a substring of the part number listed next to the device
++ description ("iPod nano 8GB Black") on the box.
++
++2008-09-29 Gabriel Burt <gabriel.burt at gmail.com>
++
++ * src/PodSleuth/PodSleuth/Device.cs: Add support for new plist format that
++ specifies support image formats in an array instead of as entries in a
++ dictionary. This fix means that 4th gen Nano devices and their
++ comtemporaries should properly detect whether they support album art
++ again.
++
++ * data/ipod-model-table: Fix duplicate serial number and missing comment
++ semicolons.
++
++2008-09-29 Aaron Bockover <abock at gnome.org>
++
++ * data/ipod-model-table: Updated a lot of model information,
++ hopefully it's all correct
++
+ 2008-09-11 Aaron Bockover <abock at gnome.org>
+
+ Released 0.6.3
+Index: src/PodSleuth/PodSleuth.ModelData/ModelColor.cs
+===================================================================
+--- src/PodSleuth/PodSleuth.ModelData/ModelColor.cs (revision 64)
++++ src/PodSleuth/PodSleuth.ModelData/ModelColor.cs (revision 68)
+@@ -13,6 +13,7 @@
+ Green,
+ Pink,
+ Gold,
+- Purple
++ Purple,
++ Yellow
+ }
+ }
+Index: src/PodSleuth/PodSleuth/Device.cs
+===================================================================
+--- src/PodSleuth/PodSleuth/Device.cs (revision 64)
++++ src/PodSleuth/PodSleuth/Device.cs (revision 68)
+@@ -140,25 +140,44 @@
+ if(plist_dict.ContainsKey("FireWireGUID")) {
+ firewire_id = ((PlistString)plist_dict["FireWireGUID"]).Value;
+ }
+-
++
+ foreach(string img_class in new string [] { "ImageSpecifications", "AlbumArt", "ChapterImageSpecs" }) {
+ if(!plist_dict.ContainsKey(img_class)) {
+ continue;
+ }
++
++ bool added_any = false;
+
+ PlistDictionary formats = plist_dict[img_class] as PlistDictionary;
+- if(formats == null || formats.Count == 0) {
++ if(formats != null && formats.Count > 0) {
++ foreach(KeyValuePair<string, PlistObjectBase> kvp in formats) {
++ try {
++ ImageFormat format = new ImageFormat((PlistDictionary)kvp.Value, img_class);
++ image_formats.Add(format);
++ added_any = true;
++ } catch {
++ }
++ }
++ } else {
++ // In 4th gen Nanos, the plist format was changed to list the image
++ // types supported in an array instead of as entries in a dict.
++ PlistArray formats_array = plist_dict[img_class] as PlistArray;
++ if (formats_array != null) {
++ foreach(PlistObjectBase val in formats_array) {
++ try {
++ ImageFormat format = new ImageFormat((PlistDictionary)val, img_class);
++ image_formats.Add(format);
++ added_any = true;
++ } catch {
++ }
++ }
++ }
++ }
++
++ if(!added_any) {
+ continue;
+ }
+
+- foreach(KeyValuePair<string, PlistObjectBase> kvp in formats) {
+- try {
+- ImageFormat format = new ImageFormat((PlistDictionary)kvp.Value, img_class);
+- image_formats.Add(format);
+- } catch {
+- }
+- }
+-
+ switch(img_class) {
+ case "ImageSpecifications": photos_supported = true; break;
+ case "AlbumArt": album_art_supported = true; break;
+@@ -194,9 +213,11 @@
+ }
+
+ string model = sysinfo["ModelNumStr"];
+-
+- model = model.Substring(1);
+- model = model.Substring(0, 4);
++ if (model != null && model.Length >= 5) {
++ model = model.Substring(1);
++ model = model.Substring(0, 4);
++ }
++
+ return model;
+ }
+
+Index: data/ipod-model-table
+===================================================================
+--- data/ipod-model-table (revision 64)
++++ data/ipod-model-table (revision 68)
+@@ -12,7 +12,8 @@
+ ;;; 'hip' formats (XML) make the table extremely hard to read
+ ;;; and edit by hand, and add too much text overhead. No complaints.
+ ;;;
+-;;; VERY USEFUL: http://docs.info.apple.com/article.html?artnum=61688
++;;; VERY USEFUL: http://support.apple.com/kb/HT1353
++;;; http://yabb.jriver.com/interact/index.php?topic=36033
+
+ ;----- ---- ----- -------- ------ ---------- ------------
+ ;Class Gen. Color Capacity Model# Attributes Serial Codes
+@@ -21,46 +22,46 @@
+ ;; Original Form Factor iPods -------
+
+ Grayscale 1 White 5 8513 None Unknown
+-Grayscale 1 White 5 8541 None LG6,NAM
++Grayscale 1 White 5 8541 None LG6,NAM,MJ2
+ Grayscale 1 White 5 8697 None Unknown
+ Grayscale 1 White 10 8709 None ML1,MME
+
+-Grayscale 2 White 10 8737 None Unknown
+-Grayscale 2 White 10 8740 None NGE
+-Grayscale 2 White 20 8738 None Unknown
+-Grayscale 2 White 20 8741 None MMC,MMF
++Grayscale 2 White 10 8737 None MMB
++Grayscale 2 White 10 8740 None NGE,NGH
++Grayscale 2 White 20 8738 None MMC
++Grayscale 2 White 20 8741 None MMF
+
+ Grayscale 3 White 10 8976 None NRH
+-Grayscale 3 White 15 8946 None Unknown
++Grayscale 3 White 15 8946 None NLW
+ Grayscale 3 White 15 9460 None QQF
+ Grayscale 3 White 20 9244 None PQ5,PNT
+-Grayscale 3 White 30 8948 None NLY
++Grayscale 3 White 30 8948 None NLY,NM7
+ Grayscale 3 White 40 9245 None PNU
+
+ Grayscale 4 White 20 9282 None PS9,Q8U
+-Grayscale 4 Black 25 9787 U2 V9V
++Grayscale 4 Black 25 9787 U2 V9V,S2X
+ Grayscale 4 White 40 9268 None PQ7
+ Grayscale 4 White 40 E436 HP Unknown
+
+ Color 4 White 20 A079 None TDU,TDS
+-Color 4 Black 20 A127 U2 Unknown
+-Color 4 White 60 9830 None SAZ
++Color 4 Black 20 A127 U2 TM2
++Color 4 White 60 9830 None SAZ,SB1
+ Color 4 White 30 9829 None SAY
+ Color 4 White 40 9585 None R5Q
+-Color 4 White 60 9586 None R5R
++Color 4 White 60 9586 None R5R,R5T
+
+ ;; iPod Mini ------------------------
+
+-Mini 1 Silver 4 9160 None PFW
++Mini 1 Silver 4 9160 None PFW,PRC
+ Mini 1 Blue 4 9436 None QKL,QKQ
+ Mini 1 Pink 4 9435 None QKK,QKP
+-Mini 1 Green 4 9434 None Unknown
+-Mini 1 Gold 4 9437 None Unknown
++Mini 1 Green 4 9434 None QKJ,QKN
++Mini 1 Gold 4 9437 None QKM,QKR
+
+ Mini 2 Silver 4 9800 None S41,S4C
+ Mini 2 Blue 4 9802 None S43
+ Mini 2 Pink 4 9804 None S45
+-Mini 2 Green 4 9806 None S47
++Mini 2 Green 4 9806 None S47,S4J
+ Mini 2 Silver 6 9801 None S42
+ Mini 2 Blue 6 9803 None S44
+ Mini 2 Pink 6 9805 None Unknown
+@@ -79,13 +80,24 @@
+ Shuffle 2 Purple 1 X None YXA
+ Shuffle 2 Red 1 X ProductRed YX9
+
++Shuffle 3 Silver 1 B225 None Unknown
++Shuffle 3 Purple 1 B233 None Unknown
++Shuffle 3 Red 1 B231 ProductRed Unknown
++Shuffle 3 Blue 1 B227 None Unknown
++Shuffle 3 Green 1 B229 None Unknown
++Shuffle 3 Silver 2 B518 None Unknown
++Shuffle 3 Blue 2 B520 None Unknown
++Shuffle 3 Green 2 B522 None Unknown
++Shuffle 3 Red 2 B524 ProductRed Unknown
++Shuffle 3 Purple 2 B526 None Unknown
++
+ ;; iPod Nano ------------------------
+
+-Nano 1 White 1 A350 None UNB
+-Nano 1 Black 1 A352 None UPR
+-Nano 1 White 2 A004 None SZB,SZC,SZV,SZW,UNA
++Nano 1 White 1 A350 None UNB,UNA
++Nano 1 Black 1 A352 None UPR,UPS
++Nano 1 White 2 A004 None SZB,SZV,SZW
+ Nano 1 Black 2 A099 None TJT,TJU
+-Nano 1 White 4 A005 None Unknown
++Nano 1 White 4 A005 None SZT,SZC
+ Nano 1 Black 4 A107 None TK2,TK3
+
+ Nano 2 Silver 2 A477 None VQ5,VQ6
+@@ -104,18 +116,46 @@
+ Nano 3 Green 8 A253 None YXT
+ Nano 3 Black 8 A261 None YXX
+
++Nano 4 Silver 4 B480 None 1P1
++;;Nano 4 Blue 4 B??? None Unknown
++Nano 4 Pink 4 B654 None 37H
++Nano 4 Purple 4 B657 None 37K
++Nano 4 Orange 4 B660 None 37L
++Nano 4 Green 4 B663 None 37P
++Nano 4 Yellow 4 B666 None 37Q
++Nano 4 Silver 8 B598 None Unknown
++Nano 4 Blue 8 B732 None 3QS
++Nano 4 Pink 8 B735 None 3QT
++Nano 4 Purple 8 B739 None 3QU
++Nano 4 Orange 8 B742 None 3QW
++Nano 4 Green 8 B745 None 3QX
++Nano 4 Yellow 8 B748 None 3QY
++Nano 4 Red 8 B751 ProductRed 3QZ
++Nano 4 Black 8 B754 None 3R0
++
++Nano 4 Silver 16 B903 None Unknown
++Nano 4 Blue 16 B905 None Unknown
++Nano 4 Pink 16 B907 None Unknown
++Nano 4 Purple 16 B909 None Unknown
++Nano 4 Orange 16 B911 None Unknown
++Nano 4 Green 16 B913 None Unknown
++Nano 4 Yellow 16 B915 None Unknown
++Nano 4 Red 16 B917 ProductRed 5BE
++Nano 4 Black 16 B918 None Unknown
++
+ ;; iPod Video -----------------------
+
+-Video 5 White 30 A002 None SZ9,SZT,SZU
+-Video 5 Black 30 A146 None TXK
+-Video 5 White 60 A003 None SZA
++Video 5 White 30 A002 None SZ9,WEC,WED,WEG,WEH,WEL
++Video 5 Black 30 A146 None TXK,TXM,WEE,WEF,WEJ,WEK
++Video 5 White 60 A003 None SZA,SZU
+ Video 5 Black 60 A147 None TXL,TXN
++Video 5.5 Black 30 A452 U2 W9V,WEM,W9G
+
+ Video 5.5 White 30 A444 None V9K,V9L,WU9
+ Video 5.5 Black 30 A446 None VQM,V9M,V9N
+-Video 5.5 White 80 A448 None V9S,V9P,V9R
+-Video 5.5 Black 80 A450 None WUC
+-Video 5.5 Black 30 A446 U2 W9G,WEE
++Video 5.5 White 80 A448 None V9P
++Video 5.5 Black 80 A450 None V9R,V9S,V95,V96
++Video 5.5 Black 80 A450 U2 WUC
+
+ ;; iPod Classic ---------------------
+
+@@ -124,14 +164,20 @@
+ Classic 6 Silver 160 B155 None YMU
+ Classic 6 Black 160 B150 None YMX
+
++Classic 7 Silver 120 B562 None 2C5
++Classic 7 Black 120 B565 None 2C7
++
+ ;; iPod Touch -----------------------
+
+-Touch 6 Black 8 X None Unknown
+-Touch 6 Black 16 X None Unknown
++Touch 1 Black 8 A623 None W4N,14N
++Touch 1 Black 16 A627 None W4T
++Touch 2 Black 32 B376 None Unknown
+
+ ;; iPhone ---------------------------
+
+-Phone 6 Black 4 A501 None VR0
++Phone 1 Black 4 A501 None VR0
++Phone 1 Black 8 A712 None WH8
++Phone 2 Black 16 B384 None Unknown
+
+ ;; Video Notes:
+ ;; The W prefix may mean U2
More information about the Pkg-cli-apps-commits
mailing list