Ack android and libpng removals from upstream

debian/README.source

diff --git a/debian/README.source b/debian/README.source
index 5e93ce1..0243761 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -36,6 +36,8 @@ Then we can do the merge:
 
 It can leads to conflicts since some parts of pristine upstream tree have
 been removed in our upstream branch. These removed parts are listed below:
+* navit/android*
+  - unused android port.
 * navit/fonts/*:
   - ttf-liberation is in Debian
 * navit/map/poi_geodownload/libmdb/*:
@@ -45,10 +47,14 @@ been removed in our upstream branch. These removed parts are listed below:
   - embedded glib; not used.
 * navit/support/libc/*:
   - setenv, getenv. No copyright statement; not used.
+* navit/support/libpng
+  - embedded libpng; not used.
 * navit/support/zlib/*:
   - embedded zlib; not used.
 * navit/support/wordexp/*:
   - not used.
+* navit/support/Makefile.am
+  - unused makefile
 * navit/script/*:
 * navit/tools/*:
   - not needed/used