r2595 - trunk/debian/libmsip/debian

mikma at minisip.org mikma at minisip.org
Thu Jun 1 00:16:47 CEST 2006


Author: mikma
Date: 2006-06-01 00:16:46 +0200 (Thu, 01 Jun 2006)
New Revision: 2595

Added:
   trunk/debian/libmsip/debian/patches/
   trunk/debian/libmsip/debian/rules
Modified:
   trunk/debian/libmsip/debian/
   trunk/debian/libmsip/debian/changelog
   trunk/debian/libmsip/debian/control
   trunk/debian/libmsip/debian/copyright
   trunk/debian/libmsip/debian/libmsip-dev.install
Log:
libmsip Debian package:
* Set mergeWithUpstream property.

* Add myself to uploaders.
* Set source section to "devel".
* Fix old-fsf-address-in-copyright-file lintian warning.
* Fix copyright-lists-upstream-authors-with-dh_make-boilerplate lintian
  warning.
* Avoid using --host to configure unless cross-compiling, following
  autotools-dev recommendation.
* Use config.dpatch to replace all config.{sub,guess} with links to
  /usr/share/misc/config.{sub,guess} in autotools-dev.
* Add CXXFLAGS to configure arguments.
* Remove empty upstream changelog.
* Include aclocal macro file(s).
* Add libmcrypto dependencies.
* Change to LGPL 2.1 (or later) in copyright.



Property changes on: trunk/debian/libmsip/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/debian/libmsip/debian/changelog
===================================================================
--- trunk/debian/libmsip/debian/changelog	2006-05-31 22:12:53 UTC (rev 2594)
+++ trunk/debian/libmsip/debian/changelog	2006-05-31 22:16:46 UTC (rev 2595)
@@ -1,3 +1,23 @@
+libmsip (0.3.1-3~1) UNRELEASED; urgency=low
+
+  [ Mikael Magnusson ]
+  * Add myself to uploaders.
+  * Set source section to "devel".
+  * Fix old-fsf-address-in-copyright-file lintian warning.
+  * Fix copyright-lists-upstream-authors-with-dh_make-boilerplate lintian
+    warning.
+  * Avoid using --host to configure unless cross-compiling, following
+    autotools-dev recommendation.
+  * Use config.dpatch to replace all config.{sub,guess} with links to
+    /usr/share/misc/config.{sub,guess} in autotools-dev.
+  * Add CXXFLAGS to configure arguments.
+  * Remove empty upstream changelog.
+  * Include aclocal macro file(s).
+  * Add libmcrypto dependencies.
+  * Change to LGPL 2.1 (or later) in copyright.
+  
+ -- Mikael Magnusson <mikma at users.sourceforge.net>  Thu,  1 Jun 2006 00:15:18 +0200
+
 libmsip (0.3.1-2) unstable; urgency=low
 
   * Create proper packages, on kind suggestion from Filip Van Raemdonck

Modified: trunk/debian/libmsip/debian/control
===================================================================
--- trunk/debian/libmsip/debian/control	2006-05-31 22:12:53 UTC (rev 2594)
+++ trunk/debian/libmsip/debian/control	2006-05-31 22:16:46 UTC (rev 2595)
@@ -1,7 +1,9 @@
 Source: libmsip
 Priority: optional
+Section: devel
 Maintainer: Johan Bilien <jobi at via.ecp.fr>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libmutil-dev (>= 0.3.1), libmnetutil-dev (>= 0.3.1)
+Uploaders: Mikael Magnusson <mikma at users.sourceforge.net>
+Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev, pkg-config, libmutil-dev (>= 0.3.1), libmcrypto-dev (>= 0.3.1), libmnetutil-dev (>= 0.3.1)
 Standards-Version: 3.6.1
 
 Package: libmsip0
@@ -16,9 +18,8 @@
  This package contains the libmsip0 runtime library.
 
 Package: libmsip-dev
-Section: devel
 Architecture: any
-Depends: libmsip0 (= ${Source-Version}), libmnetutil-dev (>= 0.3.1)
+Depends: libmsip0 (= ${Source-Version}), libmutil-dev (>= 0.3.1), libmcrypto-dev (>= 0.3.1), libmnetutil-dev (>= 0.3.1)
 Description: C++ implementation of the SIP (RFC3261) protocol
  libmsip implements the Session Initiation Protocol, in a C++
  library. The SIP protocol is used mostly to initialize Voice over IP

Modified: trunk/debian/libmsip/debian/copyright
===================================================================
--- trunk/debian/libmsip/debian/copyright	2006-05-31 22:12:53 UTC (rev 2594)
+++ trunk/debian/libmsip/debian/copyright	2006-05-31 22:16:46 UTC (rev 2595)
@@ -3,23 +3,24 @@
 
 It was downloaded from http://www.minisip.org/
 
-Upstream Author(s): Erik Eliasson <eliasson at ssvl.kth.se>
-                    Johan Bilien <jobi at via.ecp.fr>
+Upstream Authors: Erik Eliasson <eliasson at ssvl.kth.se>
+                  Johan Bilien <jobi at via.ecp.fr>
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+This library is free software; you can redistribute it and/or modify 
+it under the terms of the GNU Lesser General Public License as 
+published by the Free Software Foundation; either version 2.1 of the 
+License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Library General Public License for more details.
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, 
-Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian GNU/Linux systems, the complete text of the GNU Lesser
+General Public License can be found in
+`/usr/share/common-licenses/LGPL'.

Modified: trunk/debian/libmsip/debian/libmsip-dev.install
===================================================================
--- trunk/debian/libmsip/debian/libmsip-dev.install	2006-05-31 22:12:53 UTC (rev 2594)
+++ trunk/debian/libmsip/debian/libmsip-dev.install	2006-05-31 22:16:46 UTC (rev 2595)
@@ -3,3 +3,4 @@
 debian/tmp/usr/lib/lib*.so
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/lib/*.la
+debian/tmp/usr/share/aclocal/*.m4

Copied: trunk/debian/libmsip/debian/patches (from rev 2586, trunk/debian/libmutil/debian/patches)

Copied: trunk/debian/libmsip/debian/rules (from rev 2586, trunk/debian/libmutil/debian/rules)
===================================================================
--- trunk/debian/libmutil/debian/rules	2006-05-31 19:02:36 UTC (rev 2586)
+++ trunk/debian/libmsip/debian/rules	2006-05-31 22:16:46 UTC (rev 2595)
@@ -0,0 +1,100 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+# 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)
+
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+CONFFLAGS =
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
+else
+  CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+DEBUGFLAGS=-g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        DEBUGFLAGS += -O0
+else
+        DEBUGFLAGS += -O2
+endif
+
+CFLAGS := -Wall -D_REENTRANT $(DEBUGFLAGS)
+CXXFLAGS := $(CFLAGS)
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+config: patch config.status
+config.status: configure
+	dh_testdir
+	./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: config build-stamp
+build-stamp:
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean: clean-stamp unpatch
+clean-stamp:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	-$(MAKE) distclean
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
+
+# 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 -plibmsip-dev $(CURDIR)/debian/tmp/usr/share/libmsip/examples/*
+	dh_install
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+#	dh_makeshlibs -V 'libmsip0 (>= 0.3.1)'
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install config patch unpatch



More information about the Minisip-devel mailing list