[Pkg-voip-commits] r9310 - in /libosip2/trunk/debian: changelog control copyright docs patches/series rules source/ source/format watch

msp at alioth.debian.org msp at alioth.debian.org
Sat Oct 8 02:11:53 UTC 2011 

Author: msp
Date: Sat Oct  8 02:11:53 2011
New Revision: 9310

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9310
Log:
* docs: drop duplicate-changelog-files ChangeLog
* Drop content of dependancy_libs (sed -i)
  - Fixes "Emptying dependency_libs in .la files" (Closes: #633334)
* Switch to dh 7
* Switch to dpkg-source 3.0 (quilt) format
* Upgrade to Standards Version 3.9.2
* Upgrade debian/watch to v3
* copyright-refers-to-symlink-license
  - Updated debian/copyright -> LGPL-2.1

Added:
    libosip2/trunk/debian/patches/series
    libosip2/trunk/debian/source/
    libosip2/trunk/debian/source/format
Modified:
    libosip2/trunk/debian/changelog
    libosip2/trunk/debian/control
    libosip2/trunk/debian/copyright
    libosip2/trunk/debian/docs
    libosip2/trunk/debian/rules
    libosip2/trunk/debian/watch

Modified: libosip2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/changelog?rev=9310&op=diff
==============================================================================
--- libosip2/trunk/debian/changelog (original)
+++ libosip2/trunk/debian/changelog Sat Oct  8 02:11:53 2011
@@ -1,9 +1,18 @@
-libosip2 (3.6.0-1) UNRELEASED; urgency=low
+libosip2 (3.6.0-1) experimental; urgency=low
 
   * New upstream release
     - NEW package libosip2-7 - soname bump
-
- -- Mark Purcell <msp at debian.org>  Sat, 08 Oct 2011 12:28:36 +1100
+  * docs: drop duplicate-changelog-files ChangeLog
+  * Drop content of dependancy_libs (sed -i)
+    - Fixes "Emptying dependency_libs in .la files" (Closes: #633334)
+  * Switch to dh 7
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Upgrade to Standards Version 3.9.2
+  * Upgrade debian/watch to v3
+  * copyright-refers-to-symlink-license
+    - Updated debian/copyright -> LGPL-2.1
+
+ -- Mark Purcell <msp at debian.org>  Sat, 08 Oct 2011 13:08:56 +1100
 
 libosip2 (3.5.0-1) experimental; urgency=low
 

Modified: libosip2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/control?rev=9310&op=diff
==============================================================================
--- libosip2/trunk/debian/control (original)
+++ libosip2/trunk/debian/control Sat Oct  8 02:11:53 2011
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), cdbs, autotools-dev, docbook-to-man
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), autotools-dev, docbook-to-man
+Standards-Version: 3.9.2
 Homepage: http://www.gnu.org/software/osip/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/libosip2/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libosip2/?op=log

Modified: libosip2/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/copyright?rev=9310&op=diff
==============================================================================
--- libosip2/trunk/debian/copyright (original)
+++ libosip2/trunk/debian/copyright Sat Oct  8 02:11:53 2011
@@ -54,7 +54,7 @@
 
 
 On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/LGPL`
+License can be found in the file `/usr/share/common-licenses/LGPL-2.1`
 
 Upstream Author: Aymeric Moizard <jack at atosc.org>
 

Modified: libosip2/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/docs?rev=9310&op=diff
==============================================================================
--- libosip2/trunk/debian/docs (original)
+++ libosip2/trunk/debian/docs Sat Oct  8 02:11:53 2011
@@ -2,4 +2,3 @@
 NEWS
 README
 TODO
-ChangeLog

Added: libosip2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/patches/series?rev=9310&op=file
==============================================================================
--- libosip2/trunk/debian/patches/series (added)
+++ libosip2/trunk/debian/patches/series Sat Oct  8 02:11:53 2011
@@ -1,0 +1,1 @@
+manpage-section-mismatch.patch

Modified: libosip2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/rules?rev=9310&op=diff
==============================================================================
--- libosip2/trunk/debian/rules (original)
+++ libosip2/trunk/debian/rules Sat Oct  8 02:11:53 2011
@@ -1,25 +1,12 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --parallel
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-FILENAME := $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-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
-
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp --list-missing
-
-clean::
-	rm -f help/man/osip.1
+override_dh_install:
+	dh_install --list-missing
+	# Drop content of dependency_libs to avoid having to recompile exiv2
+	# if the path of the libs that appear there changes
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 
 get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
-	@@echo Repacking without upstream debian/...
-	uclean ../tarballs/$(FILENAME)
+	uscan --force-download

Added: libosip2/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/source/format?rev=9310&op=file
==============================================================================
--- libosip2/trunk/debian/source/format (added)
+++ libosip2/trunk/debian/source/format Sat Oct  8 02:11:53 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: libosip2/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/libosip2/trunk/debian/watch?rev=9310&op=diff
==============================================================================
--- libosip2/trunk/debian/watch (original)
+++ libosip2/trunk/debian/watch Sat Oct  8 02:11:53 2011
@@ -1,3 +1,2 @@
-# Site		Directory		Pattern			Version	Script
-version=2
+version=3
 http://ftp.gnu.org/gnu/osip/libosip2-(.*)\.tar\.gz debian svn-upgrade

More information about the Pkg-voip-commits mailing list