committing changes in /etc made by "apt-get purge --yes libtiff5"

Package changes:
-caca-utils 0.99.beta20-4build2 amd64
-libimlib2 1.7.4-1build1 amd64
-libmagickcore-6.q16-3 8:6.9.7.4+dfsg-16ubuntu6.8 amd64
-libmagickcore-6.q16-3-extra 8:6.9.7.4+dfsg-16ubuntu6.8 amd64
-libmagickwand-6.q16-3 8:6.9.7.4+dfsg-16ubuntu6.8 amd64
-libtiff5 4.3.0-6ubuntu0.10 amd64
-libwxgtk3.0-gtk3-0v5 3.0.5.1+dfsg-4 amd64
-libwxgtk3.0-gtk3-dev 3.0.5.1+dfsg-4 amd64
-obex-data-server 0.4.6-1 amd64
-woeusb 3.3.1-1-g7171bff amd64
-woeusb-build-deps 3.3.1-1-g7171bff all

diff --git a/.etckeeper b/.etckeeper
index 86d1da11217cdbc98ef08df9c170e614f0a09780..510fc3a6f16bc71566d89b92c1519de084a7a220 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2849,9 +2849,6 @@ maybe chmod 0644 'nfs.conf'
 maybe chmod 0755 'nfs.conf.d'
 maybe chmod 0755 'nftables.conf'
 maybe chmod 0644 'nsswitch.conf'
-maybe chmod 0755 'obex-data-server'
-maybe chmod 0644 'obex-data-server/capability.xml'
-maybe chmod 0644 'obex-data-server/imaging_capabilities.xml'
 maybe chmod 0644 'ocamlfind.conf'
 maybe chmod 0755 'openal'
 maybe chmod 0644 'openal/alsoft.conf'

diff --git a/alternatives/wx-config b/alternatives/wx-config
index 75151ea97a24f0e7919adab75c17959610da95ee..0d981ce0207fd2c52fe00660918c5dd480d74053 120000 (symlink)
--- a/alternatives/wx-config
+++ b/alternatives/wx-config
@@ -1 +1 @@
-/usr/lib/x86_64-linux-gnu/wx/config/gtk3-unicode-3.0
\ No newline at end of file
+/usr/lib/x86_64-linux-gnu/wx/config/base-unicode-3.0
\ No newline at end of file

