summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien BLACHE <jblache@debian.org>2007-01-07 19:00:11 +0100
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:27 +0000
commitdd3102901112f4fc76a033925f42222820d1eba5 (patch)
tree4ab51744ce6a8daed3d57bd5777e05d99dc1fd4a
parent9d7d5dc7bfe282d0e3df4ea4111fa4a37f1629a2 (diff)
Imported Debian patch 0.99+0.991-2debian/0.99+0.991-2
-rw-r--r--debian/changelog11
-rw-r--r--debian/control5
-rw-r--r--include/config.h4
3 files changed, 15 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 722b5e2..e95de6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xsane (0.99+0.991-2) unstable; urgency=low
+
+ * debian/control:
+ + Bumped Standards-Version to 3.7.2 (no changes).
+ + Fix dependency on xsane-common to be binNMU-safe.
+ + Remove Uploaders.
+
+ Thank you Aurélien JARNO for your help during these years.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 7 Jan 2007 19:00:11 +0100
+
xsane (0.99+0.991-1) unstable; urgency=low
* New upstream bugfix release (0.991).
diff --git a/debian/control b/debian/control
index f066847..6f529d7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,14 @@ Source: xsane
Section: graphics
Priority: optional
Maintainer: Julien BLACHE <jblache@debian.org>
-Uploaders: Aurelien Jarno <aurel32@debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
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}
+Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}
Recommends: mozilla-browser | www-browser
Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
Conflicts: xsane-gimp1.2, xsane-gimp1.3
diff --git a/include/config.h b/include/config.h
index 43f2485..889c5c1 100644
--- a/include/config.h
+++ b/include/config.h
@@ -274,10 +274,10 @@
#define HAVE_ANY_GIMP 1
/* Define if you have GIMP-2.0 installed. */
-/* #undef HAVE_GIMP_2 */
+#define HAVE_GIMP_2 1
/* Define if you have the GIMPfeatures header file. */
-#define HAVE_LIBGIMP_GIMPFEATURES_H 1
+/* #undef HAVE_LIBGIMP_GIMPFEATURES_H */
/* Define if you have libjpeg. */
#define HAVE_LIBJPEG 1