--- 2vcard-0.5.orig/Makefile
+++ 2vcard-0.5/Makefile
@@ -1,8 +1,9 @@
-DOC = doc/html/index.html doc/html/index-1.html doc/html/index-2.html \
-		doc/html/index-3.html doc/html/index-4.html doc/html/index-5.html
+#DOC = doc/html/index.html doc/html/index-1.html doc/html/index-2.html \
+#		doc/html/index-3.html doc/html/index-4.html doc/html/index-5.html
+DOC = doc/html
 
-INSTALL = install -c -m 644
-PREFIX= /usr/local
+INSTALL = install -d -m 644
+PREFIX= $(DESTDIR)/usr
 
 all:
 
@@ -11,5 +12,5 @@
 	install -d $(PREFIX)/share/man/man1
 	install -d $(PREFIX)/share/doc/2vcard
 	install -c -m 755 src/2vcard $(PREFIX)/bin
-	$(INSTALL) doc/2vcard.1 $(PREFIX)/share/man/man1
+	install -c -m 644 doc/2vcard.1 $(PREFIX)/share/man/man1
 	$(INSTALL) $(DOC) $(PREFIX)/share/doc/2vcard
--- 2vcard-0.5.orig/debian/docs
+++ 2vcard-0.5/debian/docs
@@ -0,0 +1,3 @@
+README
+AUTHORS
+CHANGES
--- 2vcard-0.5.orig/debian/watch
+++ 2vcard-0.5/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.netmeister.org/apps/2vcard-(.*)\.tar\.gz
--- 2vcard-0.5.orig/debian/changelog
+++ 2vcard-0.5/debian/changelog
@@ -0,0 +1,22 @@
+2vcard (0.5-3) unstable; urgency=low
+
+  * Fixed another description typo (Closes: #487274)
+
+ -- Marcela Tiznado <mlt@debian.org>  Mon, 11 Aug 2008 19:03:49 -0300
+
+2vcard (0.5-2) unstable; urgency=low
+
+  * Fixed debian/copyright (Closes: #449058)
+  * Added watch file (Closes: #462041)
+  * Fixed arch (Closes: #449046)
+  * Fixed description typo (Closes: #438658)
+  * New co-maintainer: me!!
+
+ -- Marcela Tiznado <mlt@debian.org>  Thu, 31 Jan 2008 21:23:27 -0200
+ 
+2vcard (0.5-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #428286)
+    Taken from Ubuntu package 2vcard (0.5-1ubuntu1)
+ 
+ -- Martin Albisetti <argentina@gmail.com>  Sun, 10 Jun 2007 13:16:59 +0100
--- 2vcard-0.5.orig/debian/control
+++ 2vcard-0.5/debian/control
@@ -0,0 +1,19 @@
+Source: 2vcard
+Section: utils
+Priority: optional
+Maintainer: Martin Albisetti <argentina@gmail.com>
+Uploaders: Marcela Tiznado <mlt@debian.org>
+Build-Depends: debhelper (>= 5.0.37)
+Standards-Version: 3.8.0
+
+Package: 2vcard
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Description: perl script to convert an addressbook to VCARD file format
+ 2vcard is a little perl script that you can use to convert the 
+ popular vcard file format. Currently 2vcard can only convert addressbooks 
+ and alias files from the following formats: abook,eudora,juno,ldif,mutt,
+ mh and pine.
+ .
+ The VCARD format is used by gnomecard, for example, which is used by the 
+ balsa email client.
--- 2vcard-0.5.orig/debian/compat
+++ 2vcard-0.5/debian/compat
@@ -0,0 +1 @@
+5
--- 2vcard-0.5.orig/debian/copyright
+++ 2vcard-0.5/debian/copyright
@@ -0,0 +1,21 @@
+This package was debianized by Martin Albisetti <argentina@gmail.com> on
+Sun, 10 Jun 2007 13:43:06 +0100 based on work done by Arvin Autar 
+<Autar022@planet.nl> for Ubuntu.
+
+It was downloaded from <http://www.netmeister.org/apps/>
+
+Upstream Author: Jan Schaumann <jschauma@netmeister.org>
+
+Copyright:
+
+2vcard Copyright 2001,2002,2003 Jan Schaumann, <jschauma@netmeister.org>
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+     
+Public License can be found in `/usr/share/common-licenses/BSD
--- 2vcard-0.5.orig/debian/rules
+++ 2vcard-0.5/debian/rules
@@ -0,0 +1,67 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+#CFLAGS = -Wall -g
+
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+#	CFLAGS += -O0
+#else
+#	CFLAGS += -O2
+#endif
+#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+#	INSTALL_PROGRAM += -s
+#endif
+
+clean:
+	dh_testdir
+	dh_testroot
+#	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+#	-$(MAKE) clean
+
+	dh_clean 
+
+build:
+# We don't actually build anything
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/2vcard.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/2vcard
+
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installdocs doc/html
+	dh_installman doc/2vcard.1
+	dh_installchangelogs CHANGES
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+	dh_perl
+
+binary: binary-indep binary-arch
+.PHONY: binary-indep binary-arch binary install 
--- 2vcard-0.5.orig/debian/dirs
+++ 2vcard-0.5/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+