[Pkg-voip-commits] r5558 - in /libosip2/trunk/debian: changelog control dirs libosip2-2.install libosip2-3.install patches/ patches/ignore-debian-Makefile.in.patch rules

msp at alioth.debian.org msp at alioth.debian.org
Fri Apr 18 05:53:47 UTC 2008 

Author: msp
Date: Fri Apr 18 05:53:47 2008
New Revision: 5558

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5558
Log:
* Ran unclean(1) over .orig.tar.gz
* Ignore upstream debian/Makefile.in
   - ignore-debian-Makefile.in.patch
* Bump soname: package-name-doesnt-match-sonames libosip2-3
* Remove debian/dirs - lintian: package-contains-empty-directory

Added:
    libosip2/trunk/debian/libosip2-3.install
      - copied unchanged from r5401, libosip2/trunk/debian/libosip2-2.install
    libosip2/trunk/debian/patches/
    libosip2/trunk/debian/patches/ignore-debian-Makefile.in.patch
Removed:
    libosip2/trunk/debian/dirs
    libosip2/trunk/debian/libosip2-2.install
Modified:
    libosip2/trunk/debian/changelog
    libosip2/trunk/debian/control
    libosip2/trunk/debian/rules

Modified: libosip2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/changelog?rev=5558&op=diff
==============================================================================
--- libosip2/trunk/debian/changelog (original)
+++ libosip2/trunk/debian/changelog Fri Apr 18 05:53:47 2008
@@ -1,21 +1,19 @@
 libosip2 (3.1.0-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
-  * Ran unclean(1) over .orig.tar.gz
-
- -- Mark Purcell <msp at debian.org>  Sun, 30 Mar 2008 15:26:09 +1100
-
-libosip2 (3.0.3-2-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
 
   [ Kilian Krause ]
   * Update Maintainer to Debian VoIP Team.
 
   [ Mark Purcell ]
   * Cleanup get-orig-source VARS
-
- -- Mark Purcell <msp at debian.org>  Thu, 29 Nov 2007 20:33:09 +0000
+  * Ran unclean(1) over .orig.tar.gz
+  * Ignore upstream debian/Makefile.in
+     - ignore-debian-Makefile.in.patch
+  * Bump soname: package-name-doesnt-match-sonames libosip2-3
+  * Remove debian/dirs - lintian: package-contains-empty-directory
+
+ -- Mark Purcell <msp at debian.org>  Fri, 18 Apr 2008 15:53:28 +1000
 
 libosip2 (3.0.3-2-1) unstable; urgency=low
 

Modified: libosip2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/control?rev=5558&op=diff
==============================================================================
--- libosip2/trunk/debian/control (original)
+++ libosip2/trunk/debian/control Fri Apr 18 05:53:47 2008
@@ -12,9 +12,7 @@
 Package: libosip2-dev
 Section: libdevel
 Architecture: any
-Depends: libosip2-2 (= ${binary:Version})
-Conflicts: libosip2-3 (<= 2.2.2-3.1)
-Replaces: libosip2-3 (<= 2.2.2-3.1)
+Depends: libosip2-3 (= ${binary:Version})
 Recommends: pkg-config
 Description: development files for the SIP library
  libosip2 header files and static libraries to assist in development of
@@ -31,11 +29,9 @@
  parser, and library to handle "SIP transactions" as defined by the SIP 
  standards (RFC3261). 
 
-Package: libosip2-2
+Package: libosip2-3
 Section: libs
 Architecture: any
-Conflicts: libosip2-3 (>> 3.0)
-Replaces: libosip2-3 (>> 3.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Session Initiation Protocol (SIP) library
  oSIP is an implementation of SIP. 

Added: libosip2/trunk/debian/patches/ignore-debian-Makefile.in.patch
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/patches/ignore-debian-Makefile.in.patch?rev=5558&op=file
==============================================================================
--- libosip2/trunk/debian/patches/ignore-debian-Makefile.in.patch (added)
+++ libosip2/trunk/debian/patches/ignore-debian-Makefile.in.patch Fri Apr 18 05:53:47 2008
@@ -1,0 +1,43 @@
+diff -Nur -x '*.orig' -x '*~' libosip2-3.1.0/configure libosip2-3.1.0.new/configure
+--- libosip2-3.1.0/configure	2007-12-19 04:57:26.000000000 +1100
++++ libosip2-3.1.0.new/configure	2008-04-18 15:08:17.000000000 +1000
+@@ -24593,7 +24593,7 @@
+ fi
+ 
+ 
+-ac_config_files="$ac_config_files libosip2.pc Makefile scripts/Makefile src/Makefile src/osipparser2/Makefile src/osip2/Makefile src/test/Makefile src/test/res/Makefile include/Makefile include/osip2/Makefile include/osipparser2/Makefile include/osipparser2/headers/Makefile help/Makefile help/man/Makefile help/doxygen/Makefile debian/Makefile platform/Makefile platform/rpm/Makefile platform/vsnet/Makefile platform/wince/Makefile include/osip2/doxygen.dox"
++ac_config_files="$ac_config_files libosip2.pc Makefile scripts/Makefile src/Makefile src/osipparser2/Makefile src/osip2/Makefile src/test/Makefile src/test/res/Makefile include/Makefile include/osip2/Makefile include/osipparser2/Makefile include/osipparser2/headers/Makefile help/Makefile help/man/Makefile help/doxygen/Makefile  platform/Makefile platform/rpm/Makefile platform/vsnet/Makefile platform/wince/Makefile include/osip2/doxygen.dox"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -25223,7 +25223,6 @@
+     "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
+     "help/man/Makefile") CONFIG_FILES="$CONFIG_FILES help/man/Makefile" ;;
+     "help/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES help/doxygen/Makefile" ;;
+-    "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+     "platform/Makefile") CONFIG_FILES="$CONFIG_FILES platform/Makefile" ;;
+     "platform/rpm/Makefile") CONFIG_FILES="$CONFIG_FILES platform/rpm/Makefile" ;;
+     "platform/vsnet/Makefile") CONFIG_FILES="$CONFIG_FILES platform/vsnet/Makefile" ;;
+diff -Nur -x '*.orig' -x '*~' libosip2-3.1.0/Makefile.am libosip2-3.1.0.new/Makefile.am
+--- libosip2-3.1.0/Makefile.am	2007-07-18 19:46:42.000000000 +1000
++++ libosip2-3.1.0.new/Makefile.am	2008-04-18 15:07:55.000000000 +1000
+@@ -1,6 +1,6 @@
+ EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in
+ 
+-SUBDIRS = include src scripts help platform debian
++SUBDIRS = include src scripts help platform 
+ 
+ rpm-package:
+ 	cd platform && $(MAKE) rpm-package
+diff -Nur -x '*.orig' -x '*~' libosip2-3.1.0/Makefile.in libosip2-3.1.0.new/Makefile.in
+--- libosip2-3.1.0/Makefile.in	2007-12-19 04:57:23.000000000 +1100
++++ libosip2-3.1.0.new/Makefile.in	2008-04-18 15:07:55.000000000 +1000
+@@ -208,7 +208,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in
+-SUBDIRS = include src scripts help platform debian
++SUBDIRS = include src scripts help platform 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libosip2.pc
+ all: config.h

Modified: libosip2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/rules?rev=5558&op=diff
==============================================================================
--- libosip2/trunk/debian/rules (original)
+++ libosip2/trunk/debian/rules Fri Apr 18 05:53:47 2008
@@ -6,6 +6,7 @@
 URL := http://ftp.gnu.org/gnu/osip/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
 
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-gperf --enable-pthread

More information about the Pkg-voip-commits mailing list