← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gtkpod-aac/hardy

« back to all changes in this revision

Viewing changes to debian/gtkpod-aac.diff

  • Committer: Bazaar Package Importer
  • Author(s): John Dong
  • Date: 2007-11-20 01:33:01 UTC
  • Revision ID: james.westby@ubuntu.com-20071120013301-8xk70i9vonhxei4g
Tags: 0.99.10-4ubuntu1
* Resynchronize with gtkpod 0.9.10-4:
 - Pulled in 01_mountpoint.dpatch (and deapply it from the diff.gz)
 - Pulled in 02_missing-fclose.dpatch
 - Applied desktop file and control file changes from -4
* Ubuntu Changes:
 - Dropped .png extension on icon in .desktop file
 - Call dh_icons
 - Put our prefs.c mountpoint patch into 01_mountpoint
* Updated gtkpod-aac.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/gtkpod-aac.diff
1
 
diff -Nru /tmp/R0YexM59jo/gtkpod-0.99.10/debian/changelog /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/changelog
2
 
diff -Nru /tmp/R0YexM59jo/gtkpod-0.99.10/debian/control /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/control
3
 
--- /tmp/R0YexM59jo/gtkpod-0.99.10/debian/control       2007-07-17 18:25:15.000000000 +1000
4
 
+++ /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/control   2007-07-17 18:25:15.000000000 +1000
5
 
@@ -1,17 +1,21 @@
 
1
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/changelog /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/changelog
 
2
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/control /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/control
 
3
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/control       2007-11-20 02:24:30.000000000 -0500
 
4
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/control   2007-11-20 02:24:30.000000000 -0500
 
5
@@ -1,21 +1,27 @@
6
6
-Source: gtkpod
7
7
+Source: gtkpod-aac
8
8
 Section: sound
11
11
+Maintainer: Timo Aaltonen <tepsipakki@ubuntu.com>
12
12
+XSBC-Original-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
13
13
 Uploaders: Frank Lichtenheld <djpig@debian.org>, Nico Golde <nion@debian.org>
14
 
-Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl4-gnutls-dev, libhal-dev
 
14
-Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl4-gnutls-dev, libhal-dev, dpatch
15
15
+Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl4-gnutls-dev, libhal-dev, dpatch, libmp4v2-dev
16
16
 Standards-Version: 3.7.2
17
 
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk
18
 
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk
 
17
 Homepage: http://www.gtkpod.org
 
18
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk
 
19
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk
19
20
 
20
21
-Package: gtkpod
21
22
+Package: gtkpod-aac
28
29
 Description: manage songs and playlists on an Apple iPod
29
30
  gtkpod is a platform independent GUI for Apple's iPod using GTK2. It
30
31
  allows you to upload songs and playlists to your iPod. It supports ID3
31
 
@@ -19,4 +23,6 @@
 
32
  tag editing, multiple charsets for ID3 tags, detects duplicate songs,
32
33
  allows offline modification of the database with later synchronisation,
33
34
  and more.
34
 
  .
 
35
+ .
35
36
+ This version has aac/mp4-support.
36
 
+ .
37
 
   Homepage: http://www.gtkpod.org
38
 
diff -Nru /tmp/R0YexM59jo/gtkpod-0.99.10/debian/patches/00list /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/patches/00list
39
 
--- /tmp/R0YexM59jo/gtkpod-0.99.10/debian/patches/00list        1970-01-01 10:00:00.000000000 +1000
40
 
+++ /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/patches/00list    2007-07-17 18:25:15.000000000 +1000
41
 
@@ -0,0 +1 @@
 
37
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/gtkpod.desktop /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/gtkpod.desktop
 
38
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/gtkpod.desktop        2007-11-20 02:24:30.000000000 -0500
 
39
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/gtkpod.desktop    2007-11-20 02:24:30.000000000 -0500
 
40
@@ -1,6 +1,6 @@
 
41
 [Desktop Entry]
 
42
 Name=gtkpod
 
43
-Icon=gtkpod-icon-32x32.png
 
44
+Icon=gtkpod-icon-32x32
 
45
 Comment=Manage songs and playlists on your Apple iPod
 
46
 Exec=gtkpod
 
47
 Terminal=false
 
48
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/00list /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/00list
 
49
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/00list        2007-11-20 02:24:30.000000000 -0500
 
50
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/00list    2007-11-20 02:24:30.000000000 -0500
 