diff --git a/mailcap b/mailcap
index fd0729cbaa50af3730de9ee4aa6640e73d609d03..e57ce9589f808c78a2336126c33496069e9c7293 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -1322,36 +1322,6 @@ text/troff; /usr/bin/man -Tascii -l %s | col -b; copiousoutput; description=Man
 text/*; less %s; needsterminal
 text/*; view %s; edit=vim %s; compose=vim %s; test=test -x /usr/bin/vim; needsterminal
 text/*; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
-image/gif; /usr/bin/cacaview %s; description=GIF Image; nametemplate=%s.gif; test=test -n "$DISPLAY"
-image/gif; unset DISPLAY\; /usr/bin/cacaview %s; description=GIF Image; nametemplate=%s.gif; needsterminal
-image/jpeg; /usr/bin/cacaview %s; description=JPEG Image; nametemplate=%s.jpg; test=test -n "$DISPLAY"
-image/jpeg; unset DISPLAY\; /usr/bin/cacaview %s; description=JPEG Image; nametemplate=%s.jpg; needsterminal
-image/png; /usr/bin/cacaview %s; description=PNG Image; nametemplate=%s.png; test=test -n "$DISPLAY"
-image/png; unset DISPLAY\; /usr/bin/cacaview %s; description=PNG Image; nametemplate=%s.png; needsterminal
-image/tiff; /usr/bin/cacaview %s; description=TIFF Image; nametemplate=%s.tiff; test=test -n "$DISPLAY"
-image/tiff; unset DISPLAY\; /usr/bin/cacaview %s; description=TIFF Image; nametemplate=%s.tiff; needsterminal
-image/bmp; /usr/bin/cacaview %s; description=BMP Image; nametemplate=%s.bmp; test=test -n "$DISPLAY"
-image/bmp; unset DISPLAY\; /usr/bin/cacaview %s; description=BMP Image; nametemplate=%s.bmp; needsterminal
-image/x-ms-bmp; /usr/bin/cacaview %s; description=BMP Image; nametemplate=%s.bmp; test=test -n "$DISPLAY"
-image/x-ms-bmp; unset DISPLAY\; /usr/bin/cacaview %s; description=BMP Image; nametemplate=%s.bmp; needsterminal
-image/x-cmu-raster; /usr/bin/cacaview %s; description=CMU-RasterFile Image; nametemplate=%s.ras; test=test -n "$DISPLAY"
-image/x-cmu-raster; unset DISPLAY\; /usr/bin/cacaview %s; description=CMU-RasterFile Image; nametemplate=%s.ras; needsterminal
-image/g3fax; /usr/bin/cacaview %s; description=G3-FAX Image; nametemplate=%s.g3; test=test -n "$DISPLAY"
-image/g3fax; unset DISPLAY\; /usr/bin/cacaview %s; description=G3-FAX Image; nametemplate=%s.g3; needsterminal
-image/targa; /usr/bin/cacaview %s; description=TARGA Image; nametemplate=%s.tga; test=test -n "$DISPLAY"
-image/targa; unset DISPLAY\; /usr/bin/cacaview %s; description=TARGA Image; nametemplate=%s.tga; needsterminal
-image/x-portable-bitmap; /usr/bin/cacaview %s; description=PBM Image; nametemplate=%s.pbm; test=test -n "$DISPLAY"
-image/x-portable-bitmap; unset DISPLAY\; /usr/bin/cacaview %s; description=PBM Image; nametemplate=%s.pbm; needsterminal
-image/x-portable-graymap; /usr/bin/cacaview %s; description=PGM Image; nametemplate=%s.pgm; test=test -n "$DISPLAY"
-image/x-portable-graymap; unset DISPLAY\; /usr/bin/cacaview %s; description=PGM Image; nametemplate=%s.pgm; needsterminal
-image/x-portable-anymap; /usr/bin/cacaview %s; description=PNM Image; nametemplate=%s.pnm; test=test -n "$DISPLAY"
-image/x-portable-anymap; unset DISPLAY\; /usr/bin/cacaview %s; description=PNM Image; nametemplate=%s.pnm; needsterminal
-image/x-portable-pixmap; /usr/bin/cacaview %s; description=PPM Image; nametemplate=%s.ppm; test=test -n "$DISPLAY"
-image/x-portable-pixmap; unset DISPLAY\; /usr/bin/cacaview %s; description=PPM Image; nametemplate=%s.ppm; needsterminal
-image/x-rgb; /usr/bin/cacaview %s; description=RGB Image; nametemplate=%s.rgb; test=test -n "$DISPLAY"
-image/x-rgb; unset DISPLAY\; /usr/bin/cacaview %s; description=RGB Image; nametemplate=%s.rgb; needsterminal
-image/x-xpixmap; /usr/bin/cacaview %s; description=XPM Image; nametemplate=%s.xpm; test=test -n "$DISPLAY"
-image/x-xpixmap; unset DISPLAY\; /usr/bin/cacaview %s; description=XPM Image; nametemplate=%s.xpm; needsterminal
 application/x-info; /usr/bin/info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
 application/x-tar; /bin/tar tvf %s; print=/bin/tar tvf - | print text/plain:-; copiousoutput
 application/x-gtar; /bin/tar tvf %s; print=/bin/tar tvf - | print text/plain:-; copiousoutput

diff --git a/obex-data-server/capability.xml b/obex-data-server/capability.xml
deleted file mode 100644 (file)
index 399ae78..0000000
--- a/obex-data-server/capability.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE Capability SYSTEM "obex-capability.dtd">
-<Capability Version="1.0">
-       <General>
-               <Manufacturer>Generic</Manufacturer>
-               <Model>Computer</Model>
-               <SW Version="{$ODS_VER}"/>
-               <Memory>
-                       <MemType>Filesystem</MemType>
-                       <Free>{$MEM_FREE}</Free>
-                       <Used>{$MEM_USED}</Used>
-                       <CaseSenN/>
-               </Memory>
-       </General>
-</Capability>

diff --git a/obex-data-server/imaging_capabilities.xml b/obex-data-server/imaging_capabilities.xml
deleted file mode 100644 (file)
index 9156963..0000000
--- a/obex-data-server/imaging_capabilities.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<imaging-capabilities version="1.0">
-<preferred-format encoding="JPEG"/>
-<image-formats encoding="JPEG" pixel="80*60-65535*65535"/>
-<image-formats encoding="GIF" pixel="80*60-65535*65535"/>
-<image-formats encoding="PNG" pixel="80*60-65535*65535"/>
-</imaging-capabilities>