r2643 - trunk/build.d/dist/debian/src/minisip/debian

mikma at minisip.org mikma at minisip.org
Tue Jun 6 00:58:21 CEST 2006 

Author: mikma
Date: 2006-06-06 00:58:20 +0200 (Tue, 06 Jun 2006)
New Revision: 2643

Added:
   trunk/build.d/dist/debian/src/minisip/debian/install
   trunk/build.d/dist/debian/src/minisip/debian/rules
Removed:
   trunk/build.d/dist/debian/src/minisip/debian/files
Modified:
   trunk/build.d/dist/debian/src/minisip/debian/
   trunk/build.d/dist/debian/src/minisip/debian/changelog
   trunk/build.d/dist/debian/src/minisip/debian/control
   trunk/build.d/dist/debian/src/minisip/debian/copyright
   trunk/build.d/dist/debian/src/minisip/debian/docs
Log:
Debian minisip package:

  * Add myself to uploaders.
  * 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.
  * Add CXXFLAGS to configure arguments.
  * Remove empty upstream changelog.
  * Fix dependencies.
  * Move from "unknown" to "comm" section.
  * Include generate_certificates document.
  * Include minsip.desktop file.




Property changes on: trunk/build.d/dist/debian/src/minisip/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/build.d/dist/debian/src/minisip/debian/changelog
===================================================================
--- trunk/build.d/dist/debian/src/minisip/debian/changelog	2006-06-05 22:55:29 UTC (rev 2642)
+++ trunk/build.d/dist/debian/src/minisip/debian/changelog	2006-06-05 22:58:20 UTC (rev 2643)
@@ -1,3 +1,21 @@
+minisip (0.7.1-2~2) unstable; urgency=low
+
+  [ Mikael Magnusson ]
+  * Add myself to uploaders.
+  * 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.
+  * Add CXXFLAGS to configure arguments.
+  * Remove empty upstream changelog.
+  * Fix dependencies.
+  * Move from "unknown" to "comm" section.
+  * Include generate_certificates document.
+  * Include minsip.desktop file.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net>  Tue,  6 Jun 2006 00:47:17 +0200
+
 minisip (0.7.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/build.d/dist/debian/src/minisip/debian/control
===================================================================
--- trunk/build.d/dist/debian/src/minisip/debian/control	2006-06-05 22:55:29 UTC (rev 2642)
+++ trunk/build.d/dist/debian/src/minisip/debian/control	2006-06-05 22:58:20 UTC (rev 2643)
@@ -1,14 +1,21 @@
 Source: minisip
-Section: unknown
+Section: comm
 Priority: optional
 Maintainer: Johan Bilien <jobi at via.ecp.fr>
-Build-Depends: debhelper (>= 4.0.0)
+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), libmsip-dev (>= 0.3.1), libmikey-dev (>=
+ 0.4.1), libminisip-dev (>= 0.3.1), libx11-dev, libxext-dev,
+ libglademm-2.4-dev (>= 2.4), libglib2.0-dev
 Standards-Version: 3.6.1
 
 Package: minisip
 Architecture: any
-Depends: libspeex1 (>=1.1), libmsip0 (>= 0.3.1), libmikey0 (>= 0.4.1), libmnetutil0 (>= 0.3.1), libmutil0 (>= 0.3.1), libssl0.9.7 (>= 0.9.7), libglademm-2.4-1 (>=2.4)
-Description: minisip is a SIP user agent, with security enhancements
+Depends: ${shlibs:Depends}
+Recommends: minisip-plugins, minisip-gconf
+Suggests: minisip-video
+Description: SIP user agent, with security enhancements
  minisip is a soft telephone which uses the SIP protocol. It provides
  additional security, such as encryption and authentication, by using
  the SRTP (RFC3711) and MIKEY (RFC 3830) protocols. It uses GTK+ for

Modified: trunk/build.d/dist/debian/src/minisip/debian/copyright
===================================================================
--- trunk/build.d/dist/debian/src/minisip/debian/copyright	2006-06-05 22:55:29 UTC (rev 2642)
+++ trunk/build.d/dist/debian/src/minisip/debian/copyright	2006-06-05 22:58:20 UTC (rev 2643)
@@ -3,8 +3,8 @@
 
 It was downloaded from http://www.minisip.org/
 
-Upstream Author(s): Erik Eliasson <eliasson at it.kth.se>
-                    Johan Bilien <jobi at via.ecp.fr>
+Upstream Authors: Erik Eliasson <eliasson at it.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
@@ -18,8 +18,8 @@
 
 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.
+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'.

Modified: trunk/build.d/dist/debian/src/minisip/debian/docs
===================================================================
--- trunk/build.d/dist/debian/src/minisip/debian/docs	2006-06-05 22:55:29 UTC (rev 2642)
+++ trunk/build.d/dist/debian/src/minisip/debian/docs	2006-06-05 22:58:20 UTC (rev 2643)
@@ -1,3 +1,4 @@
 NEWS
 README
 TODO
+Documentation/generate_certificates

Deleted: trunk/build.d/dist/debian/src/minisip/debian/files
===================================================================
--- trunk/build.d/dist/debian/src/minisip/debian/files	2006-06-05 22:55:29 UTC (rev 2642)
+++ trunk/build.d/dist/debian/src/minisip/debian/files	2006-06-05 22:58:20 UTC (rev 2643)
@@ -1 +0,0 @@
-minisip_0.6-1_i386.deb unknown optional

Added: trunk/build.d/dist/debian/src/minisip/debian/install
===================================================================
--- trunk/build.d/dist/debian/src/minisip/debian/install	2006-06-05 22:55:29 UTC (rev 2642)
+++ trunk/build.d/dist/debian/src/minisip/debian/install	2006-06-05 22:58:20 UTC (rev 2643)
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/minisip_gtkgui
+debian/tmp/usr/share/minisip/*
+share/minisip.desktop /usr/share/applications

Added: trunk/build.d/dist/debian/src/minisip/debian/rules
===================================================================
--- trunk/build.d/dist/debian/src/minisip/debian/rules	2006-06-05 22:55:29 UTC (rev 2642)
+++ trunk/build.d/dist/debian/src/minisip/debian/rules	2006-06-05 22:58:20 UTC (rev 2643)
@@ -0,0 +1,96 @@
+#!/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 --enable-textui --enable-video
+
+
+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 
+
+	$(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
+	dh_installdocs
+	dh_installmenu
+	dh_install
+	dh_link /usr/share/minisip/minisip.png /usr/share/pixmaps/minisip.png
+	dh_strip
+	dh_compress
+	dh_fixperms
+	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