From 6ec4b0d2e97b3c95adab9705997194563ce59f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 21:29:33 +0200 Subject: Switch to new homepage; Refresh metadata; remove unused patches --- debian/changelog | 2 ++ debian/control | 2 +- debian/files | 1 - debian/patches/0005-zlib.patch | 28 ---------------------------- debian/patches/0010-metadata.patch | 18 ------------------ debian/patches/0015-xdg-email.patch | 18 ------------------ debian/patches/0100-typos.patch | 18 ------------------ debian/patches/series | 4 ---- debian/upstream/metadata | 9 ++++----- 9 files changed, 7 insertions(+), 93 deletions(-) delete mode 100644 debian/files delete mode 100644 debian/patches/0005-zlib.patch delete mode 100644 debian/patches/0010-metadata.patch delete mode 100644 debian/patches/0015-xdg-email.patch delete mode 100644 debian/patches/0100-typos.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 35fc2de..3336909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,9 @@ simple-scan (3.28.1-1) unstable; urgency=medium + python3-gi + python3-gi-cairo - Switch Vcs-* to new location. + - Switch to new homepage. * Declare compliance with Debian Policy 4.1.5 (No changes needed). + * Refresh debian/upstream/metadata. -- Jörg Frings-Fürst Sun, 08 Jul 2018 14:45:45 +0200 diff --git a/debian/control b/debian/control index f329160..b465f78 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-Depends: valac (>= 0.22), yelp-tools, zlib1g-dev (>= 1.2.7) -Homepage: https://launchpad.net/simple-scan +Homepage: https://gitlab.gnome.org/GNOME/simple-scan Vcs-Git: git://jff.email/opt/git/simple-scan.git Vcs-Browser: https://jff.email/cgit/simple-scan.git diff --git a/debian/files b/debian/files deleted file mode 100644 index dbbe0a0..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -simple-scan_3.28.1-1_source.buildinfo gnome optional diff --git a/debian/patches/0005-zlib.patch b/debian/patches/0005-zlib.patch deleted file mode 100644 index 3e1fb0a..0000000 --- a/debian/patches/0005-zlib.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: add zlib -Last-Update: 2015-01-19 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/configure.ac -=================================================================== ---- trunk.orig/configure.ac -+++ trunk/configure.ac -@@ -71,6 +71,7 @@ AM_CONDITIONAL(HAVE_PACKAGEKIT, test $ha - - AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])]) - AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])]) -+AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])]) - - dnl ########################################################################### - dnl Documentation -Index: trunk/src/Makefile.am -=================================================================== ---- trunk.orig/src/Makefile.am -+++ trunk/src/Makefile.am -@@ -57,6 +57,7 @@ simple_scan_LDADD = \ - $(COLORD_LIBS) \ - $(PACKAGEKIT_LIBS) \ - -lsane \ -+ -lz \ - -lm - - CLEANFILES = \ diff --git a/debian/patches/0010-metadata.patch b/debian/patches/0010-metadata.patch deleted file mode 100644 index 7277159..0000000 --- a/debian/patches/0010-metadata.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Install metadate into /usr/share/metainfo/ -Author: Jörg Frings-Fürst -Last-Update: 2017-11-12 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/data/meson.build -=================================================================== ---- trunk.orig/data/meson.build -+++ trunk/data/meson.build -@@ -23,7 +23,7 @@ i18n.merge_file ('appdata-file', - input: 'simple-scan.appdata.xml.in', - output: 'simple-scan.appdata.xml', - install: true, -- install_dir: join_paths (datadir, 'appdata'), -+ install_dir: join_paths (datadir, 'metainfo'), - po_dir: '../po') - - install_man ('simple-scan.1') diff --git a/debian/patches/0015-xdg-email.patch b/debian/patches/0015-xdg-email.patch deleted file mode 100644 index a86c354..0000000 --- a/debian/patches/0015-xdg-email.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Add space between xdg-email ans parameter -Author: Jörg Frings-Fürst -Last-Update: 2018-01-13 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/app-window.vala -=================================================================== ---- trunk.orig/src/app-window.vala -+++ trunk/src/app-window.vala -@@ -1193,7 +1193,7 @@ public class AppWindow : Gtk.Application - yield book.save_async (type, settings.get_int ("jpeg-quality"), file, null, null); - var command_line = "xdg-email"; - if (type == "pdf") -- command_line += "--attach %s".printf (file.get_path ()); -+ command_line += " --attach %s".printf (file.get_path ()); - else - { - for (var i = 0; i < book.n_pages; i++) { diff --git a/debian/patches/0100-typos.patch b/debian/patches/0100-typos.patch deleted file mode 100644 index 0f63a81..0000000 --- a/debian/patches/0100-typos.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Typos -Author: Jörg Frings-Fürst -Last-Update: 206-04-10 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/autosave-manager.vala -=================================================================== ---- trunk.orig/src/autosave-manager.vala -+++ trunk/src/autosave-manager.vala -@@ -74,7 +74,7 @@ public class AutosaveManager - catch (Error e) - { - if (!(e is FileError.NOENT)) -- warning ("Could not load autosave infomation; not restoring any autosaves: %s", e.message); -+ warning ("Could not load autosave information; not restoring any autosaves: %s", e.message); - return; - } - var pages = get_value (file, "simple-scan", "pages"); diff --git a/debian/patches/series b/debian/patches/series index f4d4e7f..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +0,0 @@ -#0100-typos.patch -#0005-zlib.patch -#0015-xdg-email.patch -#0010-metadata.patch diff --git a/debian/upstream/metadata b/debian/upstream/metadata index abbb658..94669e3 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,6 +1,5 @@ -Bug-Database: https://bugs.launchpad.net/simple-scan -Bug-Submit: https://bugs.launchpad.net/simple-scan/+filebug -Contact: https://launchpad.net/~simple-scan-team +Bug-Database: https://gitlab.gnome.org/GNOME/simple-scan/issues +Bug-Submit: https://gitlab.gnome.org/GNOME/simple-scan/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D= Name: simple-scan -Repository: http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk -Repository-Browse: http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk/files +Repository: https://gitlab.gnome.org/GNOME/simple-scan.git +Repository-Browse: https://gitlab.gnome.org/GNOME/simple-scan/tree/master -- cgit v1.2.3