Remove intltool

5 files changed, 11 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 8292c63..6320da0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-simple-scan (3.21.1-1) UNRELEASED; urgency=medium
+simple-scan (3.21.90-1) unstable; urgency=medium
 
   * New upstream release:
     - Updated translations.
+    - Use recent features of gettext, dropping intltool.
   * Refresh patches/0005-zlib.patch.
+  * Dropping intltool:
+    - debian/control: Remove intltool from Build-Depends.
+    - debian/rules: Remove intltool.
+  * Remove upstream applied patch:
+    - debian/patches/0100-typos.patch.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 30 Apr 2016 06:40:22 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 24 Aug 2016 05:18:08 +0200
 
 simple-scan (3.20.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 65d706a..f0ca457 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends:
  debhelper (>= 9),
  dh-autoreconf,
  gnome-pkg-tools (>= 0.10),
- intltool,
  libcairo2-dev,
  libcolord-dev,
  libdbus-glib-1-dev,
diff --git a/debian/patches/0005-zlib.patch b/debian/patches/0005-zlib.patch
index 1e45df8..0fda723 100644
--- a/debian/patches/0005-zlib.patch
+++ b/debian/patches/0005-zlib.patch
@@ -6,7 +6,7 @@ Index: trunk/configure.ac
 ===================================================================
 --- trunk.orig/configure.ac
 +++ trunk/configure.ac
-@@ -69,6 +69,7 @@ AM_CONDITIONAL(HAVE_PACKAGEKIT, test $ha
+@@ -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])])
diff --git a/debian/patches/series b/debian/patches/series
index a9456eb..74172d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0100-typos.patch
+#0100-typos.patch
 0005-zlib.patch
diff --git a/debian/rules b/debian/rules
index b6b5a40..500ea2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ override_dh_auto_clean:
 	rm gnome-doc-utils.make
 
 override_dh_auto_build:
-	cd po; intltool-update -p
+#	cd po; intltool-update -p
 	dh_auto_build
 
 override_dh_strip: