1 diff -ruN dpkg-1.15.5.6.orig/dselect/Makefile.in dpkg-1.15.5.6/dselect/Makefile.in
2 --- dpkg-1.15.5.6.orig/dselect/Makefile.in 2010-01-08 20:02:49.000000000 +0200
3 +++ dpkg-1.15.5.6/dselect/Makefile.in 2010-02-14 10:11:43.052023614 +0200
6 -DLOCALEDIR=\"$(localedir)\" \
7 -DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
8 - -DLOCALLIBDIR=\"/usr/local/lib/dpkg\" \
9 + -DLOCALLIBDIR=\"/usr/local/share/dpkg\" \
10 -idirafter $(top_srcdir)/lib/compat \
13 diff -ruN dpkg-1.15.5.6.orig/dselect/methods/Debian/Dselect/Ftp.pm dpkg-1.15.5.6/dselect/methods/Debian/Dselect/Ftp.pm
14 --- dpkg-1.15.5.6.orig/dselect/methods/Debian/Dselect/Ftp.pm 2010-01-08 10:00:34.000000000 +0200
15 +++ dpkg-1.15.5.6/dselect/methods/Debian/Dselect/Ftp.pm 2010-02-14 09:16:24.669895188 +0200
20 - if (-f '/usr/lib/dpkg/methods/ftp/README.mirrors.txt') {
21 - system('/usr/bin/pager', '/usr/lib/dpkg/methods/ftp/README.mirrors.txt');
22 - } elsif (-f '/usr/lib/dpkg/methods/ftp/README.mirrors.txt.gz') {
23 - system('gzip -dc /usr/lib/dpkg/methods/ftp/README.mirrors.txt.gz | pager');
24 + if (-f '/usr/share/dpkg/methods/ftp/README.mirrors.txt') {
25 + system('/usr/bin/pager', '/usr/share/dpkg/methods/ftp/README.mirrors.txt');
26 + } elsif (-f '/usr/share/dpkg/methods/ftp/README.mirrors.txt.gz') {
27 + system('gzip -dc /usr/share/dpkg/methods/ftp/README.mirrors.txt.gz | pager');
29 - print "/usr/lib/dpkg/methods/ftp/README.mirrors.txt(.gz): file not found.\n";
30 + print "/usr/share/dpkg/methods/ftp/README.mirrors.txt(.gz): file not found.\n";
34 diff -ruN dpkg-1.15.5.6.orig/man/de/dpkg-parsechangelog.1 dpkg-1.15.5.6/man/de/dpkg-parsechangelog.1
35 --- dpkg-1.15.5.6.orig/man/de/dpkg-parsechangelog.1 2010-01-08 20:05:23.000000000 +0200
36 +++ dpkg-1.15.5.6/man/de/dpkg-parsechangelog.1 2010-02-14 09:22:07.409881825 +0200
38 \fB\-L\fP\fIlibverzeichnis\fP
39 Spezifiziere ein zusätzliches Verzeichnis, dass nach Parser\-Skripten
40 durchsucht werden soll. Diese Verzeichnis wird vor den
41 -Standardverzeichnissen (derzeit \fB/usr/local/lib/dpkg/parsechangelog\fP und
42 -\fB/usr/lib/dpkg/parsechangelog\fP) durchsucht.
43 +Standardverzeichnissen (derzeit \fB/usr/local/share/dpkg/parsechangelog\fP und
44 +\fB/usr/share/dpkg/parsechangelog\fP) durchsucht.
46 \fB\-h\fP, \fB\-\-help\fP
47 Zeige den Bedienungshinweis und beende.
48 diff -ruN dpkg-1.15.5.6.orig/man/dpkg-parsechangelog.1 dpkg-1.15.5.6/man/dpkg-parsechangelog.1
49 --- dpkg-1.15.5.6.orig/man/dpkg-parsechangelog.1 2010-01-08 10:00:34.000000000 +0200
50 +++ dpkg-1.15.5.6/man/dpkg-parsechangelog.1 2010-02-14 09:17:34.013861295 +0200
52 Specify an additional directory to search for parser scripts.
53 This directory is searched before the default directories
55 -.BR /usr/local/lib/dpkg/parsechangelog " and "
56 -.BR /usr/lib/dpkg/parsechangelog .
57 +.BR /usr/share/dpkg/parsechangelog " and "
58 +.BR /usr/local/share/dpkg/parsechangelog .
61 Show the usage message and exit.
62 diff -ruN dpkg-1.15.5.6.orig/man/fr/dpkg-parsechangelog.1 dpkg-1.15.5.6/man/fr/dpkg-parsechangelog.1
63 --- dpkg-1.15.5.6.orig/man/fr/dpkg-parsechangelog.1 2010-01-08 20:05:23.000000000 +0200
64 +++ dpkg-1.15.5.6/man/fr/dpkg-parsechangelog.1 2010-02-14 09:22:29.321880079 +0200
66 \fB\-L\fP\fIrep_lib\fP
67 Spécifie un répertoire supplémentaire pour la recherche de scripts
68 d'analyse. Ce répertoire est examiné avant les répertoires par défaut qui
69 -sont \fB/usr/local/lib/dpkg/parsechangelog\fP et
70 -\fB/usr/lib/dpkg/parsechangelog\fP.
71 +sont \fB/usr/local/share/dpkg/parsechangelog\fP et
72 +\fB/usr/share/dpkg/parsechangelog\fP.
74 \fB\-h\fP, \fB\-\-help\fP
75 Affiche un message d'aide puis quitte.
76 diff -ruN dpkg-1.15.5.6.orig/man/pl/dpkg-parsechangelog.1 dpkg-1.15.5.6/man/pl/dpkg-parsechangelog.1
77 --- dpkg-1.15.5.6.orig/man/pl/dpkg-parsechangelog.1 2010-01-08 20:05:23.000000000 +0200
78 +++ dpkg-1.15.5.6/man/pl/dpkg-parsechangelog.1 2010-02-14 09:21:02.338880496 +0200
80 \fB\-L\fP\fIkatalog\-lib\fP
81 Okre¶la dodatkowy katalog, w którym bêd± wyszukiwane skrypty
82 parsera. Katalog ten jest przeszukiwany przed domy¶lnymi katalogami, którymi
83 -obecnie s± \fB/usr/local/lib/dpkg/parsechangelog\fP oraz
84 -\fB/usr/lib/dpkg/parsechangelog\fP.
85 +obecnie s± \fB/usr/local/share/dpkg/parsechangelog\fP oraz
86 +\fB/usr/share/dpkg/parsechangelog\fP.
88 \fB\-h\fP, \fB\-\-help\fP
89 Wy¶wietla informacjê o u¿ytkowaniu i koñczy dzia³anie.
90 diff -ruN dpkg-1.15.5.6.orig/man/po/de.po dpkg-1.15.5.6/man/po/de.po
91 --- dpkg-1.15.5.6.orig/man/po/de.po 2010-01-08 20:05:23.000000000 +0200
92 +++ dpkg-1.15.5.6/man/po/de.po 2010-02-14 09:26:20.671868793 +0200
93 @@ -7747,12 +7747,12 @@
95 "Specify an additional directory to search for parser scripts. This "
96 "directory is searched before the default directories which are currently B</"
97 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
98 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
100 "Spezifiziere ein zusätzliches Verzeichnis, dass nach Parser-Skripten "
101 "durchsucht werden soll. Diese Verzeichnis wird vor den "
102 -"Standardverzeichnissen (derzeit B</usr/local/lib/dpkg/parsechangelog> und B</"
103 -"usr/lib/dpkg/parsechangelog>) durchsucht."
104 +"Standardverzeichnissen (derzeit B</usr/local/share/dpkg/parsechangelog> und B</"
105 +"usr/share/dpkg/parsechangelog>) durchsucht."
108 #: dpkg-parsechangelog.1:39
109 diff -ruN dpkg-1.15.5.6.orig/man/po/dpkg-man.pot dpkg-1.15.5.6/man/po/dpkg-man.pot
110 --- dpkg-1.15.5.6.orig/man/po/dpkg-man.pot 2010-01-08 19:23:01.000000000 +0200
111 +++ dpkg-1.15.5.6/man/po/dpkg-man.pot 2010-02-14 09:30:59.909878930 +0200
112 @@ -6216,7 +6216,7 @@
114 "Specify an additional directory to search for parser scripts. This "
115 "directory is searched before the default directories which are currently "
116 -"B</usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
117 +"B</usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
121 diff -ruN dpkg-1.15.5.6.orig/man/po/es.po dpkg-1.15.5.6/man/po/es.po
122 --- dpkg-1.15.5.6.orig/man/po/es.po 2010-01-08 20:05:23.000000000 +0200
123 +++ dpkg-1.15.5.6/man/po/es.po 2010-02-14 09:30:16.053872999 +0200
124 @@ -7517,7 +7517,7 @@
126 "Specify an additional directory to search for parser scripts. This "
127 "directory is searched before the default directories which are currently B</"
128 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
129 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
133 diff -ruN dpkg-1.15.5.6.orig/man/po/fr.po dpkg-1.15.5.6/man/po/fr.po
134 --- dpkg-1.15.5.6.orig/man/po/fr.po 2010-01-08 20:05:23.000000000 +0200
135 +++ dpkg-1.15.5.6/man/po/fr.po 2010-02-14 09:24:19.351874142 +0200
136 @@ -7737,11 +7737,11 @@
138 "Specify an additional directory to search for parser scripts. This "
139 "directory is searched before the default directories which are currently B</"
140 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
141 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
143 "Spécifie un répertoire supplémentaire pour la recherche de scripts "
144 "d'analyse. Ce répertoire est examiné avant les répertoires par défaut qui "
145 -"sont B</usr/local/lib/dpkg/parsechangelog> et B</usr/lib/dpkg/"
146 +"sont B</usr/local/share/dpkg/parsechangelog> et B</usr/share/dpkg/"
150 diff -ruN dpkg-1.15.5.6.orig/man/po/hu.po dpkg-1.15.5.6/man/po/hu.po
151 --- dpkg-1.15.5.6.orig/man/po/hu.po 2010-01-08 20:05:23.000000000 +0200
152 +++ dpkg-1.15.5.6/man/po/hu.po 2010-02-14 09:26:50.311874455 +0200
153 @@ -6542,7 +6542,7 @@
155 "Specify an additional directory to search for parser scripts. This "
156 "directory is searched before the default directories which are currently B</"
157 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
158 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
162 diff -ruN dpkg-1.15.5.6.orig/man/po/ja.po dpkg-1.15.5.6/man/po/ja.po
163 --- dpkg-1.15.5.6.orig/man/po/ja.po 2010-01-08 20:05:23.000000000 +0200
164 +++ dpkg-1.15.5.6/man/po/ja.po 2010-02-14 09:28:46.064874305 +0200
165 @@ -7055,7 +7055,7 @@
167 "Specify an additional directory to search for parser scripts. This "
168 "directory is searched before the default directories which are currently B</"
169 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
170 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
174 diff -ruN dpkg-1.15.5.6.orig/man/po/pl.po dpkg-1.15.5.6/man/po/pl.po
175 --- dpkg-1.15.5.6.orig/man/po/pl.po 2010-01-08 20:05:23.000000000 +0200
176 +++ dpkg-1.15.5.6/man/po/pl.po 2010-02-14 09:27:38.024873694 +0200
177 @@ -7819,11 +7819,11 @@
179 "Specify an additional directory to search for parser scripts. This "
180 "directory is searched before the default directories which are currently B</"
181 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
182 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
184 "Określa dodatkowy katalog, w którym będą wyszukiwane skrypty parsera. "
185 "Katalog ten jest przeszukiwany przed domyślnymi katalogami, którymi obecnie "
186 -"są B</usr/local/lib/dpkg/parsechangelog> oraz B</usr/lib/dpkg/"
187 +"są B</usr/local/share/dpkg/parsechangelog> oraz B</usr/share/dpkg/"
191 diff -ruN dpkg-1.15.5.6.orig/man/po/pt_BR.po dpkg-1.15.5.6/man/po/pt_BR.po
192 --- dpkg-1.15.5.6.orig/man/po/pt_BR.po 2010-01-08 20:05:23.000000000 +0200
193 +++ dpkg-1.15.5.6/man/po/pt_BR.po 2010-02-14 09:28:12.583874117 +0200
194 @@ -6687,7 +6687,7 @@
196 "Specify an additional directory to search for parser scripts. This "
197 "directory is searched before the default directories which are currently B</"
198 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
199 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
203 diff -ruN dpkg-1.15.5.6.orig/man/po/ru.po dpkg-1.15.5.6/man/po/ru.po
204 --- dpkg-1.15.5.6.orig/man/po/ru.po 2010-01-08 20:05:23.000000000 +0200
205 +++ dpkg-1.15.5.6/man/po/ru.po 2010-02-14 09:25:17.556873843 +0200
206 @@ -6823,7 +6823,7 @@
208 "Specify an additional directory to search for parser scripts. This "
209 "directory is searched before the default directories which are currently B</"
210 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
211 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
215 diff -ruN dpkg-1.15.5.6.orig/man/po/sv.po dpkg-1.15.5.6/man/po/sv.po
216 --- dpkg-1.15.5.6.orig/man/po/sv.po 2010-01-08 20:05:23.000000000 +0200
217 +++ dpkg-1.15.5.6/man/po/sv.po 2010-02-14 09:29:32.735874132 +0200
218 @@ -7552,11 +7552,11 @@
220 "Specify an additional directory to search for parser scripts. This "
221 "directory is searched before the default directories which are currently B</"
222 -"usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
223 +"usr/local/share/dpkg/parsechangelog> and B</usr/share/dpkg/parsechangelog>."
225 "Ange en ytterligare katalog att söka i efter parserskript. Katalogen söks "
226 -"genom innan standardkatalogerna, vilka för närvarande är B</usr/local/lib/"
227 -"dpkg/parsechangelog> och B</usr/lib/dpkg/parsechangelog>."
228 +"genom innan standardkatalogerna, vilka för närvarande är B</usr/local/share/"
229 +"dpkg/parsechangelog> och B</usr/share/dpkg/parsechangelog>."
232 #: dpkg-parsechangelog.1:39
233 diff -ruN dpkg-1.15.5.6.orig/man/sv/dpkg-parsechangelog.1 dpkg-1.15.5.6/man/sv/dpkg-parsechangelog.1
234 --- dpkg-1.15.5.6.orig/man/sv/dpkg-parsechangelog.1 2010-01-08 20:05:23.000000000 +0200
235 +++ dpkg-1.15.5.6/man/sv/dpkg-parsechangelog.1 2010-02-14 09:22:54.488880085 +0200
237 \fB\-L\fP\fIbibliotekskatalog\fP
238 Ange en ytterligare katalog att söka i efter parserskript. Katalogen söks
239 genom innan standardkatalogerna, vilka för närvarande är
240 -\fB/usr/local/lib/dpkg/parsechangelog\fP och \fB/usr/lib/dpkg/parsechangelog\fP.
241 +\fB/usr/local/share/dpkg/parsechangelog\fP och \fB/usr/share/dpkg/parsechangelog\fP.
243 \fB\-h\fP, \fB\-\-help\fP
244 Visar hjälpskärm och avslutar.
245 diff -ruN dpkg-1.15.5.6.orig/scripts/Dpkg/Changelog/Parse.pm dpkg-1.15.5.6/scripts/Dpkg/Changelog/Parse.pm
246 --- dpkg-1.15.5.6.orig/scripts/Dpkg/Changelog/Parse.pm 2010-01-08 10:00:34.000000000 +0200
247 +++ dpkg-1.15.5.6/scripts/Dpkg/Changelog/Parse.pm 2010-02-14 09:14:27.550879827 +0200
250 The parsing itself is done by an external program (searched in the
251 following list of directories: $opt{libdir},
252 -/usr/local/lib/dpkg/parsechangelog, /usr/lib/dpkg/parsechangelog) That
253 +/usr/local/share/dpkg/parsechangelogusr) That
254 program is named according to the format that it's able to parse. By
255 default it's either "debian" or the format name lookep up in the 40 last
256 lines of the changelog itself (extracted with this perl regular expression
259 sub changelog_parse {
261 - my @parserpath = ("/usr/local/lib/dpkg/parsechangelog",
262 - "$dpkglibdir/parsechangelog",
263 - "/usr/lib/dpkg/parsechangelog");
264 + my @parserpath = ( "$dpkglibdir/parsechangelog",
265 + "/usr/local/share/dpkg/parsechangelog");
266 my $format = "debian";
267 my $changelogfile = "debian/changelog";