51
@@ -1,3 +1,5 @@
 
52
 01_mountpoint
 
53
 02_missing_fclose
 
54
 03_itdb-set-local-to-imported
42
55
+aac-configure
43
 
diff -Nru /tmp/R0YexM59jo/gtkpod-0.99.10/debian/patches/aac-configure.dpatch /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/patches/aac-configure.dpatch
44
 
--- /tmp/R0YexM59jo/gtkpod-0.99.10/debian/patches/aac-configure.dpatch  1970-01-01 10:00:00.000000000 +1000
45
 
+++ /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/patches/aac-configure.dpatch      2007-07-17 18:25:15.000000000 +1000
 
56
+disable-mp4-grouping
 
57
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/01_mountpoint.dpatch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/01_mountpoint.dpatch
 
58
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/01_mountpoint.dpatch  2007-11-20 02:24:30.000000000 -0500
 
59
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/01_mountpoint.dpatch      2007-11-20 02:24:30.000000000 -0500
 
60
@@ -5,9 +5,9 @@
 
61
 ## DP: No description.
 
62
 
 
63
 @DPATCH@
 
64
-diff -urNad trunk~/README trunk/README
 
65
---- trunk~/README      2007-11-18 16:47:22.000000000 +0100
 
66
-+++ trunk/README       2007-11-18 16:48:21.000000000 +0100
 
67
+diff -urNad gtkpod-aac-0.99.10~/README gtkpod-aac-0.99.10/README
 
68
+--- gtkpod-aac-0.99.10~/README 2007-11-20 01:41:04.000000000 -0500
 
69
++++ gtkpod-aac-0.99.10/README  2007-11-20 02:15:23.000000000 -0500
 
70
 @@ -52,7 +52,7 @@
 
71
  1) If your iPod is not mounted automatically when connecting it to
 
72
     your computer follow steps 1-7 in the "Connecting your iPod to a
 
73
@@ -154,9 +154,9 @@
 
74
  ------------------------------- End Here -----------------------------------
 
75
  
 
76
  
 
77
-diff -urNad trunk~/scripts/sync-abook.sh trunk/scripts/sync-abook.sh
 
78
---- trunk~/scripts/sync-abook.sh       2007-11-18 16:28:19.000000000 +0100
 
79
-+++ trunk/scripts/sync-abook.sh        2007-11-18 16:48:16.000000000 +0100
 
80
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-abook.sh gtkpod-aac-0.99.10/scripts/sync-abook.sh
 
81
+--- gtkpod-aac-0.99.10~/scripts/sync-abook.sh  2007-11-20 01:41:04.000000000 -0500
 
82
++++ gtkpod-aac-0.99.10/scripts/sync-abook.sh   2007-11-20 02:15:23.000000000 -0500
 
83
 @@ -9,7 +9,7 @@
 
84
  #
 
85
  # with the following defaults: 
 
86
@@ -166,9 +166,9 @@
 
87
  DATAFILE='~/.abook/addressbook'                       # the abook db
 
88
  ENCODING_FROM=UTF-8                             # encoding used by abook
 
89
  ENCODING=ISO-8859-15                            # encoding used by ipod
 
90
-diff -urNad trunk~/scripts/sync-evocalendar.sh trunk/scripts/sync-evocalendar.sh
 
91
---- trunk~/scripts/sync-evocalendar.sh 2007-11-18 16:28:23.000000000 +0100
 
92
-+++ trunk/scripts/sync-evocalendar.sh  2007-11-18 16:48:16.000000000 +0100
 
93
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh
 
94
+--- gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh    2007-11-20 01:41:04.000000000 -0500
 
95
++++ gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh     2007-11-20 02:15:23.000000000 -0500
 
96
 @@ -10,7 +10,7 @@
 
97
  #
 
98
  # with the following defaults: 
 
99
@@ -178,9 +178,9 @@
 
100
  
 
101
  #the path to a script that will be passed the ical information from STDIN and filter, if needed
 
102
  #FILTER_SCRIPT=
 
103
-diff -urNad trunk~/scripts/sync-evolution.sh trunk/scripts/sync-evolution.sh
 
104
---- trunk~/scripts/sync-evolution.sh   2007-11-18 16:28:26.000000000 +0100
 
105
-+++ trunk/scripts/sync-evolution.sh    2007-11-18 16:48:16.000000000 +0100
 
106
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evolution.sh gtkpod-aac-0.99.10/scripts/sync-evolution.sh
 
107
+--- gtkpod-aac-0.99.10~/scripts/sync-evolution.sh      2007-11-20 01:41:04.000000000 -0500
 
108
++++ gtkpod-aac-0.99.10/scripts/sync-evolution.sh       2007-11-20 02:15:23.000000000 -0500
 
109
 @@ -13,7 +13,7 @@
 
110
  #
 
111
  # with the following defaults: 
 
112
@@ -190,9 +190,9 @@
 
113
  EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin'                        # additional path
 
114
  ENCODING=ISO-8859-15         # encoding used by ipod
 
115
  
 
116
-diff -urNad trunk~/scripts/sync-kaddressbook.sh trunk/scripts/sync-kaddressbook.sh
 
117
---- trunk~/scripts/sync-kaddressbook.sh        2007-11-18 16:28:29.000000000 +0100
 
118
-+++ trunk/scripts/sync-kaddressbook.sh 2007-11-18 16:48:16.000000000 +0100
 
119
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh
 
120
+--- gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh   2007-11-20 01:41:04.000000000 -0500
 
121
++++ gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh    2007-11-20 02:15:23.000000000 -0500
 
122
 @@ -9,7 +9,7 @@
 
123
  #
 
124
  # with the following defaults: 
 
125
@@ -202,9 +202,9 @@
 
126
  DATAFILE=~/.kde/share/apps/kabc/std.vcf       # vcard file
 
127
  ENCODING=ISO-8859-15                          # encoding used by ipod
 
128
  
 
129
-diff -urNad trunk~/scripts/sync-korganizer.sh trunk/scripts/sync-korganizer.sh
 
130
---- trunk~/scripts/sync-korganizer.sh  2007-11-18 16:28:35.000000000 +0100
 
131
-+++ trunk/scripts/sync-korganizer.sh   2007-11-18 16:48:16.000000000 +0100
 
132
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh gtkpod-aac-0.99.10/scripts/sync-korganizer.sh
 
133
+--- gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh     2007-11-20 01:41:04.000000000 -0500
 
134
++++ gtkpod-aac-0.99.10/scripts/sync-korganizer.sh      2007-11-20 02:15:23.000000000 -0500
 
135
 @@ -9,7 +9,7 @@
 
136
  #
 
137
  # with the following defaults: 
 
138
@@ -214,9 +214,9 @@
 
139
  DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file
 
140
  ENCODING=ISO-8859-15                          # encoding used by ipod
 
141
  
 
142
-diff -urNad trunk~/scripts/sync-ldif.sh trunk/scripts/sync-ldif.sh
 
143
---- trunk~/scripts/sync-ldif.sh        2007-11-18 16:28:40.000000000 +0100
 
144
-+++ trunk/scripts/sync-ldif.sh 2007-11-18 16:48:16.000000000 +0100
 
145
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-ldif.sh gtkpod-aac-0.99.10/scripts/sync-ldif.sh
 
146
+--- gtkpod-aac-0.99.10~/scripts/sync-ldif.sh   2007-11-20 01:41:04.000000000 -0500
 
147
++++ gtkpod-aac-0.99.10/scripts/sync-ldif.sh    2007-11-20 02:15:23.000000000 -0500
 
148
 @@ -15,7 +15,7 @@
 
149
  # differently...This is still Chinese for me!! :)
 
150
  
 
151
@@ -226,9 +226,9 @@
 
152
  declare LDIFILE=addressbook.ldif      # default filename 'addressbook.ldif'
 
153
  declare ENCODING=ISO-8859-15            # To try others encodings : 'iconv --list'
 
154
  declare DELETE="NO"                   # To delete old .vcf files by default? 'NO'!!
 
155
-diff -urNad trunk~/scripts/sync-thunderbird-nano.sh trunk/scripts/sync-thunderbird-nano.sh
 
156
---- trunk~/scripts/sync-thunderbird-nano.sh    2007-11-18 16:28:43.000000000 +0100
 
157
-+++ trunk/scripts/sync-thunderbird-nano.sh     2007-11-18 16:48:16.000000000 +0100
 
158
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh
 
159
+--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh       2007-11-20 01:41:04.000000000 -0500
 
160
++++ gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh        2007-11-20 02:15:23.000000000 -0500
 
