Imported Debian patch 0.84-2debian/0.84-2

6 files changed, 98 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index 62daa58..e2b14a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,84 @@
-xsane (0.50-5.1) stable; urgency=high
+xsane (0.84-2) unstable; urgency=low
 
-  * Non-maintainer upload by Security Team
-  * Fixed several temporary file vulnerabilities by introducing
-    /tmp/xsane-${LOGNAME:-$UID} as location for all temporary files,
-    created securely upon startup.
+  * relinked with libusb-0.1-4.
 
- -- Martin Schulze <joey@finlandia.infodrom.north.de>  Mon,  4 Mar 2002 18:50:02 +0100
+ -- Kevin Dalley <kevind@rahul.net>  Fri, 15 Mar 2002 14:20:02 +0000
+
+xsane (0.84-1) unstable; urgency=low
+
+  * new upstream release.
+  * relinked with new libpng-dev (closes: #136711).
+
+ -- Kevin Dalley <kevind@rahul.net>  Thu, 14 Mar 2002 02:23:44 +0000
+
+xsane (0.72-2) unstable; urgency=low
+
+  * New upstream version of xsane (closes: #105785).
+
+ -- Kevin Dalley <kevind@rahul.net>  Wed,  3 Oct 2001 00:36:17 -0700
+
+xsane (0.72-1) unstable; urgency=low
+
+  * New upstream version of xsane.  Many changes.
+
+ -- Kevin Dalley <kevind@rahul.net>  Mon, 12 Mar 2001 10:32:10 +0000
+
+xsane (0.70-1) unstable; urgency=low
+
+  * new upstream release of xsane.
+
+ -- Kevin Dalley <kevind@rahul.net>  Mon, 15 Jan 2001 04:16:25 -0800
+
+xsane (0.63-1) unstable; urgency=low
+
+  * new upstream version of xsane
+  * link sane-gimp1.1 with libgimp1.1-1.1.29.
+  * change control files so that packages sane and sane-gimp1.1 are
+    explicitly described as working with gimp and gimp1.1 respectively.
+    The package sane now mentions the packages sane-gimp1.1 and vice
+    versa.
+
+ -- Kevin Dalley <kevind@rahul.net>  Sun,  5 Nov 2000 16:43:07 -0800
+
+xsane (0.62-1) unstable; urgency=low
+
+  * New upstream version of xsane.
+
+ -- Kevin Dalley <kevind@rahul.net>  Sat, 21 Oct 2000 16:35:58 -0700
+
+xsane (0.61-2) unstable; urgency=low
+
+  * link xsane-gimp1.1 with libgimp1.1, which is new library.
+
+ -- Kevin Dalley <kevind@rahul.net>  Sat, 21 Oct 2000 16:25:04 -0700
+
+xsane (0.61-1) unstable; urgency=low
+
+  * new upstream release of xsane.
+
+ -- Kevin Dalley <kevind@rahul.net>  Sat,  9 Sep 2000 15:06:04 -0700
+
+xsane (0.59-1) unstable; urgency=low
+
+  * new upstream release of xsane
+  * added preview support for 16bpp
+  * miscellaneous changes and improvements
+
+ -- Kevin Dalley <kevind@rahul.net>  Tue,  4 Jul 2000 16:47:55 -0700
+
+xsane (0.50-7) unstable; urgency=low
+
+  * link xsane-gimp1.1 with libgimp1.1.22, which is the most recent
+    libgimp1.1 in unstable.
+
+ -- Kevin Dalley <kevind@rahul.net>  Mon,  3 Jul 2000 23:03:21 -0700
+
+xsane (0.50-6) unstable; urgency=low
+
+  * link xsane-gimp1.1 with libgimp1.1.19, which is the most recent
+    libgimp1.1 in unstable.
+
+ -- Kevin Dalley <kevind@rahul.net>  Fri,  7 Apr 2000 14:51:00 -0700
 
 xsane (0.50-5) frozen unstable; urgency=low
 
@@ -14,7 +87,7 @@ xsane (0.50-5) frozen unstable; urgency=low
 
  -- Kevin Dalley <kevind@rahul.net>  Wed,  5 Apr 2000 08:35:17 -0700
 
-xsane-gimp1.1 (0.50-4) frozen unstable; urgency=low
+xsane (0.50-4) frozen unstable; urgency=low
 
   * Add Build-Depends to control files for xsane and xsane-gimp1.1 (closes:
     #60923).
@@ -188,6 +261,4 @@ xsane (0.22-1) unstable; urgency=low
 
  -- Kevin Dalley <kevind@rahul.net>  Mon, 26 Apr 1999 23:03:13 -0700
     
-Local variables:
-mode: debian-changelog
-End:
+
diff --git a/debian/control b/debian/control
index 73d0e90..6484cc5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: graphics
 Priority: optional
 Maintainer: Kevin Dalley <kevind@rahul.net>
 Standards-Version: 3.0.0
-Build-Depends: libgimp-dev, libjpeg62-dev, libsane-dev, zlib1g-dev, libtiff3g-dev, libpng2-dev
+Build-Depends: libgimp1.2-dev (>= 1.2.0), libglib1.2-dev (>= 1.2.0), libgtk1.2-dev (>= 1.2.10-4), libjpeg62-dev, libpng-dev, libsane-dev (>= 1.0.7), libtiff3g-dev, libusb-dev, xlibs-dev (>= 4.0.1-11), zlib1g-dev (>= 1:1.1.3)
 
 Package: xsane
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: gimp (>= 1.0.0), hylafax-client | mgetty-fax
-Conflicts: xsane-gimp1.1, gimp1.1
+Suggests: gimp1.2, hylafax-client | mgetty-fax, gv
+Conflicts: xsane-gimp1.1
 Description: a gtk based X11 frontend for SANE (Scanner Access Now Easy)
  SANE stands for "Scanner Access Now Easy" and is an application
  programming interface (API) that provides standardized access to any
diff --git a/debian/control.xsane b/debian/control.xsane
index 73d0e90..6484cc5 100644
--- a/debian/control.xsane
+++ b/debian/control.xsane
@@ -3,14 +3,14 @@ Section: graphics
 Priority: optional
 Maintainer: Kevin Dalley <kevind@rahul.net>
 Standards-Version: 3.0.0
-Build-Depends: libgimp-dev, libjpeg62-dev, libsane-dev, zlib1g-dev, libtiff3g-dev, libpng2-dev
+Build-Depends: libgimp1.2-dev (>= 1.2.0), libglib1.2-dev (>= 1.2.0), libgtk1.2-dev (>= 1.2.10-4), libjpeg62-dev, libpng-dev, libsane-dev (>= 1.0.7), libtiff3g-dev, libusb-dev, xlibs-dev (>= 4.0.1-11), zlib1g-dev (>= 1:1.1.3)
 
 Package: xsane
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: gimp (>= 1.0.0), hylafax-client | mgetty-fax
-Conflicts: xsane-gimp1.1, gimp1.1
+Suggests: gimp1.2, hylafax-client | mgetty-fax, gv
+Conflicts: xsane-gimp1.1
 Description: a gtk based X11 frontend for SANE (Scanner Access Now Easy)
  SANE stands for "Scanner Access Now Easy" and is an application
  programming interface (API) that provides standardized access to any
diff --git a/debian/control.xsane-gimp1.1 b/debian/control.xsane-gimp1.1
index 27e6124..9afeab1 100644
--- a/debian/control.xsane-gimp1.1
+++ b/debian/control.xsane-gimp1.1
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Kevin Dalley <kevind@rahul.net>
 Standards-Version: 3.0.0
-Build-Depends: libgimp1.1.17-dev, libjpeg62-dev, libsane-dev, zlib1g-dev, libtiff3g-dev, libpng2-dev
+Build-Depends: libc6-dev, libglib1.2-dev, libgtk1.2-dev, libjpeg62-dev, libpng2-dev, libsane-dev, libtiff3g-dev, zlib1g-dev, xlib6g-dev, libgimp1.1-dev (>= 1.1.32), libgimp1.1-dev (<< 1.1.33)
 
 Package: xsane-gimp1.1
 Section: graphics
diff --git a/debian/rules b/debian/rules
index 898556d..b7087cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ CFLAGS = -O2 -g
 # LDFLAGS = -s LDFLAGS is not correctly defined in Makefile.in
 prefix=/usr
 package=xsane
-gimp-version=1.0
+gimp-version=1.2
 
 build:
 	$(checkdir)
@@ -63,15 +63,13 @@ binary-arch:	checkroot build
 	install -d debian/tmp-$(package)$(prefix)/lib/gimp/$(gimp-version)/plug-ins
 	ln -sf ../../../../bin/xsane \
 		debian/tmp-$(package)$(prefix)/lib/gimp/$(gimp-version)/plug-ins
-	for file in xsane.AUTHOR xsane.CHANGES \
-		xsane.IMAGE xsane.LANGUAGES xsane.ONLINEHELP \
-		xsane.PROBLEMS xsane.TODO \
-		xsane-*.lsm; \
+	for file in xsane.* ; \
 	do \
 		install -m 644 $${file} \
 			debian/tmp-$(package)$(prefix)/share/doc/$(package); \
 		gzip -9v debian/tmp-$(package)$(prefix)/share/doc/$(package)/$${file}; \
 	done
+	rm -f debian/tmp-$(package)$(prefix)/share/doc/$(package)/xsane.COPYING.gz
 	ln -s xsane.CHANGES.gz \
 		debian/tmp-$(package)$(prefix)/share/doc/$(package)/changelog.gz
 	ln -s ../sane \
@@ -80,12 +78,14 @@ binary-arch:	checkroot build
 	install -m 0644 debian/copyright debian/tmp-$(package)$(prefix)/share/doc/$(package)/.
 	install -m 0644 debian/changelog \
 		debian/tmp-$(package)$(prefix)/share/doc/$(package)/changelog.Debian
+	rm -f debian/tmp-$(package)$(prefix)/share/doc/$(package)/sane/xsane/xsane-license.txt
+	ln -s ../../../../common-licenses/GPL debian/tmp-$(package)$(prefix)/share/doc/$(package)/sane/xsane/xsane-license.txt
 	gzip -9v \
 		debian/tmp-$(package)$(prefix)/share/doc/$(package)/changelog.Debian
 	install -d debian/tmp-$(package)/usr/lib/menu
 	install -m 0644 debian/menu.$(package) debian/tmp-$(package)/usr/lib/menu/$(package)
-	dpkg-shlibdeps debian/tmp-$(package)$(prefix)/bin/*
-	strip debian/tmp-$(package)$(prefix)/bin/*
+	dpkg-shlibdeps debian/tmp-$(package)$(prefix)/bin/xsane
+	strip debian/tmp-$(package)$(prefix)/bin/xsane
 	dpkg-gencontrol -isp -p$(package) -Pdebian/tmp-$(package)
 	dpkg --build debian/tmp-$(package) ..
 
@@ -113,7 +113,7 @@ xsane-gimp1.1-files:
 	mv debian/changelog.new debian/changelog
 	rm -f debian/rules.new
 	sed -e's/^package=xsane$$/package=xsane-gimp1.1/' \
-		-e 's/^gimp-version=1.0$$/gimp-version=1.1/' debian/rules > \
+		-e 's/^gimp-version=1.2$$/gimp-version=1.1/' debian/rules > \
 		debian/rules.new
 	mv debian/rules.new debian/rules
 	chmod a+x debian/rules
@@ -127,7 +127,7 @@ xsane-files:
 	mv debian/changelog.new debian/changelog
 	rm -f debian/rules.new
 	sed -e's/^package=xsane-gimp1.1$$/package=xsane/' \
-		-e 's/^gimp-version=1.1$$/gimp-version=1.0/' debian/rules > \
+		-e 's/^gimp-version=1.1$$/gimp-version=1.2/' debian/rules > \
 		debian/rules.new
 	mv debian/rules.new debian/rules
 	chmod a+x debian/rules
diff --git a/debian/substvars b/debian/substvars
index 3bb265a..e6a2cc5 100644
--- a/debian/substvars
+++ b/debian/substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.1.2), libgimp1.1.17 (>= 1.1.17-3), libglib1.2 (>= 1.2.0), libgtk1.2 (>= 1.2.7-1), libjpeg62, libpng2, libsane (>= 1.0.1-1999-10-21-7), libtiff3g, libz1, xlib6g (>= 3.3.6)
+shlibs:Depends=libc6 (>= 2.2.4-4), libgimp1.2 (>= 1.2.0), libglib1.2 (>= 1.2.0), libgtk1.2 (>= 1.2.10-4), libjpeg62, libpng3, libsane (>= 1.0.7), libtiff3g, libusb-0.1-4 (>= 1:0.1.5-2), xlibs (>> 4.1.0), zlib1g (>= 1:1.1.3)