18 files changed, 106 insertions, 27 deletions
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 0000000..9ddc8d2
--- /dev/null
+++ b/debian/NEWS.Debian
@@ -0,0 +1,9 @@
+xsane (0.999-7) unstable; urgency=medium
+
+  Upstream stopped working on xsane some time ago. Now the homepage and
+  the archive are offline, too.
+
+  If the situation doesn't change, xsane will be removed before Bullseye
+  is released.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 26 Jul 2019 13:13:58 +0200
+\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 54e1a15..8d0052f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+xsane (0.999-7) unstable; urgency=medium
+
+  * Migrate to debhelper 12:
+    - Change debian/compat to 12.
+    - Bump minimum debhelper version in debian/control to >= 12.
+  * Declare compliance with Debian Policy 4.4.0 (No changes needed).
+  * New debian/NEWS.debian.
+  * Move /usr/share/sane/doc to /usr/share/xsane-common/html
+  * Upstream website is offline:
+    - debian/watch: Comment out URL.
+    - debian/control: Remove homepage.
+  * New debian/patches/0920-add_Name_Comment_pt_BR.patch (Closes: #926959):
+    - Added Name and Comment to pt_BR in xsane.desktop
+      (Thanks to Edson Juliano Drosdeck <edson@policorp.com.br>).
+  * debian/copyright: Add year 2019 to debian/*.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 26 Jul 2019 13:13:58 +0200
+
 xsane (0.999-6) unstable; urgency=medium
 
   * new debian/patches/0915-i18n_typo_geometrie.patch:
diff --git a/debian/compat b/debian/compat
index b4de394..48082f7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+12
diff --git a/debian/control b/debian/control
index b615d82..24af8ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: xsane
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Build-Depends:
- debhelper (>= 11),
+ debhelper (>= 12),
  gettext,
  libgimp2.0-dev,
  libgtk2.0-dev,
@@ -14,7 +14,6 @@ Build-Depends:
  libsane-dev (>= 1.0.27),
  libtiff-dev,
  zlib1g-dev
-Homepage: http://www.xsane.org/
 Vcs-Git: git://jff.email/opt/git/xsane.git
 Vcs-Browser: https://jff.email/cgit/xsane.git
 
diff --git a/debian/copyright b/debian/copyright
index 096e4d4..7baf360 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -65,7 +65,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 1999-2002 Oliver Rauch <Oliver.Rauch@xsane.org>
            2002-2011 Julien BLACHE <jblache@debian.org>
-           2014-2018 Jörg Frings-Fürst <debian@jff.email>
+           2014-2019 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 Files: lib/alloca.c
diff --git a/debian/patches/0920-add_Name_Comment_pt_BR.patch b/debian/patches/0920-add_Name_Comment_pt_BR.patch
new file mode 100644
index 0000000..5d2d0dd
--- /dev/null
+++ b/debian/patches/0920-add_Name_Comment_pt_BR.patch
@@ -0,0 +1,24 @@
+Description: Added Name and Comment to pt_BR in xsane.desktop
+Author: Edson Juliano Drosdeck <edson@policorp.com.br>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926959
+Last-Update: 2019-07-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/src/xsane.desktop
+===================================================================
+--- trunk.orig/src/xsane.desktop
++++ trunk/src/xsane.desktop
+@@ -6,11 +6,13 @@ GenericName[ru]=Программа дл�
+ GenericName[ca]=Programa d'escaneig d'imatges
+ GenericName[es]=Programa de escaneo de imágenes
+ GenericName[fr]=Programme d'acquisition d'images
++GenericName[pt_BR]=Programa de Digitalização de Imagens XSane
+ Comment=A program to work with scanner. Can be used as a scanning, copier, OCR, fax tools.
+ Comment[ru]=Программа для работы со сканером. Может быть использована в качестве копировального аппарата, факса, и др.
+ Comment[ca]=Un programa per a treballar amb escànners. Es pot utilitzar com una eina d'escanejat, copiat, OCR i fax.
+ Comment[es]=Un programa para trabajar con escáners. Se puede utilizar como una herramienta para escanear, copiar, OCR y fax.
+ Comment[fr]=Un programme d'acquisition d'images pour votre scanner. Peut également photocopier, faxer ou faire de la reconnaissance de caractères.
++Comment[pt_BR]=Um programa para trabalhar com digitalizadores de imagens (scanners). Pode ser utilizado para digitalizar, como ferramenta fax, e para fazer reconhecimento de texto.
+ Exec=xsane
+ Icon=xsane
+ Terminal=false
diff --git a/debian/patches/series b/debian/patches/series
index ec70fb1..7de2829 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@
 0010-fix_missing_sane-config.patch
 0915-i18n_typo_geometrie.patch
 0175-icm_profile_field.patch
+0920-add_Name_Comment_pt_BR.patch
diff --git a/debian/rules b/debian/rules
index 9e63675..42fc61f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,6 @@ override_dh_auto_clean:
 	rm -f xsane.spec include/config.h
 	rm -f po/*.gmo
 
-override_dh_auto_install:
-	dh_auto_install
-
-	# remove outdated/useless documentation
-	rm -f debian/tmp/usr/share/sane/xsane/doc/sane-backends-doc.html
-	rm -f debian/tmp/usr/share/sane/xsane/doc/sane-pnm-doc.html
-
 override_dh_install-arch:
 	dh_install
 
@@ -36,3 +29,12 @@ override_dh_install-indep:
 
 override_dh_installchangelogs:
 	dh_installchangelogs xsane.CHANGES
+
+override_dh_installdocs-indep:
+	dh_installdocs
+	mkdir debian/xsane-common/usr/share/doc/xsane-common/html
+	mv debian/xsane-common/usr/share/doc/xsane-common/*.html debian/xsane-common/usr/share/doc/xsane-common/html/
+	mv debian/xsane-common/usr/share/doc/xsane-common/*.jpg debian/xsane-common/usr/share/doc/xsane-common/html/
+	# remove outdated/useless documentation
+	rm -f debian/xsane-common/usr/share/doc/xsane-common/html/sane-backends-doc.html
+	rm -f debian/xsane-common/usr/share/doc/xsane-common/html/sane-pnm-doc.html
diff --git a/debian/watch b/debian/watch
index 9428447..d9adea8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
 version=4
-
-http://xsane.org/download xsane-(.+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+#
+# removed Website offline
+#
+#http://xsane.org/download xsane-(.+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff --git a/debian/xsane-common.dirs b/debian/xsane-common.dirs
deleted file mode 100644
index 8dd0c85..0000000
--- a/debian/xsane-common.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/sane/xsane
diff --git a/debian/xsane-common.doc-base b/debian/xsane-common.doc-base
index 8bbd3b6..4df3e91 100644
--- a/debian/xsane-common.doc-base
+++ b/debian/xsane-common.doc-base
@@ -11,5 +11,5 @@ Abstract: This manual describes how to use xsane as a frontend to
 Section: Graphics
 
 Format: html
-Index: /usr/share/sane/xsane/doc/sane-xsane-doc.html
-Files: /usr/share/sane/xsane/doc/*.html
+Index: /usr/share/doc/xsane-common/html/sane-xsane-doc.html
+Files: /usr/share/doc/xsane-common/html/*.html
diff --git a/debian/xsane-common.docs b/debian/xsane-common.docs
new file mode 100644
index 0000000..6e128ad
--- /dev/null
+++ b/debian/xsane-common.docs
@@ -0,0 +1,2 @@
+doc/*.html
+doc/*.jpg
diff --git a/debian/xsane-common.install b/debian/xsane-common.install
index d18bbb8..3635480 100644
--- a/debian/xsane-common.install
+++ b/debian/xsane-common.install
@@ -1,2 +1 @@
-usr/share/sane/xsane
 usr/share/locale
diff --git a/debian/xsane-common.links b/debian/xsane-common.links
index 7d505be..00c171b 100644
--- a/debian/xsane-common.links
+++ b/debian/xsane-common.links
@@ -1,2 +1 @@
-usr/share/sane/xsane/doc/sane-xsane-doc.html usr/share/sane/xsane/doc/index.html
-usr/share/sane/xsane/doc usr/share/doc/xsane-common/html
+usr/share/doc/xsane-common/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html
diff --git a/debian/xsane-common.preinst b/debian/xsane-common.preinst
new file mode 100644
index 0000000..b319f56
--- /dev/null
+++ b/debian/xsane-common.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+HTMLDOCDIR=/usr/share/doc/xsane-common/html
+
+if [ -d "$HTMLDOCDIR" ] && [ -L "$HTMLDOCDIR" ]; then
+    # Remove old directory and files that are now provided by xsane-common
+    rm -rf "$HTMLDOCDIR"
+fi
+
+
+#DEBHELPER#
diff --git a/debian/xsane.links b/debian/xsane.links
index 46dc8ac..9984384 100644
--- a/debian/xsane.links
+++ b/debian/xsane.links
@@ -1,2 +1 @@
 usr/bin/xsane usr/lib/gimp/2.0/plug-ins/xsane
-usr/share/sane/xsane/doc usr/share/doc/xsane/html
diff --git a/debian/xsane.postinst b/debian/xsane.postinst
index b0b66df..3c74428 100644
--- a/debian/xsane.postinst
+++ b/debian/xsane.postinst
@@ -5,12 +5,12 @@ set -e
 HTMLDOCDIR=/usr/share/doc/xsane/html
 NEWHTMLDOCDIR=../xsane-common/html
 
-if [ -d "$HTMLDOCDIR" ] && [ ! -L "$HTMLDOCDIR" ]; then
-    # Remove old directory and files that are now provided by xsane-common
-    rm -rf "$HTMLDOCDIR"
-    # Create a link to the new directory
-    ln -s "$NEWHTMLDOCDIR" "$HTMLDOCDIR"
-fi
+#if [ -d "$HTMLDOCDIR" ] && [ ! -L "$HTMLDOCDIR" ]; then
+#    # Remove old directory and files that are now provided by xsane-common
+#    rm -rf "$HTMLDOCDIR"
+#    # Create a link to the new directory
+#    ln -s "$NEWHTMLDOCDIR" "$HTMLDOCDIR"
+#fi
 
 
 #DEBHELPER#
diff --git a/debian/xsane.preinst b/debian/xsane.preinst
new file mode 100644
index 0000000..ae87956
--- /dev/null
+++ b/debian/xsane.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+HTMLDOCDIR=/usr/share/doc/xsane/html
+
+if [ -d "$HTMLDOCDIR" ] && [ -L "$HTMLDOCDIR" ]; then
+    # Remove old directory and files that are now provided by xsane-common
+    rm -rf "$HTMLDOCDIR"
+fi
+
+
+#DEBHELPER#