161
 @@ -25,7 +25,7 @@
 
162
  
 
163
  # with the following defaults: 
 
164
@@ -238,9 +238,9 @@
 
165
  ENCODING=ISO-8859-15         # encoding used by ipod
 
166
  NAME=thunderbird             # default file export name
 
167
  FILE_FLAG=''               # flag used to determine end of file
 
168
-diff -urNad trunk~/scripts/sync-thunderbird.sh trunk/scripts/sync-thunderbird.sh
 
169
---- trunk~/scripts/sync-thunderbird.sh 2007-11-18 16:28:46.000000000 +0100
 
170
-+++ trunk/scripts/sync-thunderbird.sh  2007-11-18 16:48:16.000000000 +0100
 
171
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh
 
172
+--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh    2007-11-20 01:41:04.000000000 -0500
 
173
++++ gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh     2007-11-20 02:15:23.000000000 -0500
 
174
 @@ -18,7 +18,7 @@
 
175
  
 
176
  # with the following defaults: 
 
177
@@ -250,9 +250,9 @@
 
178
  ENCODING=ISO-8859-15         # encoding used by ipod
 
179
  NAME=thunderbird             # default file export name
 
180
  
 
181
-diff -urNad trunk~/scripts/sync-webcalendar.sh trunk/scripts/sync-webcalendar.sh
 
182
---- trunk~/scripts/sync-webcalendar.sh 2007-11-18 16:28:52.000000000 +0100
 
183
-+++ trunk/scripts/sync-webcalendar.sh  2007-11-18 16:48:16.000000000 +0100
 
184
+diff -urNad gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh
 
185
+--- gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh    2007-11-20 01:41:04.000000000 -0500
 
186
++++ gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh     2007-11-20 02:15:23.000000000 -0500
 
187
 @@ -9,7 +9,7 @@
 
188
  # with the following defaults:
 
189
  
 
190
@@ -262,3 +262,15 @@
 
191
  # uri for webcalendar (example)
 
192
  DATAFILE='https://somewhere.local/calendar.ics'
 
193
  # calendar name
 
194
+diff -urNad gtkpod-aac-0.99.10~/src/prefs.c gtkpod-aac-0.99.10/src/prefs.c
 
195
+--- gtkpod-aac-0.99.10~/src/prefs.c    2007-11-20 02:14:59.000000000 -0500
 
196
++++ gtkpod-aac-0.99.10/src/prefs.c     2007-11-20 02:15:42.000000000 -0500
 
197
+@@ -178,7 +178,7 @@
 
198
+     prefs_set_int("delete_file", TRUE);
 
199
+     prefs_set_int("delete_local_file", TRUE);
 
200
+     prefs_set_int("delete_database", TRUE);
 
201
+-    prefs_set_string("initial_mountpoint", "/mnt/ipod");
 
202
+     prefs_set_string ("path_play_now", "xmms %s");
 
203
+     prefs_set_string ("path_play_enqueue", "xmms -e %s");
 
204
+     prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");
 
205
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/aac-configure.dpatch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/aac-configure.dpatch
 
206
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/aac-configure.dpatch  1969-12-31 19:00:00.000000000 -0500
 
207
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/aac-configure.dpatch      2007-11-20 02:24:30.000000000 -0500
46
208
@@ -0,0 +1,19 @@
47
209
+#! /bin/sh /usr/share/dpatch/dpatch-run
48
210
+## aac-configure.dpatch by Timo Aaltonen <tjaalton@cc.hut.fi>
63
226
+  VERSION=0.99.10
64
227
+ 
65
228
+ 
66
 
diff -Nru /tmp/R0YexM59jo/gtkpod-0.99.10/debian/rules /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/rules
67
 
--- /tmp/R0YexM59jo/gtkpod-0.99.10/debian/rules 2007-07-17 18:25:15.000000000 +1000
68
 
+++ /tmp/KLRj8SYh3Y/gtkpod-aac-0.99.10/debian/rules     2007-07-17 18:25:15.000000000 +1000
69
 
@@ -1,5 +1,7 @@
 
229
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/disable-mp4-grouping.dpatch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/disable-mp4-grouping.dpatch
 
230
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/disable-mp4-grouping.dpatch   1969-12-31 19:00:00.000000000 -0500
 
231
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/disable-mp4-grouping.dpatch       2007-11-20 02:24:30.000000000 -0500
 
232
@@ -0,0 +1,113 @@
 
233
+#! /bin/sh /usr/share/dpatch/dpatch-run
 
234
+## 02-disable-mp4-grouping.dpatch by  <jdong@ubuntu.com>
 
235
+##
 
236
+## All lines beginning with `## DP:' are a description of the patch.
 
237
+## DP: modify m4 handler to support current Ubuntu mp4 library and
 
238
+## DP: update the build system to link properly
 
239
+
 
240
+@DPATCH@
 
241
+diff -urNad gtkpod-aac-0.99.10~/configure gtkpod-aac-0.99.10/configure
 
242
+--- gtkpod-aac-0.99.10~/configure      2007-11-04 21:46:35.000000000 -0500
 
243
++++ gtkpod-aac-0.99.10/configure       2007-11-04 21:46:35.000000000 -0500
 
244
+@@ -8380,9 +8380,9 @@
 
245
+ 
 
246
+ 
 
247
+ 
 
248
+-{ echo "$as_me:$LINENO: checking for library containing MP4GetMetadataGrouping" >&5
 
249
+-echo $ECHO_N "checking for library containing MP4GetMetadataGrouping... $ECHO_C" >&6; }
 
250
+-if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then
 
251
++{ echo "$as_me:$LINENO: checking for library containing MP4FileInfo" >&5
 
252
++echo $ECHO_N "checking for library containing MP4FileInfo... $ECHO_C" >&6; }
 
253
++if test "${ac_cv_search_MP4FileInfo+set}" = set; then
 
254
+   echo $ECHO_N "(cached) $ECHO_C" >&6
 
255
+ else
 
256
+   ac_func_search_save_LIBS=$LIBS
 
257
+@@ -8399,11 +8399,11 @@
 
258
+ #ifdef __cplusplus
 
259
+ extern "C"
 
260
+ #endif
 
261
+-char MP4GetMetadataGrouping ();
 
262
++char MP4FileInfo ();
 
263
+ int
 
264
+ main ()
 
265
+ {
 
266
+-return MP4GetMetadataGrouping ();
 
267
++return MP4FileInfo ();
 
268
+   ;
 
269
+   return 0;
 
270
+ }
 
271
+@@ -8433,7 +8433,7 @@
 
272
+        test ! -s conftest.err
 
273
+        } && test -s conftest$ac_exeext &&
 
274
+        $as_test_x conftest$ac_exeext; then
 
275
+-  ac_cv_search_MP4GetMetadataGrouping=$ac_res
 
276
+ else
 
277
+   echo "$as_me: failed program was:" >&5
 
278
+ sed 's/^/| /' conftest.$ac_ext >&5
 
279
+@@ -8443,21 +8443,21 @@
 
280
+ 
 
281
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
282
+       conftest$ac_exeext
 
283
+-  if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then
 
284
+   break
 
285
+ fi
 
286
+ done
 
287
+-if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then
 
288
++if test "${ac_cv_search_MP4FileInfo+set}" = set; then
 
289
+   :
 
290
+ else
 
291
+-  ac_cv_search_MP4GetMetadataGrouping=no
 
292
+ fi
 
293
+ rm conftest.$ac_ext
 
294
+ LIBS=$ac_func_search_save_LIBS
 
295
+ fi
 
296
+-{ echo "$as_me:$LINENO: result: $ac_cv_search_MP4GetMetadataGrouping" >&5
 
297
+-echo "${ECHO_T}$ac_cv_search_MP4GetMetadataGrouping" >&6; }
 
298
+-ac_res=$ac_cv_search_MP4GetMetadataGrouping
 
299
++{ echo "$as_me:$LINENO: result: $ac_cv_search_MP4FileInfo" >&5
 
300
++echo "${ECHO_T}$ac_cv_search_MP4FileInfo" >&6; }
 
301
++ac_res=$ac_cv_search_MP4FileInfo
 
302
+ if test "$ac_res" != no; then
 
303
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
304
+   if test "${ac_cv_header_mp4_h+set}" = set; then
 
305
+diff -urNad gtkpod-aac-0.99.10~/configure.in gtkpod-aac-0.99.10/configure.in
 
306
+--- gtkpod-aac-0.99.10~/configure.in   2007-11-04 21:38:38.000000000 -0500
 
307
++++ gtkpod-aac-0.99.10/configure.in    2007-11-04 21:46:35.000000000 -0500
 
