Imported Debian patch 0.99+0.991-4debian/0.99+0.991-4

4 files changed, 21 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f4c508..2a6f1c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xsane (0.99+0.991-4) unstable; urgency=low
+
+  * debian/control:
+    + Remove obsolete Build-Conflicts: libpng10-dev.
+    + Remove obsolete Conflicts/Replaces: xsane-gimp1.{2,3}.
+    + Update browser recommendation.
+    + Improve short description.
+  * debian/rules:
+    + Do not ignore errors from make distclean.
+
+ -- Julien BLACHE <jblache@debian.org>  Thu, 02 Aug 2007 18:15:18 +0200
+
 xsane (0.99+0.991-3) unstable; urgency=low
 
   * debian/patches/10_broken_links.dpatch:
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 6f529d7..2c503e7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,15 @@ Section: graphics
 Priority: optional
 Maintainer: Julien BLACHE <jblache@debian.org>
 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
+Build-Depends: debhelper (>= 5), 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
 
 Package: xsane
 Section: graphics
 Architecture: any
 Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}
-Recommends: mozilla-browser | www-browser
+Recommends: iceweasel | www-browser
 Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
-Conflicts: xsane-gimp1.2, xsane-gimp1.3
-Replaces: xsane-gimp1.2, xsane-gimp1.3
-Description: GTK+-based X11 frontend for SANE (Scanner Access Now Easy)
+Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
  xsane can be run as a stand-alone program or through the GIMP image
  manipulation program.  In stand-alone mode, xsane can save an image
  to a file in a variety of image formats, serve as a frontend to a
@@ -35,7 +32,7 @@ Section: graphics
 Architecture: all
 Replaces: xsane
 Recommends: xsane
-Description: GTK+-based X11 frontend for SANE (Scanner Access Now Easy)
+Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
  xsane can be run as a stand-alone program or through the GIMP image 
  manipulation program.  In stand-alone mode, xsane can save an image 
  to a file in a variety of image formats, serve as a frontend to a 
diff --git a/debian/rules b/debian/rules
index 696e018..daa272b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ endif
 
 autotools: autotools-stamp
 autotools-stamp:
-	-rm -f config.sub config.guess
+	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
@@ -54,10 +54,10 @@ real-clean:
 	rm -f autotools-stamp build-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
-	-rm -f config.sub config.guess
-	-rm -f po/*.gmo
+	rm -f config.sub config.guess
+	rm -f po/*.gmo
 
 	dh_clean
 
@@ -146,15 +146,12 @@ binary-arch: build install
 	dh_installmenu -a
 	dh_installman -a
 #	dh_installinfo -a
-#	dh_undocumented -a
 	dh_installchangelogs -a xsane.CHANGES
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-#	dh_makeshlibs -a
 	dh_installdeb -a
-#	dh_perl -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a