getting in sync with the debian 1.1.2 package

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1255 7ae35d74-ebe9-4afe-98af-79ac388436b8

debian/changelog

@@ -1,9 +1,38 @@
-hamlib (1.1.1-1.1) unstable; urgency=low
+hamlib (1.1.2-5) unstable; urgency=low
 
-  * Non-maintainer upload.
+  * Updated section details to prevents overrides message.
-  * Run libtoolize to get support for new architectures.  Closes: #104602
+
+ -- Terry Dawson <terry@animats.net>  Sat, 29 Dec 2001 18:53:26 +1000
+
+hamlib (1.1.2-4) unstable; urgency=low
+
+  * Corrected spelling mistake in package description.
+  * (Closes: #124717)
+  * (Closes: #124718)
+  * (Closes: #124719)
+
+ -- Terry Dawson <terry@animats.net>  Fre, 28 Dec 2001 20:12:50 +1000
+
+hamlib (1.1.2-3) unstable; urgency=low
+
+  * Ensured that shared library .la files are installed correctly, thanks Joop.
+  * (Closes: #123009)
+  * (Closes: #123010)
+
+ -- Terry Dawson <terry@animats.net>  Sun, 12 Dec 2001 20:35:02 +1000
+
+hamlib (1.1.2-2) unstable; urgency=low
+
+  * Removed spurious include of eti.h, thanks James. (Closes: #114128)
+
+ -- Terry Dawson <terry@animats.net>  Tue, 02 Oct 2001 18:58:43 +1000
+
+hamlib (1.1.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #104602)
+
+ -- Terry Dawson <terry@animats.net>  Sun, 24 Sep 2001 21:44:56 +1000
 
- -- LaMont Jones <lamont@debian.org>  Fri, 13 Jul 2001 16:41:45 -0600
 
 hamlib (1.1.1-1) unstable; urgency=low
 

debian/control

@@ -2,11 +2,12 @@ Source: hamlib
 Section: hamradio
 Priority: optional
 Maintainer: Terry Dawson <terry@animats.net>
-Build-Depends: debhelper (>> 3.0.0), autoconf, automake, libtool
+Build-Depends: debhelper (>> 3.0.0), autoconf, automake, libtool, doxygen
 Standards-Version: 3.5.2
 
 Package: hamlib-dev
 Architecture: any
+Section: devel
 Depends: hamlib1 (= ${Source-Version}), libc6-dev
 Description: Development library to control radio transcievers and receivers.
  Most recent amateur radio transceivers allow external control of their
@@ -18,11 +19,13 @@ Description: Development library to control radio transcievers and receivers.
  interface that applications can talk to and translating that into the
  appropriate commands required by the radio in use.
  .
- This package provides the development library. If you wish to run applications
+ This package provides the development library with both C and C++ bindings.
- developed using this library you'll need the 'hamlib' package.
+ If you wish to run applications developed using this library you'll need the
+ 'hamlib1' package.
 
 Package: hamlib1
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}
 Description: Run-time library to control radio transcievers and receivers.
  Most recent amateur radio transceivers allow external control of their
@@ -36,3 +39,35 @@ Description: Run-time library to control radio transcievers and receivers.
  .
  This package provides the run-time form of the library. If you wish to
  develop software using this library you need the 'hamlib-dev' package.
+
+Package: hamlib-utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Utilities to support the hamlib radio control library.
+ Most recent amateur radio transceivers allow external control of their
+ functions through a computer interface. Unfortunately, control commands are
+ not always consistent across a manufacturer's product line and each
+ manufacturer's product line differs greatly from its competitors.
+ .
+ This library addresses that issue by providing a standardised programming
+ interface that applications can talk to and translating that into the
+ appropriate commands required by the radio in use.
+ .
+ This package provides a command-line utility to test the hamlib library and
+ to control transceivers if you're short of anything more sophisticated.
+
+Package: hamlib-doc
+Architecture: any
+Section: doc
+Suggests: www-browser
+Description: Documentation for the hamlib radio control library.
+ Most recent amateur radio transceivers allow external control of their
+ functions through a computer interface. Unfortunately, control commands are
+ not always consistent across a manufacturer's product line and each
+ manufacturer's product line differs greatly from its competitors.
+ .
+ This library addresses that issue by providing a standardised programming
+ interface that applications can talk to and translating that into the
+ appropriate commands required by the radio in use.
+ .
+ This package provides the developers documentation for the API.

debian/docs

@@ -6,4 +6,3 @@ PLAN
 AUTHORS
 THANKS
 ChangeLog
-doc/

debian/rules

@@ -9,7 +9,7 @@
 export DH_COMPAT=3
 
 # shared library versions, option 1
-version=1.1.1
+version=1.1.2
 major=1
 # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
 #version=`ls src/.libs/lib*.so.* | \
@@ -31,6 +31,7 @@ build-stamp:
 
 	# Add here commands to compile the package.
 	$(MAKE)
+	$(MAKE) -C doc doc
 
 	touch build-stamp
 
@@ -51,15 +52,24 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	# Move the appropriate files into the development package..
 	mv $(CURDIR)/debian/tmp/lib/libhamlib.so $(CURDIR)/debian/hamlib-dev/usr/lib/
 	mv $(CURDIR)/debian/tmp/lib/*.a $(CURDIR)/debian/hamlib-dev/usr/lib/
-	mv $(CURDIR)/debian/tmp/include/*.h $(CURDIR)/debian/hamlib-dev/usr/include/
+	mv $(CURDIR)/debian/tmp/include/hamlib $(CURDIR)/debian/hamlib-dev/usr/include/
 
 	# Move the appropriate files into the runtime package..
 	mv $(CURDIR)/debian/tmp/lib/*.so $(CURDIR)/debian/hamlib1/usr/lib/
+	mv $(CURDIR)/debian/tmp/lib/*.la $(CURDIR)/debian/hamlib1/usr/lib/
+
+	# Move the appropriate files into the documentation package..
+	mv $(CURDIR)/doc/html $(CURDIR)/debian/hamlib-doc/usr/share/doc/hamlib-doc/
+	mv $(CURDIR)/doc/latex $(CURDIR)/debian/hamlib-doc/usr/share/doc/hamlib-doc/
+
+	# Move the appropriate files into the utils package..
+	mv $(CURDIR)/debian/tmp/bin/rigctl $(CURDIR)/debian/hamlib-utils/usr/bin/
+	mv $(CURDIR)/debian/tmp/share/man/man1/rigctl.1 $(CURDIR)/debian/hamlib-utils/usr/share/man/man1
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -69,8 +79,8 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_movefiles
 
+#	dh_movefiles
 #	dh_installdebconf	
 	dh_installdocs
 #	dh_installexamples
@@ -81,7 +91,7 @@ binary-arch: build install
 #	dh_installmime
 #	dh_installinit
 #	dh_installcron
-	dh_installman
+#	dh_installman
 #	dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs ChangeLog
@@ -89,7 +99,7 @@ binary-arch: build install
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -Xaor -Xdummy -Xicom -Xkenwood -Xpcr -Xft747 -Xft847 -Xwinradio
+	dh_makeshlibs -Xalinco -Xaor -Xdummy -Xicom -Xkachina -Xkenwood -Xpcr -Xtentec -Xuniden -Xwinradio -Xyaesu
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps