From 4785df42505eae08a7a7f16b3a5fff89c0d70f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 25 Jul 2019 17:43:08 +0200 Subject: Migrate to debhelper 12 --- debian/changelog | 8 ++++++++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54e1a15..f69bd62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xsane (0.999-7) UNRELEASED; urgency=medium + + * Migrate to debhelper 12: + - Change debian/compat to 12. + - Bump minimum debhelper version in debian/control to >= 12. + + -- Jörg Frings-Fürst Thu, 25 Jul 2019 17:37:17 +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..e410b77 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Standards-Version: 4.2.1 Build-Depends: - debhelper (>= 11), + debhelper (>= 12), gettext, libgimp2.0-dev, libgtk2.0-dev, -- cgit v1.2.3 From 8ee193098c71c0c9090719647a2bca579423aee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 25 Jul 2019 18:00:15 +0200 Subject: Declare compliance with Debian Policy 4.4.0; New debian/NEWS.debian --- debian/NEWS.Debian | 6 ++++++ debian/changelog | 2 ++ debian/control | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 debian/NEWS.Debian diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian new file mode 100644 index 0000000..5d2a98f --- /dev/null +++ b/debian/NEWS.Debian @@ -0,0 +1,6 @@ + + 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. diff --git a/debian/changelog b/debian/changelog index f69bd62..3d113f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ xsane (0.999-7) UNRELEASED; 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. -- Jörg Frings-Fürst Thu, 25 Jul 2019 17:37:17 +0200 diff --git a/debian/control b/debian/control index e410b77..1688f5e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xsane Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.2.1 +Standards-Version: 4.4.0 Build-Depends: debhelper (>= 12), gettext, -- cgit v1.2.3 From 126a45896e8a85e9dc4d5e20a0a99ee36eda847f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Jul 2019 07:57:58 +0200 Subject: Move /usr/share/sane/doc to /usr/share/xsane-common/html --- debian/changelog | 1 + debian/rules | 16 +++++++++------- debian/xsane-common.dirs | 1 - debian/xsane-common.doc-base | 4 ++-- debian/xsane-common.docs | 2 ++ debian/xsane-common.install | 1 - debian/xsane-common.links | 3 +-- debian/xsane-common.preinst | 13 +++++++++++++ debian/xsane.links | 1 - debian/xsane.postinst | 12 ++++++------ debian/xsane.preinst | 13 +++++++++++++ 11 files changed, 47 insertions(+), 20 deletions(-) delete mode 100644 debian/xsane-common.dirs create mode 100644 debian/xsane-common.docs create mode 100644 debian/xsane-common.preinst create mode 100644 debian/xsane.preinst diff --git a/debian/changelog b/debian/changelog index 3d113f8..dc62ca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xsane (0.999-7) UNRELEASED; urgency=medium - 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 -- Jörg Frings-Fürst Thu, 25 Jul 2019 17:37:17 +0200 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/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..f57e7a1 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-coomon/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# -- cgit v1.2.3 From 4f2abacb8b28b15a3e87add345463ec8d5b6717f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Jul 2019 09:45:32 +0200 Subject: typo --- debian/xsane-common.links | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/xsane-common.links b/debian/xsane-common.links index f57e7a1..00c171b 100644 --- a/debian/xsane-common.links +++ b/debian/xsane-common.links @@ -1 +1 @@ -usr/share/doc/xsane-coomon/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html +usr/share/doc/xsane-common/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html -- cgit v1.2.3 From 0c9686e85b49456147aaedd8a9866b6415f3dd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Jul 2019 10:13:33 +0200 Subject: Upstream offline: debian/watch: Comment out URL; debian/control: Remove homepage --- debian/changelog | 3 +++ debian/control | 1 - debian/watch | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc62ca5..2265c8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ xsane (0.999-7) UNRELEASED; urgency=medium * 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. -- Jörg Frings-Fürst Thu, 25 Jul 2019 17:37:17 +0200 diff --git a/debian/control b/debian/control index 1688f5e..24af8ce 100644 --- a/debian/control +++ b/debian/control @@ -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/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))) -- cgit v1.2.3 From b4df18a4d0ea9822b4ea7cf581d0526d15a1e7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Jul 2019 10:18:42 +0200 Subject: d/changlog & d/NEWS.Debian: Change distribution to unstable, Change date and time --- debian/NEWS.Debian | 3 +++ debian/changelog | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 5d2a98f..7597ef8 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,6 +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 Fri, 26 Jul 2019 10:15:27 +0200 diff --git a/debian/changelog b/debian/changelog index 2265c8d..643b0e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xsane (0.999-7) UNRELEASED; urgency=medium +xsane (0.999-7) unstable; urgency=medium * Migrate to debhelper 12: - Change debian/compat to 12. @@ -10,7 +10,7 @@ xsane (0.999-7) UNRELEASED; urgency=medium - debian/watch: Comment out URL. - debian/control: Remove homepage. - -- Jörg Frings-Fürst Thu, 25 Jul 2019 17:37:17 +0200 + -- Jörg Frings-Fürst Fri, 26 Jul 2019 10:15:27 +0200 xsane (0.999-6) unstable; urgency=medium -- cgit v1.2.3 From a449b35833ef269096d1afdf86dc7516b9aa1d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Jul 2019 13:13:51 +0200 Subject: New debian/patches/0920-add_Name_Comment_pt_BR.patch --- debian/changelog | 3 +++ debian/patches/0920-add_Name_Comment_pt_BR.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) create mode 100644 debian/patches/0920-add_Name_Comment_pt_BR.patch diff --git a/debian/changelog b/debian/changelog index 643b0e2..7309ebf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ xsane (0.999-7) unstable; urgency=medium * 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 ). -- Jörg Frings-Fürst Fri, 26 Jul 2019 10:15:27 +0200 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 +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 -- cgit v1.2.3 From 983ceff2a78ed920da4b8a35d654341b0cebadd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Jul 2019 13:15:05 +0200 Subject: d/changlog & d/NEWS.Debian: Change date and time --- debian/NEWS.Debian | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 7597ef8..9ddc8d2 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -6,4 +6,4 @@ xsane (0.999-7) unstable; urgency=medium If the situation doesn't change, xsane will be removed before Bullseye is released. - -- Jörg Frings-Fürst Fri, 26 Jul 2019 10:15:27 +0200 + -- Jörg Frings-Fürst Fri, 26 Jul 2019 13:13:58 +0200 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 7309ebf..d791771 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ xsane (0.999-7) unstable; urgency=medium - Added Name and Comment to pt_BR in xsane.desktop (Thanks to Edson Juliano Drosdeck ). - -- Jörg Frings-Fürst Fri, 26 Jul 2019 10:15:27 +0200 + -- Jörg Frings-Fürst Fri, 26 Jul 2019 13:13:58 +0200 xsane (0.999-6) unstable; urgency=medium -- cgit v1.2.3 From 45bf9eb43fca688cd835073350e37dc2b2e3c476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Jul 2019 13:26:12 +0200 Subject: d/copyright: Add year 2019 to debian/* --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d791771..8d0052f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ xsane (0.999-7) unstable; urgency=medium * 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 ). + * debian/copyright: Add year 2019 to debian/*. -- Jörg Frings-Fürst Fri, 26 Jul 2019 13:13:58 +0200 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 2002-2011 Julien BLACHE - 2014-2018 Jörg Frings-Fürst + 2014-2019 Jörg Frings-Fürst License: GPL-3+ Files: lib/alloca.c -- cgit v1.2.3