[Pkg-voip-commits] r9694 - in /libcommoncpp2/trunk/debian: changelog control patches/00list patches/applog-inc-fcntl.patch patches/cleaning_doc.dpatch patches/series rules source/ source/format

msp at alioth.debian.org msp at alioth.debian.org
Sat May 19 00:41:57 UTC 2012 

Author: msp
Date: Sat May 19 00:41:54 2012
New Revision: 9694

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9694
Log:
* source/format -> 3.0 quilt
* Switch to dh - drop cdbs/ dpatch
* Fix gcc-4.7 FTBFS debian/patches/applog-inc-fcntl.patch

Added:
    libcommoncpp2/trunk/debian/patches/applog-inc-fcntl.patch
    libcommoncpp2/trunk/debian/patches/series
    libcommoncpp2/trunk/debian/source/
    libcommoncpp2/trunk/debian/source/format
Removed:
    libcommoncpp2/trunk/debian/patches/00list
Modified:
    libcommoncpp2/trunk/debian/changelog
    libcommoncpp2/trunk/debian/control
    libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch
    libcommoncpp2/trunk/debian/rules

Modified: libcommoncpp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/changelog?rev=9694&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/changelog (original)
+++ libcommoncpp2/trunk/debian/changelog Sat May 19 00:41:54 2012
@@ -1,3 +1,11 @@
+libcommoncpp2 (1.8.1-3) unstable; urgency=low
+
+  * source/format -> 3.0 quilt
+  * Switch to dh - drop cdbs/ dpatch
+  * Fix gcc-4.7 FTBFS debian/patches/applog-inc-fcntl.patch
+
+ -- Mark Purcell <msp at debian.org>  Sat, 19 May 2012 10:40:33 +1000
+
 libcommoncpp2 (1.8.1-2) unstable; urgency=low
 
   * Upload to unstable - coordinated through debian-release

Modified: libcommoncpp2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/control?rev=9694&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/control (original)
+++ libcommoncpp2/trunk/debian/control Sat May 19 00:41:54 2012
@@ -3,7 +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), libxml2-dev, zlib1g-dev, help2man, doxygen, dpatch, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev, autotools-dev, cdbs, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), autotools-dev, doxygen,
+ libxml2-dev, zlib1g-dev, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev
 Standards-Version: 3.8.4
 Homepage: http://www.gnu.org/software/commoncpp/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/libcommoncpp2/trunk/
@@ -29,7 +30,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A GNU package for creating portable C++ programs
+Description: GNU package for creating portable C++ programs
  Common C++ "2" is a GNU package which offers portable "abstraction"
  of system services such as threads, networks, and sockets.  Common
  C++ also offers individual frameworks generally useful to developing

Added: libcommoncpp2/trunk/debian/patches/applog-inc-fcntl.patch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/applog-inc-fcntl.patch?rev=9694&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/patches/applog-inc-fcntl.patch (added)
+++ libcommoncpp2/trunk/debian/patches/applog-inc-fcntl.patch Sat May 19 00:41:54 2012
@@ -1,0 +1,50 @@
+Index: libcommoncpp2-1.8.1/src/applog.cpp
+===================================================================
+--- libcommoncpp2-1.8.1.orig/src/applog.cpp	2010-11-01 10:11:55.000000000 +1100
++++ libcommoncpp2-1.8.1/src/applog.cpp	2012-05-19 10:11:19.000000000 +1000
+@@ -45,6 +45,9 @@
+ #include <cstdlib>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <fcntl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ // TODO sc: test if has to move up now that it is into commoncpp
+ // NOTE: the order of inclusion is important do not move following include line
+@@ -297,7 +300,7 @@
+     else
+     {
+       // create pipe
+-      int err = mkfifo(_nomeFile.c_str(), S_IREAD | S_IWRITE);
++      int err = mkfifo(_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+       if (err == 0 || errno == EEXIST)
+       {
+         // and open it
+@@ -342,7 +345,7 @@
+     else
+     {
+       // create pipe
+-      int err = mkfifo(_nomeFile.c_str(), S_IREAD | S_IWRITE);
++      int err = mkfifo(_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+       if (err == 0 || errno == EEXIST)
+       {
+         // and open it
+@@ -456,7 +459,7 @@
+     else
+     {
+       // create pipe
+-      int err = mkfifo(d->_nomeFile.c_str(), S_IREAD | S_IWRITE);
++      int err = mkfifo(d->_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+       if (err == 0 || errno == EEXIST)
+       {
+         // and open it
+@@ -562,7 +565,7 @@
+     else
+     {
+       // create pipe
+-      int err = mkfifo(d->_nomeFile.c_str(), S_IREAD | S_IWRITE);
++      int err = mkfifo(d->_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+       if (err == 0 || errno == EEXIST)
+       {
+         // and open it

Modified: libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch?rev=9694&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch (original)
+++ libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch Sat May 19 00:41:54 2012
@@ -5,10 +5,11 @@
 ## DP: adding clean-docs target to doc/Makefile.in (Debian bug #424498)
 
 @DPATCH@
-diff -urNad libcommoncpp2-1.5.9~/doc/Makefile.in libcommoncpp2-1.5.9/doc/Makefile.in
---- libcommoncpp2-1.5.9~/doc/Makefile.in	2007-09-30 13:06:15.000000000 +0200
-+++ libcommoncpp2-1.5.9/doc/Makefile.in	2007-10-02 09:16:57.000000000 +0200
-@@ -274,12 +274,16 @@
+Index: libcommoncpp2-1.8.1/doc/Makefile.in
+===================================================================
+--- libcommoncpp2-1.8.1.orig/doc/Makefile.in	2010-11-01 09:10:19.000000000 +1100
++++ libcommoncpp2-1.8.1/doc/Makefile.in	2012-05-19 10:13:01.000000000 +1000
+@@ -307,12 +307,16 @@
  Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  
@@ -25,4 +26,4 @@
 +
  .texi.info:
  	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
- 	am__cwd=`pwd` && cd $(srcdir) && \
+ 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \

Added: libcommoncpp2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/series?rev=9694&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/patches/series (added)
+++ libcommoncpp2/trunk/debian/patches/series Sat May 19 00:41:54 2012
@@ -1,0 +1,2 @@
+applog-inc-fcntl.patch
+cleaning_doc.dpatch

Modified: libcommoncpp2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/rules?rev=9694&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/rules (original)
+++ libcommoncpp2/trunk/debian/rules Sat May 19 00:41:54 2012
@@ -1,17 +1,15 @@
 #!/usr/bin/make -f
+%:
+	dh $@
 
-FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-URL = http://ftp.gnu.org/pub/gnu/commoncpp/commoncpp2-$(DEB_UPSTREAM_VERSION).tar.gz
+override_dh_install:
+	dh_install --list-missing
+	# Drop content of dependency_libs to avoid having to recompile
+	# if the path of the libs that appear there changes
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-
-get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+override_dh_strip:
+	dh_strip --dbg-package=libcommoncpp2-dbg
 
 help2man:
 	/usr/bin/help2man -N -S 'Debian GNU/Linux' -o debian/ccgnu2-config.8 ccgnu2-config \

Added: libcommoncpp2/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/source/format?rev=9694&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/source/format (added)
+++ libcommoncpp2/trunk/debian/source/format Sat May 19 00:41:54 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-voip-commits mailing list