From 2853a604aefed21a483727bfc681134c2c646597 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 29 Jan 2013 01:20:42 +0100 Subject: Imported Debian patch 0.998-4 --- debian/changelog | 21 ++++ debian/compat | 2 +- debian/control | 9 +- debian/patches/deb_non_working_help_menu.patch | 36 ++++++ debian/patches/fix_png15.patch | 34 ++++++ debian/patches/series | 2 + debian/rules | 161 +++---------------------- debian/source/include-binaries | 1 + debian/xsane-common.dirs | 2 +- debian/xsane-common.doc-base | 4 +- debian/xsane-common.install | 2 + debian/xsane-common.links | 3 +- debian/xsane.dirs | 1 + debian/xsane.install | 4 + debian/xsane.links | 2 +- debian/xsane.png | Bin 0 -> 47027 bytes 16 files changed, 129 insertions(+), 155 deletions(-) create mode 100644 debian/patches/deb_non_working_help_menu.patch create mode 100644 debian/patches/fix_png15.patch create mode 100644 debian/source/include-binaries create mode 100644 debian/xsane-common.install create mode 100644 debian/xsane.install create mode 100644 debian/xsane.png diff --git a/debian/changelog b/debian/changelog index f9b7370..bf3e865 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +xsane (0.998-4) unstable; urgency=low + + * QA upload. + * Change maintainer to QA Group. + * debian/ improvements: + - Bump debhelper compat level to 9 + - Convert to use dh + - Add Homepage header + - Bump Standards-Version to 3.9.3 (no changes) + * Move documentation out of /usr/share/doc, since it is used by + the program itself, this was arguably a policy violation. + * Change Build-Depends from libpng12-dev to libpng-dev and apply + patch by Nobuhiro Iwamatsu to fix build with libpng15. + (closes: #649800, #662569) + * Add higher resolution icons (based on src/xsane-logo.xpm). + (closes: #675470) + * Remove non-working items in help menu. Patch from openSUSE + package. + + -- Frank Lichtenheld Tue, 29 Jan 2013 01:20:42 +0100 + xsane (0.998-3) unstable; urgency=low * debian/control: diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 72c98f3..693875d 100644 --- a/debian/control +++ b/debian/control @@ -1,12 +1,12 @@ Source: xsane Section: graphics Priority: optional -Maintainer: Julien BLACHE -Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 5), libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, liblcms1-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev +Maintainer: Debian QA Group +Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9~), libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg-dev, libpng-dev, libtiff4-dev, liblcms1-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev +Homepage: http://www.xsane.org/ Package: xsane -Section: graphics Architecture: any Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: iceweasel | www-browser, cups-client @@ -28,7 +28,6 @@ Description: featureful graphical frontend for SANE (Scanner Access Now Easy) backends are welcome, too, however). Package: xsane-common -Section: graphics Architecture: all Depends: ${misc:Depends} Replaces: xsane diff --git a/debian/patches/deb_non_working_help_menu.patch b/debian/patches/deb_non_working_help_menu.patch new file mode 100644 index 0000000..f5b8e54 --- /dev/null +++ b/debian/patches/deb_non_working_help_menu.patch @@ -0,0 +1,36 @@ +Description: Remove not working items in Help menu +Origin: other, https://build.opensuse.org/package/view_file?expand=1&file=remove-non-working-help.patch&package=xsane&project=devel%3AopenSUSE%3AFactory +Forwarded: no + +Index: xsane-0.998/src/xsane.c +=================================================================== +--- xsane-0.998.orig/src/xsane.c 2013-01-27 01:44:39.000000000 +0100 ++++ xsane-0.998/src/xsane.c 2013-01-29 01:14:28.983590459 +0100 +@@ -4260,27 +4260,6 @@ + gtk_widget_show(item); + + +- /* Backend doc -> html viewer */ +- +- if (xsane.backend) +- { +- item = gtk_menu_item_new_with_label(MENU_ITEM_BACKEND_DOC); +- gtk_menu_append(GTK_MENU(menu), item); +- g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) xsane.backend); +- gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F2, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +- gtk_widget_show(item); +- } +- +- +- /* available backends -> html viewer */ +- +- item = gtk_menu_item_new_with_label(MENU_ITEM_AVAILABLE_BACKENDS); +- gtk_menu_append(GTK_MENU(menu), item); +- g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) "sane-backends"); +- gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F3, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +- gtk_widget_show(item); +- +- + /* problems -> html viewer */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_PROBLEMS); diff --git a/debian/patches/fix_png15.patch b/debian/patches/fix_png15.patch new file mode 100644 index 0000000..bffc9ee --- /dev/null +++ b/debian/patches/fix_png15.patch @@ -0,0 +1,34 @@ +Description: Build with libpng15. +Author: Nobuhiro Iwamatsu +Bug-Debian: http://bugs.debian.org/649800 +Forwarded: no + +Index: xsane-0.998/src/xsane-save.c +=================================================================== +--- xsane-0.998.orig/src/xsane-save.c 2013-01-27 01:44:39.000000000 +0100 ++++ xsane-0.998/src/xsane-save.c 2013-01-29 00:17:56.934234295 +0100 +@@ -4928,8 +4928,11 @@ + xsane_back_gtk_error(buf, TRUE); + return -1; /* error */ + } +- ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if ( setjmp( png_jmpbuf ( png_ptr ) ) ) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); +@@ -5119,7 +5122,11 @@ + return -1; /* error */ + } + ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if ( setjmp( png_jmpbuf ( png_ptr ) ) ) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); diff --git a/debian/patches/series b/debian/patches/series index 7842754..f59f1fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,5 @@ i18n_po_update_fr.patch fix_preview_mouse_events.patch fix_spin_button_pagesize.patch fix_tighten_default_umask.patch +fix_png15.patch +deb_non_working_help_menu.patch diff --git a/debian/rules b/debian/rules index 528d607..d6fe262 100755 --- a/debian/rules +++ b/debian/rules @@ -1,159 +1,32 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ --with autotools_dev -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +override_dh_auto_configure: + dh_auto_configure -- --enable-gimp - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - - -autotools: autotools-stamp -autotools-stamp: - 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 - -config.status: autotools-stamp configure - dh_testdir - # Add here commands to configure the package. - ./configure --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --enable-gimp - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - # Point the docdir to xsane-common, as the doc is in this package - $(MAKE) xsanedocdir=\$${datadir}/doc/xsane-common/html - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f autotools-stamp build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean +override_dh_auto_clean: + dh_auto_clean rm -f config.sub config.guess rm -f xsane.spec include/config.h rm -f po/*.gmo - dh_clean +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 -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # The docdir is set to a directory provided by xsane-common - # so that the documentation can be found at runtime - $(MAKE) install prefix=$(CURDIR)/debian/xsane/usr \ - xsanedocdir=\$${datadir}/doc/xsane-common/html +override_dh_install: + dh_install install -m 0644 src/xsane-32x32.xpm \ debian/xsane/usr/share/pixmaps/xsane.xpm + install -m 0644 src/xsane-48x48.png \ + debian/xsane/usr/share/pixmaps/xsane.png - install -m 0644 debian/xsane.desktop \ - debian/xsane/usr/share/applications - - # we don't want the locales, nor the HTML documentation to be in - # this package (provided in xsane-common) - rm -rf debian/xsane/usr/share/sane - rm -rf debian/xsane/usr/share/doc/xsane/html - rm -rf debian/xsane/usr/share/locale - rm -rf debian/xsane/usr/share/doc/xsane-common - - rm -rf debian/xsane/usr/sbin - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installdirs - - ./configure --prefix=/usr --mandir=\$${prefix}/share/man - - $(MAKE) -C doc install prefix=$(CURDIR)/debian/xsane-common/usr \ - xsanedocdir=\$${datadir}/doc/xsane-common/html - - rm -rf debian/xsane-common/usr/share/pixmaps - - # 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 - - # manpages go in the binary packages - rm -rf debian/xsane-common/usr/share/man - - $(MAKE) -C po install prefix=$(CURDIR)/debian/xsane-common/usr - - install -d debian/xsane-common/usr/share/sane/xsane - install -m 0644 src/xsane-style.rc debian/xsane-common/usr/share/sane/xsane - install -m 0644 src/xsane-startimage.pnm debian/xsane-common/usr/share/sane/xsane - install -m 0644 src/xsane-calibration.pnm debian/xsane-common/usr/share/sane/xsane - install -m 0644 src/xsane-logo.xpm debian/xsane-common/usr/share/sane/xsane - install -m 0644 src/xsane-gpl.txt debian/xsane-common/usr/share/sane/xsane - install -m 0644 src/xsane-eula.txt debian/xsane-common/usr/share/sane/xsane - cd src && \ - for logo in *-logo.xpm; do \ - install -m 0644 $${logo} ../debian/xsane-common/usr/share/sane/xsane/$${logo} ; \ - done && \ - cd - - - dh_testdir -i - dh_testroot -i - dh_installdocs -i -# dh_installexamples -i - dh_installman -i -# dh_installinfo -i - dh_installchangelogs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -a -# dh_installexamples -a - dh_installmenu -a - dh_installman -a -# dh_installinfo -a - dh_installchangelogs -a xsane.CHANGES - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_installchangelogs: + dh_installchangelogs xsane.CHANGES diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..5d26a3f --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1 @@ +debian/xsane.png diff --git a/debian/xsane-common.dirs b/debian/xsane-common.dirs index c1da623..8dd0c85 100644 --- a/debian/xsane-common.dirs +++ b/debian/xsane-common.dirs @@ -1 +1 @@ -usr/share/pixmaps +usr/share/sane/xsane diff --git a/debian/xsane-common.doc-base b/debian/xsane-common.doc-base index 4df3e91..8bbd3b6 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/doc/xsane-common/html/sane-xsane-doc.html -Files: /usr/share/doc/xsane-common/html/*.html +Index: /usr/share/sane/xsane/doc/sane-xsane-doc.html +Files: /usr/share/sane/xsane/doc/*.html diff --git a/debian/xsane-common.install b/debian/xsane-common.install new file mode 100644 index 0000000..d18bbb8 --- /dev/null +++ b/debian/xsane-common.install @@ -0,0 +1,2 @@ +usr/share/sane/xsane +usr/share/locale diff --git a/debian/xsane-common.links b/debian/xsane-common.links index 00c171b..7d505be 100644 --- a/debian/xsane-common.links +++ b/debian/xsane-common.links @@ -1 +1,2 @@ -usr/share/doc/xsane-common/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html +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 diff --git a/debian/xsane.dirs b/debian/xsane.dirs index c79467c..ccc38a2 100644 --- a/debian/xsane.dirs +++ b/debian/xsane.dirs @@ -1,3 +1,4 @@ usr/lib/gimp/2.0/plug-ins usr/share/pixmaps +usr/share/icons/hicolor/256x256/apps usr/share/applications diff --git a/debian/xsane.install b/debian/xsane.install new file mode 100644 index 0000000..da5aa1d --- /dev/null +++ b/debian/xsane.install @@ -0,0 +1,4 @@ +debian/xsane.desktop usr/share/applications +debian/xsane.png usr/share/icons/hicolor/256x256/apps +usr/bin +usr/share/man diff --git a/debian/xsane.links b/debian/xsane.links index af2ac1d..46dc8ac 100644 --- a/debian/xsane.links +++ b/debian/xsane.links @@ -1,2 +1,2 @@ usr/bin/xsane usr/lib/gimp/2.0/plug-ins/xsane -usr/share/doc/xsane-common/html usr/share/doc/xsane/html +usr/share/sane/xsane/doc usr/share/doc/xsane/html diff --git a/debian/xsane.png b/debian/xsane.png new file mode 100644 index 0000000..f3b381f Binary files /dev/null and b/debian/xsane.png differ -- cgit v1.2.3