summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog41
-rw-r--r--debian/compat2
-rw-r--r--debian/control11
-rw-r--r--debian/patches/00list4
-rw-r--r--debian/patches/10_broken_links.dpatch20
-rw-r--r--debian/patches/11_contect_typo.dpatch283
-rw-r--r--debian/patches/12_pbar_fixes.dpatch282
-rwxr-xr-xdebian/rules12
-rw-r--r--debian/xsane-common.links1
-rw-r--r--debian/xsane.desktop2
-rw-r--r--debian/xsane.docs1
-rw-r--r--debian/xsane.menu4
12 files changed, 21 insertions, 642 deletions
diff --git a/debian/changelog b/debian/changelog
index 5dfe8fa..729e50e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,43 +1,8 @@
-xsane (0.99+0.991-6) unstable; urgency=low
+xsane (0.993-1) experimental; urgency=low
- * debian/patches/12_pbar_fixes.dpatch:
- + Added; Reduce progress bar updates/redraws by rounding the progress
- value. Patch by Joris van Rooij <jrrzz@il.fontys.nl> (closes: #432609).
- * debian/xsane.desktop:
- + Remove non-existent "Application" category.
- * debian/xsane-common.links:
- + Add an index.html symlink to sane-xsane-doc.html in the HTML doc.
+ * New upstream beta release.
- -- Julien BLACHE <jblache@debian.org> Fri, 24 Aug 2007 11:37:26 +0200
-
-xsane (0.99+0.991-5) unstable; urgency=low
-
- * debian/xsane.menu:
- + Update for the new menu structure.
-
- -- Julien BLACHE <jblache@debian.org> Sun, 05 Aug 2007 18:14:18 +0200
-
-xsane (0.99+0.991-4) unstable; urgency=low
-
- * debian/control:
- + Remove obsolete Build-Conflicts: libpng10-dev.
- + Remove obsolete Conflicts/Replaces: xsane-gimp1.{2,3}.
- + Update browser recommendation.
- + Improve short description.
- * debian/rules:
- + Do not ignore errors from make distclean.
-
- -- Julien BLACHE <jblache@debian.org> Thu, 02 Aug 2007 18:15:18 +0200
-
-xsane (0.99+0.991-3) unstable; urgency=low
-
- * debian/patches/10_broken_links.dpatch:
- + Added; fix broken links in HTML documentation (closes: #415299).
- * debian/patches/11_contect_typo.dpatch:
- + Added; fix "contect" typo in xsane-text.h; original patch by
- Martin Pitt <martin.pitt@ubuntu.com> (closes: #420749).
-
- -- Julien BLACHE <jblache@debian.org> Fri, 27 Apr 2007 21:46:28 +0200
+ -- Julien BLACHE <jblache@debian.org> Tue, 27 Feb 2007 22:22:40 +0100
xsane (0.99+0.991-2) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..b8626c4 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+4
diff --git a/debian/control b/debian/control
index 2c503e7..6f529d7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,18 @@ Section: graphics
Priority: optional
Maintainer: Julien BLACHE <jblache@debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev
+Build-Conflicts: libpng10-dev
Package: xsane
Section: graphics
Architecture: any
Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}
-Recommends: iceweasel | www-browser
+Recommends: mozilla-browser | www-browser
Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
-Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
+Conflicts: xsane-gimp1.2, xsane-gimp1.3
+Replaces: xsane-gimp1.2, xsane-gimp1.3
+Description: GTK+-based X11 frontend for SANE (Scanner Access Now Easy)
xsane can be run as a stand-alone program or through the GIMP image
manipulation program. In stand-alone mode, xsane can save an image
to a file in a variety of image formats, serve as a frontend to a
@@ -32,7 +35,7 @@ Section: graphics
Architecture: all
Replaces: xsane
Recommends: xsane
-Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
+Description: GTK+-based X11 frontend for SANE (Scanner Access Now Easy)
xsane can be run as a stand-alone program or through the GIMP image
manipulation program. In stand-alone mode, xsane can save an image
to a file in a variety of image formats, serve as a frontend to a
diff --git a/debian/patches/00list b/debian/patches/00list
index 32beb13..349899e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,6 +1,2 @@
02_docviewer
03_gimp_acquire_menu
-10_broken_links
-11_contect_typo
-12_pbar_fixes
-
diff --git a/debian/patches/10_broken_links.dpatch b/debian/patches/10_broken_links.dpatch
deleted file mode 100644
index 4d700b0..0000000
--- a/debian/patches/10_broken_links.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_broken_links.dpatch by <jblache@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix broken links in HTML documentation.
-
-@DPATCH@
-diff -urNad xsane-0.99+0.991~/doc/sane-xsane-doc.html xsane-0.99+0.991/doc/sane-xsane-doc.html
---- xsane-0.99+0.991~/doc/sane-xsane-doc.html 2005-12-31 16:33:16.000000000 +0100
-+++ xsane-0.99+0.991/doc/sane-xsane-doc.html 2007-03-18 10:56:14.832828848 +0100
-@@ -161,8 +161,7 @@
- <li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
- <li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
- <li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
--<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
--<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
-+<li><a href="sane-xsane-setup-email-doc.html">Mail setup</a></li>
- <li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
- </ul>
- </blockquote>
diff --git a/debian/patches/11_contect_typo.dpatch b/debian/patches/11_contect_typo.dpatch
deleted file mode 100644
index 8bb7fbf..0000000
--- a/debian/patches/11_contect_typo.dpatch
+++ /dev/null
@@ -1,283 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_contect_typo.dpatch by <jblache@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix "contect" typo in xsane-text.h; original patch by Martin Pitt <martin.pitt@ubuntu.com>
-
-@DPATCH@
-diff -urNad xsane-0.99+0.991~/po/cs.po xsane-0.99+0.991/po/cs.po
---- xsane-0.99+0.991~/po/cs.po 2006-01-10 19:21:11.000000000 +0100
-+++ xsane-0.99+0.991/po/cs.po 2007-04-27 21:44:31.905588023 +0200
-@@ -2098,7 +2098,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Předvolená oblast:\n"
-diff -urNad xsane-0.99+0.991~/po/da.po xsane-0.99+0.991/po/da.po
---- xsane-0.99+0.991~/po/da.po 2006-01-10 19:21:11.000000000 +0100
-+++ xsane-0.99+0.991/po/da.po 2007-04-27 21:44:31.913588772 +0200
-@@ -2105,7 +2105,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Forvalgt område:\n"
-diff -urNad xsane-0.99+0.991~/po/de.po xsane-0.99+0.991/po/de.po
---- xsane-0.99+0.991~/po/de.po 2006-01-10 19:21:12.000000000 +0100
-+++ xsane-0.99+0.991/po/de.po 2007-04-27 21:44:31.922589615 +0200
-@@ -2122,7 +2122,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Bereichsvoreinstellung:\n"
-diff -urNad xsane-0.99+0.991~/po/es.po xsane-0.99+0.991/po/es.po
---- xsane-0.99+0.991~/po/es.po 2006-01-10 19:21:12.000000000 +0100
-+++ xsane-0.99+0.991/po/es.po 2007-04-27 21:44:31.929590271 +0200
-@@ -2165,7 +2165,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Área de preset:\n"
-diff -urNad xsane-0.99+0.991~/po/fr.po xsane-0.99+0.991/po/fr.po
---- xsane-0.99+0.991~/po/fr.po 2006-01-10 19:21:12.000000000 +0100
-+++ xsane-0.99+0.991/po/fr.po 2007-04-27 21:44:31.938591114 +0200
-@@ -2153,7 +2153,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Aire de présélection: \n"
-diff -urNad xsane-0.99+0.991~/po/hu.po xsane-0.99+0.991/po/hu.po
---- xsane-0.99+0.991~/po/hu.po 2006-01-10 19:21:12.000000000 +0100
-+++ xsane-0.99+0.991/po/hu.po 2007-04-27 21:44:31.945591769 +0200
-@@ -2092,7 +2092,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Előre beállított terület:\n"
-diff -urNad xsane-0.99+0.991~/po/it.po xsane-0.99+0.991/po/it.po
---- xsane-0.99+0.991~/po/it.po 2006-01-10 19:21:12.000000000 +0100
-+++ xsane-0.99+0.991/po/it.po 2007-04-27 21:44:31.954592612 +0200
-@@ -2139,7 +2139,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Area preselezionata:\n"
-diff -urNad xsane-0.99+0.991~/po/ja.po xsane-0.99+0.991/po/ja.po
---- xsane-0.99+0.991~/po/ja.po 2006-01-10 19:21:13.000000000 +0100
-+++ xsane-0.99+0.991/po/ja.po 2007-04-27 21:44:31.962593361 +0200
-@@ -2108,7 +2108,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "プリセット領域：\n"
-diff -urNad xsane-0.99+0.991~/po/nl.po xsane-0.99+0.991/po/nl.po
---- xsane-0.99+0.991~/po/nl.po 2006-01-10 19:21:13.000000000 +0100
-+++ xsane-0.99+0.991/po/nl.po 2007-04-27 21:44:31.969594017 +0200
-@@ -2108,7 +2108,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Scangebied:\n"
-diff -urNad xsane-0.99+0.991~/po/pl.po xsane-0.99+0.991/po/pl.po
---- xsane-0.99+0.991~/po/pl.po 2006-01-10 19:21:13.000000000 +0100
-+++ xsane-0.99+0.991/po/pl.po 2007-04-27 21:44:31.977594766 +0200
-@@ -2125,7 +2125,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Obszar ustawiony:\n"
-diff -urNad xsane-0.99+0.991~/po/pt.po xsane-0.99+0.991/po/pt.po
---- xsane-0.99+0.991~/po/pt.po 2006-01-10 19:21:13.000000000 +0100
-+++ xsane-0.99+0.991/po/pt.po 2007-04-27 21:44:31.985595515 +0200
-@@ -2148,7 +2148,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Área pré-configurada:\n"
-diff -urNad xsane-0.99+0.991~/po/pt_BR.po xsane-0.99+0.991/po/pt_BR.po
---- xsane-0.99+0.991~/po/pt_BR.po 2006-01-10 19:21:13.000000000 +0100
-+++ xsane-0.99+0.991/po/pt_BR.po 2007-04-27 21:44:31.994596358 +0200
-@@ -2148,7 +2148,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Área pré-configurada:\n"
-diff -urNad xsane-0.99+0.991~/po/ro.po xsane-0.99+0.991/po/ro.po
---- xsane-0.99+0.991~/po/ro.po 2006-01-10 19:21:14.000000000 +0100
-+++ xsane-0.99+0.991/po/ro.po 2007-04-27 21:44:32.002597107 +0200
-@@ -2154,7 +2154,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Zona predefinită:\n"
-diff -urNad xsane-0.99+0.991~/po/ru.po xsane-0.99+0.991/po/ru.po
---- xsane-0.99+0.991~/po/ru.po 2006-01-10 19:21:14.000000000 +0100
-+++ xsane-0.99+0.991/po/ru.po 2007-04-27 21:44:32.010597856 +0200
-@@ -2123,7 +2123,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Область предварительных настроек:\n"
-diff -urNad xsane-0.99+0.991~/po/sk.po xsane-0.99+0.991/po/sk.po
---- xsane-0.99+0.991~/po/sk.po 2006-01-10 19:21:14.000000000 +0100
-+++ xsane-0.99+0.991/po/sk.po 2007-04-27 21:44:32.018598606 +0200
-@@ -2149,7 +2149,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Predvolená oblasť:\n"
-diff -urNad xsane-0.99+0.991~/po/sl.po xsane-0.99+0.991/po/sl.po
---- xsane-0.99+0.991~/po/sl.po 2006-01-10 19:21:14.000000000 +0100
-+++ xsane-0.99+0.991/po/sl.po 2007-04-27 21:44:32.026599355 +0200
-@@ -2097,7 +2097,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Prednastavljeno območje:\n"
-diff -urNad xsane-0.99+0.991~/po/sr.po xsane-0.99+0.991/po/sr.po
---- xsane-0.99+0.991~/po/sr.po 2006-01-10 19:21:14.000000000 +0100
-+++ xsane-0.99+0.991/po/sr.po 2007-04-27 21:44:32.034600104 +0200
-@@ -2131,7 +2131,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
-
-diff -urNad xsane-0.99+0.991~/po/sv.po xsane-0.99+0.991/po/sv.po
---- xsane-0.99+0.991~/po/sv.po 2006-01-10 19:21:15.000000000 +0100
-+++ xsane-0.99+0.991/po/sv.po 2007-04-27 21:44:32.042600853 +0200
-@@ -2142,7 +2142,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
-
-diff -urNad xsane-0.99+0.991~/po/tr.po xsane-0.99+0.991/po/tr.po
---- xsane-0.99+0.991~/po/tr.po 2006-01-10 19:21:15.000000000 +0100
-+++ xsane-0.99+0.991/po/tr.po 2007-04-27 21:44:32.050601603 +0200
-@@ -2112,7 +2112,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Öntanımlı alan: \n"
-diff -urNad xsane-0.99+0.991~/po/vi.po xsane-0.99+0.991/po/vi.po
---- xsane-0.99+0.991~/po/vi.po 2006-01-10 19:21:15.000000000 +0100
-+++ xsane-0.99+0.991/po/vi.po 2007-04-27 21:44:32.058602352 +0200
-@@ -2150,7 +2150,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
- "Vùng định trước:\n"
-diff -urNad xsane-0.99+0.991~/po/xsane.pot xsane-0.99+0.991/po/xsane.pot
---- xsane-0.99+0.991~/po/xsane.pot 2006-01-07 00:26:28.000000000 +0100
-+++ xsane-0.99+0.991/po/xsane.pot 2007-04-27 21:42:48.949947015 +0200
-@@ -2026,7 +2026,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
-
-diff -urNad xsane-0.99+0.991~/po/zh.po xsane-0.99+0.991/po/zh.po
---- xsane-0.99+0.991~/po/zh.po 2006-01-10 19:21:15.000000000 +0100
-+++ xsane-0.99+0.991/po/zh.po 2007-04-27 21:44:32.066603101 +0200
-@@ -2082,7 +2082,7 @@
- #. DESC_PRESET_AREA
- msgid ""
- "Preset area:\n"
--"To add new area or edit an existing area use contect menu (right mouse "
-+"To add new area or edit an existing area use context menu (right mouse "
- "button)."
- msgstr ""
-
-diff -urNad xsane-0.99+0.991~/src/xsane-text.h xsane-0.99+0.991/src/xsane-text.h
---- xsane-0.99+0.991~/src/xsane-text.h 2007-04-27 21:42:09.576259970 +0200
-+++ xsane-0.99+0.991/src/xsane-text.h 2007-04-27 21:42:48.950947108 +0200
-@@ -625,7 +625,7 @@
- #define DESC_DELETE_IMAGES _("Delete preview image cache")
-
- #define DESC_PRESET_AREA _("Preset area:\n" \
-- "To add new area or edit an existing area use contect menu (right mouse button).")
-+ "To add new area or edit an existing area use context menu (right mouse button).")
- #define DESC_ROTATION _("Rotate preview and scan")
- #define DESC_RATIO _("Aspect ratio of selection")
- #define DESC_PAPER_ORIENTATION _("Define image position for printing")
diff --git a/debian/patches/12_pbar_fixes.dpatch b/debian/patches/12_pbar_fixes.dpatch
deleted file mode 100644
index 5149b27..0000000
--- a/debian/patches/12_pbar_fixes.dpatch
+++ /dev/null
@@ -1,282 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_pbar_fixes.dpatch by <jblache@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Reduce the number of updates/redraws on the progress bars by rounding
-## DP: the progress value. Patch by Joris van Rooij <jrrzz@il.fontys.nl>.
-
-@DPATCH@
-diff -urNad xsane-0.99+0.991~/src/xsane-save.c xsane-0.99+0.991/src/xsane-save.c
---- xsane-0.99+0.991~/src/xsane-save.c 2006-01-10 18:46:32.000000000 +0100
-+++ xsane-0.99+0.991/src/xsane-save.c 2007-08-24 11:18:28.915600727 +0200
-@@ -694,7 +694,7 @@
- bytes_sum += bytes;
- }
-
-- gtk_progress_bar_update(progress_bar, (float) bytes_sum / size); /* update progress bar */
-+ gtk_progress_bar_update(progress_bar, round((float) bytes_sum / size * 100) / 100); /* update progress bar */
-
- while (gtk_events_pending())
- {
-@@ -849,7 +849,7 @@
- }
-
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height); /* update progress bar */
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100); /* update progress bar */
- while (gtk_events_pending()) /* give gtk the chance to display the changes */
- {
- gtk_main_iteration();
-@@ -951,7 +951,7 @@
- {
- DBG(DBG_info2, "xsane_save_scaled_image: original line %d, new line %d\n", (int) y, y_new);
-
-- gtk_progress_bar_update(progress_bar, (float) y / original_image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / original_image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1135,7 +1135,7 @@
-
- for (y = 0; y < new_image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1225,7 +1225,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
-
- while (gtk_events_pending())
- {
-@@ -1418,7 +1418,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1627,7 +1627,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1769,7 +1769,7 @@
-
- for (y = 0; y < pixel_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / pixel_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / pixel_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1826,7 +1826,7 @@
-
- for (x=0; x<pixel_width; x++)
- {
-- gtk_progress_bar_update(progress_bar, (float) x / pixel_width);
-+ gtk_progress_bar_update(progress_bar, round((float) x / pixel_width * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1880,7 +1880,7 @@
-
- for (y = pixel_height-1; y >= 0; y--)
- {
-- gtk_progress_bar_update(progress_bar, (float) (pixel_height - y) / pixel_height);
-+ gtk_progress_bar_update(progress_bar, round((float) (pixel_height - y) / pixel_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1939,7 +1939,7 @@
-
- for (x = pixel_width-1; x >= 0; x--)
- {
-- gtk_progress_bar_update(progress_bar, (float) (pixel_width - x) / pixel_width);
-+ gtk_progress_bar_update(progress_bar, round((float) (pixel_width - x) / pixel_width * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -1992,7 +1992,7 @@
-
- for (y = 0; y < pixel_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / pixel_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / pixel_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -2051,7 +2051,7 @@
-
- for (x = 0; x < pixel_width; x++)
- {
-- gtk_progress_bar_update(progress_bar, (float) x / pixel_width);
-+ gtk_progress_bar_update(progress_bar, round((float) x / pixel_width * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -2105,7 +2105,7 @@
-
- for (y = pixel_height-1; y >= 0; y--)
- {
-- gtk_progress_bar_update(progress_bar, (float) (pixel_height - y) / pixel_height);
-+ gtk_progress_bar_update(progress_bar, round((float) (pixel_height - y) / pixel_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -2164,7 +2164,7 @@
-
- for (x = pixel_width-1; x >= 0; x--)
- {
-- gtk_progress_bar_update(progress_bar, (float) (pixel_width - x) / pixel_width);
-+ gtk_progress_bar_update(progress_bar, round((float) (pixel_width - x) / pixel_width * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -2767,7 +2767,8 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
-+
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -2896,7 +2897,7 @@
- break;
- }
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -2940,7 +2941,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -3562,7 +3563,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -3754,7 +3755,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -3899,7 +3900,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -4013,7 +4014,7 @@
-
- for (y = 0; y < image_info->image_height; y++)
- {
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -4083,7 +4084,7 @@
-
- count = 0;
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -4143,7 +4144,7 @@
-
- count = 0;
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -4178,7 +4179,7 @@
- fputc(val & 255, outfile); /* LSB */
- }
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -4235,7 +4236,7 @@
- fputc(val & 255, outfile); /* LSB */
- }
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info->image_height * 100) / 100);
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -5199,7 +5200,7 @@
- tile_offset = 0;
- }
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info.image_height * 100) / 100); /* update progress bar */
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -5236,7 +5237,7 @@
- tile_offset = 0;
- }
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info.image_height * 100) / 100); /* update progress bar */
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -5280,7 +5281,7 @@
- tile_offset = 0;
- }
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info.image_height * 100) / 100); /* update progress bar */
- while (gtk_events_pending())
- {
- gtk_main_iteration();
-@@ -5328,7 +5329,7 @@
- tile_offset = 0;
- }
-
-- gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-+ gtk_progress_bar_update(progress_bar, round((float) y / image_info.image_height * 100) / 100); /* update progress bar */
- while (gtk_events_pending())
- {
- gtk_main_iteration();
diff --git a/debian/rules b/debian/rules
index 7a628fd..696e018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ endif
autotools: autotools-stamp
autotools-stamp:
- rm -f config.sub config.guess
+ -rm -f config.sub config.guess
ln -s /usr/share/misc/config.sub config.sub
ln -s /usr/share/misc/config.guess config.guess
touch autotools-stamp
@@ -54,10 +54,10 @@ real-clean:
rm -f autotools-stamp build-stamp
# Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
+ -$(MAKE) distclean
- rm -f config.sub config.guess
- rm -f po/*.gmo
+ -rm -f config.sub config.guess
+ -rm -f po/*.gmo
dh_clean
@@ -130,7 +130,6 @@ binary-indep: build install
dh_installman -i
# dh_installinfo -i
dh_installchangelogs -i
- dh_link -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
@@ -147,12 +146,15 @@ binary-arch: build install
dh_installmenu -a
dh_installman -a
# dh_installinfo -a
+# dh_undocumented -a
dh_installchangelogs -a xsane.CHANGES
dh_link -a
dh_strip -a
dh_compress -a
dh_fixperms -a
+# dh_makeshlibs -a
dh_installdeb -a
+# dh_perl -a
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
diff --git a/debian/xsane-common.links b/debian/xsane-common.links
deleted file mode 100644
index 00c171b..0000000
--- a/debian/xsane-common.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/xsane-common/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html
diff --git a/debian/xsane.desktop b/debian/xsane.desktop
index c320bc5..df5c05d 100644
--- a/debian/xsane.desktop
+++ b/debian/xsane.desktop
@@ -14,5 +14,5 @@ Exec=xsane
Icon=xsane
Terminal=false
Type=Application
-Categories=GTK;Graphics;RasterGraphics;Scanning;OCR;
+Categories=GTK;Application;Graphics;RasterGraphics;Scanning;OCR;
StartupNotify=true
diff --git a/debian/xsane.docs b/debian/xsane.docs
index 1c0c73b..d05dba6 100644
--- a/debian/xsane.docs
+++ b/debian/xsane.docs
@@ -1,6 +1,5 @@
xsane.ACCELKEYS
xsane.AUTHOR
-xsane.BACKENDS
xsane.BEGINNERS-INFO
xsane.BUGS
xsane.LOGO
diff --git a/debian/xsane.menu b/debian/xsane.menu
index 76ef029..1a6d35d 100644
--- a/debian/xsane.menu
+++ b/debian/xsane.menu
@@ -1,6 +1,6 @@
?package(xsane):command="/usr/bin/xsane" needs="X11" \
- section="Applications/Graphics" title="XSane" \
+ section="Apps/Graphics" title="xsane" \
icon="/usr/share/pixmaps/xsane.xpm" \
- description="XSane provides an advanced graphical \
+ description="xsane provides a graphical \
user interface to control an image acquisition device \
such as a flatbed scanner or a camera."
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:44:25 +0000