[med-svn] r17961 - in trunk/packages/libtecla/trunk/debian: . patches

Mon Sep 8 08:14:21 UTC 2014

Author: tille
Date: 2014-09-08 08:14:20 +0000 (Mon, 08 Sep 2014)
New Revision: 17961

Modified:
   trunk/packages/libtecla/trunk/debian/changelog
   trunk/packages/libtecla/trunk/debian/control
   trunk/packages/libtecla/trunk/debian/copyright
   trunk/packages/libtecla/trunk/debian/patches/remove_makefile_to_enable_smooth_regeneration.patch
   trunk/packages/libtecla/trunk/debian/rules
Log:
Fix d-shlibs call and use unversioned devel package, debian/copyright: DEP5



Modified: trunk/packages/libtecla/trunk/debian/changelog
===================================================================

--- trunk/packages/libtecla/trunk/debian/changelog	2014-09-08 07:48:36 UTC (rev 17960)
+++ trunk/packages/libtecla/trunk/debian/changelog	2014-09-08 08:14:20 UTC (rev 17961)
@@ -7,6 +7,8 @@
   * debian/patches/remove_makefile_to_enable_smooth_regeneration.patch:
     Avoid recursive make call by simply removing redundant Makefile
     Closes: #760790
+  * Fix d-shlibs call and use unversioned devel package
+  * debian/copyright: DEP5
 
  -- Andreas Tille <tille at debian.org>  Mon, 08 Sep 2014 09:18:09 +0200
 

Modified: trunk/packages/libtecla/trunk/debian/control
===================================================================
--- trunk/packages/libtecla/trunk/debian/control	2014-09-08 07:48:36 UTC (rev 17960)
+++ trunk/packages/libtecla/trunk/debian/control	2014-09-08 08:14:20 UTC (rev 17961)
@@ -12,13 +12,11 @@
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libtecla/trunk/
 Homepage: http://www.astro.caltech.edu/~mcs/tecla/
 
-Package: libtecla1-dev
+Package: libtecla-dev
 Architecture: any
 Section: libdevel
 Depends: libtecla1 (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: libtecla-dev
-Provides: libtecla-dev
 Description: interactive command line editing facilities (development)
  The tecla library provides UNIX and LINUX programs with interactive
  command line editing facilities, similar to those of the UNIX tcsh

Modified: trunk/packages/libtecla/trunk/debian/copyright
===================================================================
--- trunk/packages/libtecla/trunk/debian/copyright	2014-09-08 07:48:36 UTC (rev 17960)
+++ trunk/packages/libtecla/trunk/debian/copyright	2014-09-08 08:14:20 UTC (rev 17961)
@@ -1,33 +1,39 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: libtecla
-Maintainer: Martin C. Shepherd <mcs at astro.caltech.edu>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libtecla
+Upstream-Contact: Martin C. Shepherd <mcs at astro.caltech.edu>
 Source: http://www.astro.caltech.edu/~mcs/tecla
 
-Copyright (c) 2000, 2001, 2002, 2003, 2004 by Martin C. Shepherd.
+Files: *
+Copyright: 2000-2014 by Martin C. Shepherd
+License: BSDlike
 
-All rights reserved.
+Files: debian/*
+Copyright: 2011 Scott Christley <schristley at mac.com>
+           2011-2014 Andreas Tille <tille at debian.org>
+License: BSDlike
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
+License: BSDlike
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.

Modified: trunk/packages/libtecla/trunk/debian/patches/remove_makefile_to_enable_smooth_regeneration.patch
===================================================================
--- trunk/packages/libtecla/trunk/debian/patches/remove_makefile_to_enable_smooth_regeneration.patch	2014-09-08 07:48:36 UTC (rev 17960)
+++ trunk/packages/libtecla/trunk/debian/patches/remove_makefile_to_enable_smooth_regeneration.patch	2014-09-08 08:14:20 UTC (rev 17961)
@@ -1,3 +1,8 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Updated: Mon, 08 Sep 2014 09:18:09 +0200
+Bug-Debian: http://bugs.debian.org/760790
+Description: Avoid recursive make call by simply removing redundant Makefile
+
 --- a/Makefile
 +++ /dev/null
 @@ -1,12 +0,0 @@

Modified: trunk/packages/libtecla/trunk/debian/rules
===================================================================
--- trunk/packages/libtecla/trunk/debian/rules	2014-09-08 07:48:36 UTC (rev 17960)
+++ trunk/packages/libtecla/trunk/debian/rules	2014-09-08 08:14:20 UTC (rev 17961)
@@ -3,23 +3,13 @@
 export DH_VERBOSE=1
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autoreconf
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-name := $(pkg)
-version=$(shell dpkg-parsechangelog | awk '/^Version/ { print $2 }' | cut -d- -f1 )
-
 override_dh_install:
 	dh_install
-	# Call d-shlibmove to comply with library packaging guide
-	d-devlibdeps debian/$(pkg)1-dev.substvars \
-	             debian/tmp/usr/lib/$(name).so
 	d-shlibmove --commit \
-		    --movedev "debian/tmp/usr/include/$(name).h" usr/include/ \
-		    debian/tmp/usr/lib/$(name).so
-
-	# Remove unneeded *.la files according to
-	# http://lists.debian.org/debian-devel/2009/08/msg00783.html
-	# Release goal: Getting rid of unneeded *.la / emptying dependency_libs
-	#find debian -name "*.la" -delete
-
+		    --multiarch \
+		    --devunversioned \
+		    --exclude-la \
+		    --movedev "debian/tmp/usr/include/*.h" usr/include/ \
+		    debian/tmp/usr/lib/*/*.so


