diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rw-r--r-- | debian/patches/005-keywords_desktop.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 12 |
5 files changed, 38 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 414558a..5ca5d81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +simple-scan (3.13.90-1) unstable; urgency=medium + + * New upstream release. + * debian/control: + - Change Vcs-Browser to cgit. + * New debian/patches/015-keywords_desktop.patch: + - Add missing Keywords entry to the .desktop file. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 18 Aug 2014 19:42:34 +0200 + simple-scan (3.13.4.2-1) unstable; urgency=medium * New maintainer (Closes: #720540). diff --git a/debian/control b/debian/control index 78d90a3..1e2dc70 100644 --- a/debian/control +++ b/debian/control @@ -12,23 +12,24 @@ Build-Depends: libcairo2-dev, libcolord-dev, libdbus-glib-1-dev, - libglib2.0-dev, + libglib2.0-dev (>= 2.32), libgtk-3-dev, libgudev-1.0-dev, libjpeg-dev, libsane-dev, python-scour, + libsqlite3-dev, valac (>= 0.22), yelp-tools, - zlib1g-dev + zlib1g-dev (>= 1.2.7) Homepage: https://launchpad.net/simple-scan Vcs-Git: git://anonscm.debian.org/collab-maint/simple-scan.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simple-scan.git +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/simple-scan.git Package: simple-scan Architecture: any Depends: - dbus-x11 (>= 1.8), + dbus-x11 (>= 1.6), gnome-icon-theme, xdg-utils, ${misc:Depends}, diff --git a/debian/patches/005-keywords_desktop.patch b/debian/patches/005-keywords_desktop.patch new file mode 100644 index 0000000..02cb317 --- /dev/null +++ b/debian/patches/005-keywords_desktop.patch @@ -0,0 +1,15 @@ +Description: Add _Keywords to .desktop file +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Forwarded: not-needed +Last-Update: 2014-08-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/data/simple-scan.desktop.in +=================================================================== +--- trunk.orig/data/simple-scan.desktop.in 2013-06-05 08:21:08.000000000 +0200 ++++ trunk/data/simple-scan.desktop.in 2014-08-18 19:31:47.717829473 +0200 +@@ -8,3 +8,4 @@ + StartupNotify=true + Categories=GNOME;GTK;Graphics;Scanning; + X-GNOME-Gettext-Domain=simple-scan ++Keywords=scan;simple;sane;documents; diff --git a/debian/patches/series b/debian/patches/series index f505775..32af344 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +005-keywords_desktop.patch 01-zlib.patch diff --git a/debian/rules b/debian/rules index 6f87a57..66ff5ec 100755 --- a/debian/rules +++ b/debian/rules @@ -14,13 +14,15 @@ # # export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +#export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +#export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +#export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +#export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS+=-Wl,--as-needed +#LDFLAGS+=-Wl,--as-needed %: dh $@ --with=autoreconf,scour |