* debian/*:

  - some updates for packaging

pmo-trunk-r700

diff --git a/debian/changelog b/debian/changelog
index 3f26487..e69de29 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +0,0 @@
-modest (0.0.9-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- unknown <arne@kernelconcepts.de>  Wed, 21 Jun 2006 13:43:30 +0200
-

diff --git a/debian/control b/debian/control
index c63de40..078c543 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: modest
 Section: user/unknown
 Priority: optional
 Source: modest
 Section: user/unknown
 Priority: optional

-Maintainer: unknown <arne@unknown>
-Build-Depends: debhelper (>= 4.0.0)
+Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
+Build-Depends: debhelper (>= 4.0.0), cdbs, dpkg-dev (>= 1.13.18)

 Standards-Version: 3.6.0
 
 Package: modest
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Standards-Version: 3.6.0
 
 Package: modest
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: an email client with modest resource-needs
- TODO: description
+Description: an e-mail client for platforms with modest resources,
+ built on top of the tinymail framework

diff --git a/debian/copyright b/debian/copyright
index d1054ab..f567522 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,27 @@
-This package was debianized by unknown <arne@unknown> on
-Wed, 21 Jun 2006 13:43:30 +0200.
+Copyright (c) 2006,2007 Nokia Corporation
+All rights reserved.

 
 

-It was downloaded from <fill in ftp site>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:

 
 

-Upstream Author(s): <put author(s) name and email here>
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of the Nokia Corporation nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.

 
 

-Copyright:
-
-<Must follow here>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/debian/rules b/debian/rules
index 8e88ca5..a08b90f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,107 +1,26 @@
 #!/usr/bin/make -f
 #!/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
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-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
-
-config.status: configure
-       dh_testdir
-       # Add here commands to configure the package.
-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-       #/usr/bin/docbook-to-man debian/modest.sgml > modest.1
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/modest.
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/modest
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs ChangeLog
-#      dh_installdocs
-#      dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-#      dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_python
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+make-orig-source: TMPNAME:=$(shell mktemp -d)
+make-orig-source: DATE:=$(shell date --iso)
+make-orig-source: UPSTREAMVER:=0~svn-$(DATE)
+make-orig-source:
+       -make -f debian/rules make-orig-source-internal TMPNAME=$(TMPNAME) DATE=$(DATE) UPSTREAMVER=$(UPSTREAMVER)
+       -rm -rf $(TMPNAME)
+       rm $(CURDIR)/debian/make-orig-source-internal-temp.stamp \
+         || (echo "Making the Debian source package failed, see above" ; \
+             false)
+
+make-orig-source-internal:
+       echo -e "Source: modest\nBuild-Depends: subversion, autoconf, automake1.9, autotools-dev, libtool, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.6), gnome-common, devscripts, fakeroot\n\nPackage: modest\n" | dpkg-checkbuilddeps -
+       svn export . $(TMPNAME)/modest-$(UPSTREAMVER)
+       cd $(TMPNAME)/modest-$(UPSTREAMVER) && NOCONFIGURE=0 ./autogen.sh 
+       cd $(TMPNAME) && tar czf modest_$(UPSTREAMVER).orig.tar.gz --exclude modest-$(UPSTREAMVER)/debian modest-$(UPSTREAMVER)
+       cd $(TMPNAME)/modest-$(UPSTREAMVER) && dch -bv $(UPSTREAMVER)-1 "Exported from SVN on $(DATE)"
+       cd $(TMPNAME)/modest-$(UPSTREAMVER) && dpkg-buildpackage -rfakeroot -S -uc -us && \
+       cd $(TMPNAME) && mv *.diff.gz *.dsc *.orig.tar.gz $(CURDIR)/
+       touch $(CURDIR)/debian/make-orig-source-internal-temp.stamp
+
+.PHONY: make-orig-source make-orig-source-internal