Merge branch 'debian-packages-r6'

debian/Makefile.Debian.conf

@@ -1,34 +0,0 @@
-PKG_NAME=iconv
-
-### things relative to the C library part
-CLIB_CFLAGS=
-CLIB_LDFLAGS=
-CLIB_OBJS=luaiconv.lo
-VERSION_INFO=0:0:0
-
-### things relative to the lua library part
-LUA_HEADER=
-LUA_SOURCES=
-LUA_MODNAME=iconv
-LUA_TEST=test_iconv.lua
-
-### this part is relative to pkg-config
-PKG_VERSION=$(shell dpkg-parsechangelog|grep ^Ver|cut -d ' ' -f 2|cut -d '-' -f 1)
-PKG_LIBS_PRIVATE=
-PKG_URL=http://lua-iconv.luaforge.net/
-PKG_REQUIRES=
-PKG_CONFLICTS=
-
-### In addition, to gather flexibility, you can set these hooks
-### (called in this order)
-pre-all-hook::
-post-all-hook::
-pre-test-hook::
-pre-lua-dynamic-test-hook::
-pre-dynamic-link-hook::
-pre-app-dynamic-test-hook::
-pre-static-link-hook::
-pre-app-static-test-hook::
-post-test-hook::
-pre-install-hook::
-post-install-hook::

debian/changelog

@@ -1,13 +1,22 @@
-lua-iconv (0.r4-1) unstable; urgency=low
+lua-iconv (6-3) unstable; urgency=low
 
-  * New Debian packages according to the Debian Lua policy.
+  * debian/control: Conflicts, Provides, and Replaces lua-iconv
+    (Closes: #557052)
 
- -- Alexandre Erwin Ittner <aittner@gmail.com>  Sun, 11 May 2008 12:30:00 -0300
+ -- Jon Bernard <jbernard@debian.org>  Fri, 20 Nov 2009 18:58:12 -0600
 
+lua-iconv (6-2) unstable; urgency=low
 
-lua-iconv (0.r3-1) unstable; urgency=low
+  * debian/control: update package name to conform to lua standard
+    (Closes: #544958)
+  * debian/control: add Vcs fields
+  * debian/control: update package description
+  * debian/watch: look for new upstream releases on luaforge (Closes: #544960)
 
-  * First release in .deb format.
+ -- Jon Bernard <jbernard@debian.org>  Wed, 28 Oct 2009 11:58:00 -0400
 
- -- Alexandre Erwin Ittner <aittner@netuno.com.br>  Wed,  3 Feb 2007 00:20:09 -0200
+lua-iconv (6-1) unstable; urgency=low
 
+  * Initial release (Closes: #540298)
+
+ -- Jon Bernard <jbernard@debian.org>  Sun, 02 Aug 2009 13:50:50 -0400

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -1,26 +1,21 @@
 Source: lua-iconv
 Section: interpreters
 Priority: optional
-Maintainer: Alexandre Erwin Ittner <aittner@gmail.com>
+Maintainer: Jon Bernard <jbernard@debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, lua5.1-policy-dev (>= 8)
+Build-Depends: debhelper (>= 7), liblua5.1-dev, lua5.1, pkg-config
-Standards-Version: 3.7.2
+Standards-Version: 3.8.2
-XS-X-Vcs-svn: svn://svn.debian.org/pkg-lua/packages/lua-iconv
+Vcs-Svn: svn://svn.debian.org/pkg-lua/packages/lua-iconv
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-lua/packages/lua-iconv
+Homepage: http://luaforge.net/projects/lua-iconv/
 
-Package: liblua5.1-iconv
+Package: liblua5.1-iconv0
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: iconv bindings for the Lua Programming Language
+Recommends: lua5.1
-  Lua-iconv is POSIX 'iconv' binding for the Lua Programming Language. It
+Conflicts: lua-iconv
-  converts a sequence of characters from one codeset into a sequence of
+Provides: lua-iconv
+Replaces: lua-iconv
+Description: iconv bindings for the Lua programming language
+ This package provides POSIX 'iconv' bindings for the Lua programming language.
+ It converts a sequence of characters from one codeset into a sequence of
  corresponding characters in another codeset.
-  Homepage: <http://lua-iconv.luaforge.net/>
-
-Package: liblua5.1-iconv-dev
-Architecture: any
-Depends: liblua5.1-iconv (= ${Source-Version})
-Description: iconv development files for the lua language version 5.1
- This package contains the development files of the iconv lua5.1 bindings,
- useful to create a statically linked binary (like a C application or a
- standalone lua interpreter).
- Documentation is also shipped within this package.
- Homepage: <http://lua-iconv.luaforge.net/>

debian/copyright

@@ -1,23 +1,42 @@
-lua-iconv (c) 2005-2007 Alexandre Erwin Ittner
+This package was debianized by Jon Bernard <jbernard@debian.org> on
+Sun, 02 Aug 2009 13:50:50 -0400.
 
-Permission is hereby granted, free of charge, to any person obtaining
+It was downloaded from http://luaforge.net/frs/?group_id=131&release_id=1440
-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, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
 
-The above copyright notice and this permission notice shall be
+Upstream Author:
-included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    Alexandre Erwin Ittner <aittner@gmail.com>
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHOR OR COPYRIGHT HOLDER BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-If you use this package in a product, an acknowledgment in the product
+Copyright:
-documentation would be greatly appreciated (but it is not required).
+
+    Copyright (C) 2005-09 Alexandre Erwin Ittner
+
+License:
+
+    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, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    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.  IN NO EVENT SHALL
+    THE AUTHOR OR COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+
+   If you use this package in a product, an acknowledgment in the product
+   documentation would be greatly appreciated (but it is not required).
+
+The Debian packaging is:
+
+    Copyright (C) 2009 Jon Bernard <jbernard@debian.org>
+
+and is licensed under the GPL version 3,
+see `/usr/share/common-licenses/GPL-3'.

debian/examples

@@ -0,0 +1 @@
+test_iconv.lua

debian/rules

@@ -1,15 +1,3 @@
 #!/usr/bin/make -f
-
+%:
-include /usr/share/cdbs/1/class/makefile.mk
+	dh $@
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-
-DEB_MAKE_BUILD_TARGET := all -f Makefile.Debian
-DEB_MAKE_TEST_TARGET := test -f Makefile.Debian
-DEB_MAKE_CLEAN_TARGET := clean -f Makefile.Debian
-DEB_MAKE_INSTALL_TARGET := install -f Makefile.Debian DESTDIR=$(DEB_DESTDIR)
-DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
-pre-build::
-	lua5.1-policy-apply
-clean::
-	lua5.1-policy-apply --reverse

debian/watch

@@ -1,5 +1,2 @@
-# test this watch file using:
-# uscan --watchfile debian/watch --upstream-version 0.0.1 --package lua-iconv
-#
 version=3
-http://luaforge.net/frs/download.php/\d+/lua-iconv-([\d\.]*).tar.gz
+http://luaforge.net/frs/?group_id=131 /frs/download.php/\d+/lua-iconv-([\d\.]*).tar.gz

maketargz.sh

@@ -9,7 +9,7 @@ TGZNAME=$DIRNAME.tar.gz
 rm -f $TGZNAME
 mkdir $DIRNAME
 
-#cp -r debian $DIRNAME/
+cp -r debian $DIRNAME/
 #rm -rf $DIRNAME/debian/.svn
 
 cp -r COPYING Makefile README luaiconv.c test_iconv.lua $DIRNAME