308
+@@ -137,7 +137,7 @@
 
309
+ 
 
310
+ 
 
311
+ dnl Check for libmp4v2 (and mp4.h)
 
312
+-AC_SEARCH_LIBS(MP4GetMetadataGrouping,
 
313
++AC_SEARCH_LIBS(MP4FileInfo,
 
314
+       ["mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"],
 
315
+       [AC_CHECK_HEADER(mp4.h,
 
316
+         [have_mp4v2="yes -- will build with aac support" AC_DEFINE_UNQUOTED(HAVE_LIBMP4V2, 1, ["Define to 1 if you have the mp4v2 library"])],
 
317
+diff -urNad gtkpod-aac-0.99.10~/src/mp4file.c gtkpod-aac-0.99.10/src/mp4file.c
 
318
+--- gtkpod-aac-0.99.10~/src/mp4file.c  2007-11-04 21:38:38.000000000 -0500
 
319
++++ gtkpod-aac-0.99.10/src/mp4file.c   2007-11-04 21:47:20.000000000 -0500
 
320
+@@ -344,11 +344,6 @@
 
321
+                       track->cd_nr = numvalue;
 
322
+                       track->cds = numvalue2;
 
323
+                   }
 
324
+-                  if (MP4GetMetadataGrouping(mp4File, &value) && value != NULL)
 
325
+-                  {
 
326
+-                      track->grouping = charset_to_utf8 (value);
 
327
+-                      g_free (value);
 
328
+-                  }
 
329
+                   if (MP4GetMetadataGenre(mp4File, &value) && value != NULL)
 
330
+                   {
 
331
+                       track->genre = charset_to_utf8 (value);
 
332
+@@ -485,10 +480,6 @@
 
333
+ 
 
334
+           MP4SetMetadataTempo (mp4File, track->BPM);
 
335
+ 
 
336
+-          value = charset_from_utf8 (track->grouping);
 
337
+-          MP4SetMetadataGrouping (mp4File, value);
 
338
+-          g_free (value);
 
339
+-
 
340
+           value = charset_from_utf8 (track->genre);
 
341
+           MP4SetMetadataGenre (mp4File, value);
 
342
+           g_free (value);
 
343
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/rules /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/rules
 
344
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/rules 2007-11-20 02:24:30.000000000 -0500
 
345
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/rules     2007-11-20 02:24:30.000000000 -0500
 
346
@@ -1,32 +1,33 @@
70
347
 #!/usr/bin/make -f
71
348
 
72
349
+include /usr/share/dpatch/dpatch.make
74
354
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
75
355
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
76
356
 
77
 
@@ -17,14 +19,15 @@
 
357
 CFLAGS = -Wall -g
 
358
 
 
359
-include /usr/share/dpatch/dpatch.make
 
360
-
 
361
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 
362
        CFLAGS += -O0
 
363
 else
 
364
        CFLAGS += -O2
 
365
 endif
 
366
 
 
367
-config.status: patch configure
 
368
+config.status: configure
 
369
        dh_testdir
 
370
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
78
371
 
79
372
 build: build-stamp
80
373
 
86
379
        pod2man --release "gtkpod 0.99.10" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1
87
380
        touch build-stamp
88
381
 
89
 
-clean:
 
382
-clean: unpatch
90
383
+clean: clean-patched unpatch
91
384
+clean-patched:
92
385
        dh_testdir
93
386
        dh_testroot
94
387
        rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade*
95
 
@@ -36,7 +39,7 @@
 
388
@@ -38,7 +39,7 @@
96
389
        dh_testroot
97
390
        dh_clean -k
98
391
        dh_installdirs
101
394
 
102
395
 binary-indep: build install
103
396
 
 
397
@@ -51,6 +52,7 @@
 
398
        dh_installman gtkpod.1
 
399
        dh_install
 
400
        dh_desktop
 
401
+       dh_icons
 
402
        dh_link
 
403
        dh_strip
 
404
        dh_compress
 
405
diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/watch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/watch
 
406
--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/watch 2007-11-20 02:24:30.000000000 -0500
 
407
+++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/watch     2007-11-20 02:24:30.000000000 -0500
 
408
@@ -1,3 +1,3 @@
 
409
 version=3
 
410
 # yes, this is to avoid sf's perverse mirror system
 
411
-http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz
 
412
+http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz debian uupdate