diff -u mdbtools-0.5.99.0.6pre1.0.20051109/debian/control mdbtools-0.5.99.0.6pre1.0.20051109/debian/control --- mdbtools-0.5.99.0.6pre1.0.20051109/debian/control +++ mdbtools-0.5.99.0.6pre1.0.20051109/debian/control @@ -54,8 +54,8 @@ Architecture: any Section: libs Depends: ${shlibs:Depends} -Conflicts: libmdbtools (< 0.5.99.0.6pre1.0.20051109-2) -Replaces: libmdbtools (< 0.5.99.0.6pre1.0.20051109-2) +Conflicts: libmdbtools (<< 0.5.99.0.6pre1.0.20051109-2) +Replaces: libmdbtools (<< 0.5.99.0.6pre1.0.20051109-2) Description: MDB tools ODBC module This is the software driver to access JET / MS Access database (MDB) files through ODBC. diff -u mdbtools-0.5.99.0.6pre1.0.20051109/debian/changelog mdbtools-0.5.99.0.6pre1.0.20051109/debian/changelog --- mdbtools-0.5.99.0.6pre1.0.20051109/debian/changelog +++ mdbtools-0.5.99.0.6pre1.0.20051109/debian/changelog @@ -1,3 +1,13 @@ +mdbtools (0.5.99.0.6pre1.0.20051109-2.1) unstable; urgency=low + + * NMU + * Fix typo in conflicts/replaces for libmdbodbc. Closes: #354595. + * debian/patches/056-libmdb-data.patch: Fix infinite recursion with infinite + arguments. Closes: #351215. + * Fix Debian menu, add Gnome desktop file. Closes: #234031. + + -- Matthias Klose Sun, 5 Mar 2006 15:53:27 +0000 + mdbtools (0.5.99.0.6pre1.0.20051109-2) unstable; urgency=low * Split out libmdbodbc package. (Closes: #323255) diff -u mdbtools-0.5.99.0.6pre1.0.20051109/debian/rules mdbtools-0.5.99.0.6pre1.0.20051109/debian/rules --- mdbtools-0.5.99.0.6pre1.0.20051109/debian/rules +++ mdbtools-0.5.99.0.6pre1.0.20051109/debian/rules @@ -116,7 +116,12 @@ # dh_installdebconf -a dh_installdocs -a # dh_installexamples -a + mkdir -p debian/mdbtools-gmdb/usr/share/pixmaps + install -m644 debian/gmdb2.xpm debian/mdbtools-gmdb/usr/share/pixmaps/ + mkdir -p debian/mdbtools-gmdb/usr/share/applications + install -m644 debian/mdbtools-gmdb.desktop debian/mdbtools-gmdb/usr/share/applications/ dh_installmenu -a + dh_desktop -a # dh_installlogrotate -a # dh_installemacsen -a # dh_installpam -a diff -u mdbtools-0.5.99.0.6pre1.0.20051109/debian/mdbtools-gmdb.menu mdbtools-0.5.99.0.6pre1.0.20051109/debian/mdbtools-gmdb.menu --- mdbtools-0.5.99.0.6pre1.0.20051109/debian/mdbtools-gmdb.menu +++ mdbtools-0.5.99.0.6pre1.0.20051109/debian/mdbtools-gmdb.menu @@ -6 +6 @@ - hint="MDBtools" + icon="/usr/share/pixmaps/gmdb2.xpm" only in patch2: unchanged: --- mdbtools-0.5.99.0.6pre1.0.20051109.orig/debian/patches/056-libmdb-data.patch +++ mdbtools-0.5.99.0.6pre1.0.20051109/debian/patches/056-libmdb-data.patch @@ -0,0 +1,11 @@ +--- src/libmdb/data.c 2005-04-09 13:17:56.000000000 +0200 ++++ src/libmdb/data.c 2006-02-03 10:24:19.000000000 +0100 +@@ -776,7 +776,7 @@ + if (f < 0.0) + f = -f; + +- if ((f == 0.0) || (f == 1.0)) { ++ if ((f == 0.0) || (f == 1.0) || isinf(f)) { + return 0; + } else if (f < 1.0) { + if (is_single) { only in patch2: unchanged: --- mdbtools-0.5.99.0.6pre1.0.20051109.orig/debian/gmdb2.xpm +++ mdbtools-0.5.99.0.6pre1.0.20051109/debian/gmdb2.xpm @@ -0,0 +1,92 @@ +/* XPM */ +static char * logo_xpm[] = { +"93 73 16 1", +" c None", +". c #B2B2B2", +"+ c #C2C2C2", +"@ c #848484", +"# c #929292", +"$ c #FFFC10", +"% c #E2E2E2", +"& c #D2D2D2", +"* c #A2A2A2", +"= c #6D6D6D", +"- c #3A3A3A", +"; c #F3F164", +"> c #FFFFFF", +", c #F4F4F4", +"' c #ECEB95", +") c #FAF86B", +" + ", +" .#+#. ", +" +@.$$$.@+ ", +" +**%$$$$$@-#+ ", +" *#&$$$$$+=*.-=. ", +" +#+$$$$$%#@&$$=-@+", +" +#.$$$$$%*=+$$+=#@*+", +" +**%$$$$$.=*$$&#@&#** ", +" **&$$$$$+=*$$$##*==*+* ", +" +=+$$$$$%@=$>).=*#-+,&=+ ", +" +**$$$$$%*=.>>+#@*#-#>.@+ ", +" +#*%$$$$$.=.$$&@#*@*+=>.# ", +" .*&$$$$$&=#;$$*@*#@'$=%&@ ", +" +@+$$$$$%@@;$$.=**@&$$**,#+ ", +" +#.$$$$$$*=.$$+##*@.,&$&=,.. ", +" +#.%$$$$$.=.$$;@#*@.%&@#=-&%@ ", +" .@&$$$$$&=#$$$*=.#@'$@@%%==*=+ ", +" .*.$$$$$&#@&$$.##*@.$$@-*.#+ ++ ", +" ++ +@*$$$$$$#=.$$+=##@*$$$+@,-. ", +" +****#* *#&$$$$$.=*$$;@@*@#'$$+.=,+* ", +" +***#@*%+-. .@+$$$$$&@#$$;*=.*=&$$'@##-*# ", +" +.*#------+.-*+ +=@+ +#.$$$$$%#@+$$.@#.=-@#+*=&,.##+ ", +" .**--*%$$$*-&*=-=.@#.*.#.%$$$$$#=+$$+=**@==+%*---##+ ", +" +@.=-@$$$$$$$@->+.%$..%==%$$$$$+=*$$;#@.@*+-#&#. +## ", +" +**@--&$$$$$$$$&-%$$$$*-@+$$$$$&##&$$*@###&,=%@=+ ", +" **#--.$$$$$$$$$$$-+$$$$%.$$$$$$@=+$$.@*#@+$$**>#+ ", +" .*.=-#$$$$$$$$$$$$$=+$$$$$$$$$$.=.$$'##.@*$$$%=,.. ", +" +#.=-=$$$$$$$$$$$$$$$=+$$$$$$$$+=#$$'#@.@@$$$$$=+,@ ", +" .#@--&$$$$$$$$$$$$$$$$-+$$$$$$&@@&$$*@##@+$$$$&@=#@+ ", +" ##--.$$.-*$$$$$$$$$$$$$-.$$$$$@@$$$.=*#@+$$$$$#@&%-# ", +" *#-@$$&@#+#$$$$$$$$$$$$$=.$$$+=.$$'@#.@*$$$$$$#-.+@+ ", +" *@-*$$#@&$&#$$$$$$$$$$$$$=.$$#@'$&#####%$$$$$$+@,-* ", +" +=-.$*=+$$$+@$$$$$$$$$$$$$=+%=*$'@@.##&$$$$$$$$@%&* ", +" @-@$##$$$$*=@$$$$$$$$$$$$$===+&#=..@.$$$$$$$$$@@,*+ ", +" .=-$*@$$$+=++#$$$$$$$$$$$$+--#@#++@*$$$$$$$$$*@@-=. ", +" +@-&&=$$$+=+ +#$$$$$$$$$$$*-=.+&.@#%$$$$$$$$+=.,+@* ", +" *-=$@;$$&= +#$$$$$$$$$$%=%,*==+%$$$$$$$$$*--*#+ ", +" +@-&$#*;$=+ +#$$$$$$$$$$$==-#+#$$$$$$$$$+=*,-- ", +" +--$$$*#=* +#$$$$$$$$$$$+*-+&#$$$$$$$+@#%+*. ", +" *-#$$$$$*=. +#$$$$$$$$$$$$$-.&#$$$$$%@@&,#*+ ", +" +=-&$$$$$$$*@+ +@$$$$$$$$$$$$$-.&@$$$+*=+%.#+ ", +" *-=$$$$$$$$$%##*#$$$$$$$$$$$$$-*&#$+=--*+#+ ", +" @-.$$$$$$$$$$$+#$$$$$$$$$$$$$$-.&-@#&@'*-+ ", +" .@-$+=.$$$$$$$$$$$$$$$$$$$$$$$$-.$@&$$@$$*+ ", +" *-@$=%#@&$$$$$$$$$$$$$$$$$$$$$$-*$$$$'=+$.+ ", +" +#-'.#$$+-@+$$$$$$$$$$$$$$$$$$$$-*$$$.=*@*#+ ", +" +--$@&$$*++##%$$$$$$$$$$$$$$$$$$-*$$=#%$$.-+ ", +" #-.&@$$%# +=$$$$$$$$$$$$$$$$$$-*$=+$$$+#. ", +" +=-'*.$$.. +@$$$*.$$$$$$$$$$$$$-.#*$$$.# ", +" #-@$@$$$#+ @&$$+=@$$$$$$$$$$$$$-#@$$$.* ", +" +=-&&@$$&@ .*$$$=&#$$$$$$$$$$$$+-=&$$+# ", +" .=-$#+$$*+ @%$$*.%#$$$$$$$$$$$$#-@$$$@+ ", +" .-@$=$$$= .+$$%=$%#$$$$$$$$$$$$--.$$.* ", +" .-.$@$$+* +@$$$#.$%#$$$$$$$$$$$+-=%$$#+ ", +"+*-''@$$*+ @+$$&@$$%@$$$$$$$$$$%-=*$$%# ", +"+@-$$=$$@+ +#$$$@&$$+-$$$$$$$$$$@-=%$$.+ ", +"+#-%$#.$#+ #%$$.#$$$==$$$$$$$$$+-=.$$%# ", +"+*-+$$=%*+.*$$$=$$$.##$$$$$$$$%-=@$$$*+ ", +"+.-=$$+=%==%$$#*$$$@ #%$$$$$$+-==$$$+@ ", +" .+-&$$##-.$$&@$$$*+ #%$$$$$@-==%$$%@ ", +" *+=-$$$@#$$$#+$$&# #$$$$+--@=%$$$#+ ", +" @%-=$$$$$$&=$$$@+ =.$$%=-@@@$$$$#+ ", +" +*&-*$$$$$=%$$+=.@'$$@--*@*$$$&@+ ", +" *+*-%$$$.*$$$-=+$$*--@#*%$$$.#+ ", +" @%=-$$$*@+#=*$$&--#@@%$$$+@. ", +" +#%-=$$$*@*$$'@-=*=.$$$&.#+ ", +" +.&-.$$$$$$@-=#@*$$$$*#+ ", +" *+*-*$$$*--#@#%$$$+@+ ", +" @&*-----##@&$$$&#. ", +" +@+%+*.*@.$$$%.#+ ", +" +*==.*.$$$$.*+ ", +" +@#&$$$.@+ ", +" +####. "}; only in patch2: unchanged: --- mdbtools-0.5.99.0.6pre1.0.20051109.orig/debian/mdbtools-gmdb.desktop +++ mdbtools-0.5.99.0.6pre1.0.20051109/debian/mdbtools-gmdb.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=MDB Viewer +Comment=View and export Microsoft Access databases +Exec=gmdb2 +Icon=gmdb2.xpm +Terminal=false +Type=Application +Categories=Application;Office; +StartupNotify=true