[Pkg-voip-commits] r6934 - in /libpri/trunk/debian: changelog compat control copyright libpri-dev.dirs libpri-dev.install patches/00list patches/bristuff.dpatch patches/enable-gcc-optimizations.dpatch patches/libname.dpatch patches/stddef.dpatch rules

msp at alioth.debian.org msp at alioth.debian.org
Sun Mar 29 10:25:58 UTC 2009 

Author: msp
Date: Sun Mar 29 10:25:58 2009
New Revision: 6934

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6934
Log:
* NEW package libpri1.4 SONAME is now 1.4 . Changed package name accordingly
* Switch back to cdbs (allows -j2 and others)
* debian/compact -> 7
* Update debian/copyright GPL-2 only
* Upload to experimental while we coordinate transition debian-release & NEW

Removed:
    libpri/trunk/debian/libpri-dev.dirs
    libpri/trunk/debian/patches/bristuff.dpatch
    libpri/trunk/debian/patches/libname.dpatch
    libpri/trunk/debian/patches/stddef.dpatch
Modified:
    libpri/trunk/debian/changelog
    libpri/trunk/debian/compat
    libpri/trunk/debian/control
    libpri/trunk/debian/copyright
    libpri/trunk/debian/libpri-dev.install
    libpri/trunk/debian/patches/00list
    libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch
    libpri/trunk/debian/rules

Modified: libpri/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/changelog?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/changelog (original)
+++ libpri/trunk/debian/changelog Sun Mar 29 10:25:58 2009
@@ -1,18 +1,21 @@
-libpri (1.4.9-1) UNRELEASED; urgency=low
+libpri (1.4.9-1) experimental; urgency=low
 
   [ Tzafrir Cohen ]
   * New upstream version.
   * Dropping bristuff for now.
-  * Use LIBPRI_OPTS instead of CFLAGS: patch fits simpler.
-  * SONAME is now 1.4 . Changed package name accordingly.
+  * NEW package libpri1.4 SONAME is now 1.4 . Changed package name accordingly
 
   [ Victor Seva ]
   * debian/rules: Update upstream's URL.
 
   [ Mark Purcell ]
   * Update debian/watch
-
- -- Mark Purcell <msp at debian.org>  Sun, 22 Mar 2009 19:22:35 +1100
+  * Switch back to cdbs (allows -j2 and others)
+  * debian/compact -> 7
+  * Update debian/copyright GPL-2 only
+  * Upload to experimental while we coordinate transition debian-release & NEW
+
+ -- Mark Purcell <msp at debian.org>  Sun, 22 Mar 2009 22:00:07 +1100
 
 libpri (1.4.3-3) unstable; urgency=low
 

Modified: libpri/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/compat?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/compat (original)
+++ libpri/trunk/debian/compat Sun Mar 29 10:25:58 2009
@@ -1,1 +1,1 @@
-4
+7

Modified: libpri/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/control?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/control (original)
+++ libpri/trunk/debian/control Sun Mar 29 10:25:58 2009
@@ -3,8 +3,8 @@
 Section: libs
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), cdbs, dpatch
+Standards-Version: 3.8.1
 Homepage: http://www.asterisk.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/libpri/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libpri/?op=log
@@ -12,13 +12,16 @@
 Package: libpri-dev
 Section: libdevel
 Architecture: any
-Depends: libpri1.4 (= ${binary:Version})
+Depends: ${misc:Depends}, libpri1.4 (= ${binary:Version})
 Description: Primary Rate ISDN specification development files
  Development files for the C implementation of the Primary Rate ISDN
  specification.
+
+ It was based on the Bellcore specification SR-NWT-002343 for National
+ ISDN.  As of May 12, 2001, it has been tested work with NI-2, Nortel
+ DMS-100, and Lucent 5E Custom protocols on switches from Nortel and Lucent.
  
 Package: libpri1.4
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libpri1.2 (<< 1.4.0-3)

Modified: libpri/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/copyright?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/copyright (original)
+++ libpri/trunk/debian/copyright Sun Mar 29 10:25:58 2009
@@ -5,19 +5,20 @@
 
 Copyright Holder:
 
- * Copyright (C) 2001, Linux Support Services, Inc.
- * Copyright (C) 2001-2005, Digium
-
-Additionally, this package contains changes ("bristuff patch")
-in debian/patches/bristuff.dpatch which are
- * Copyright (C) 2003-2006 Junghanns.NET GmbH
+ * Copyright (C) 2001-2005, Digium, Inc
 
 License:
 
-   This package 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 program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
 
    This package is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,4 +31,3 @@
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
-

Modified: libpri/trunk/debian/libpri-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/libpri-dev.install?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/libpri-dev.install (original)
+++ libpri/trunk/debian/libpri-dev.install Sun Mar 29 10:25:58 2009
@@ -1,5 +1,3 @@
 usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
-usr/lib/pkgconfig/*
-/usr/lib/*.la

Modified: libpri/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/00list?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/patches/00list (original)
+++ libpri/trunk/debian/patches/00list Sun Mar 29 10:25:58 2009
@@ -1,3 +1,1 @@
 enable-gcc-optimizations
-# Needed for a separate bristuffed version:
-#libname

Modified: libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch (original)
+++ libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch Sun Mar 29 10:25:58 2009
@@ -1,33 +1,20 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## libname.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+## enable-gcc-optimizations.dpatch by Faidon Liambotis <paravoid at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow overriding the CPU optimizations from the Makefile through 
-## DP: the make command-line: make LIBPRI_OPT="-Os"
-## DP:
-## DP: Upstream issue: http://bugs.digium.com/view.php?id=12676
- 
-Index: /home/tzafrir/Proj/Asterisk/Digium/libpri/trunk/Makefile
-===================================================================
---- a/Makefile	(revision 559)
-+++ b/Makefile	(working copy)
+## DP: Don't discard CFLAGS of the environment
+## DP: debian/rules passes at least the optimization level
+
+ at DPATCH@
+diff -urNad libpri-1.4.9~/Makefile libpri-1.4.9/Makefile
+--- libpri-1.4.9~/Makefile	2008-08-07 04:20:51.000000000 +1000
++++ libpri-1.4.9/Makefile	2009-03-22 22:07:25.000000000 +1100
 @@ -43,7 +43,7 @@
  DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
 -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
-+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
- SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
-@@ -73,7 +73,9 @@
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
- ifeq ($(PROC),sparc64)
- PROC=ultrasparc
--CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-+LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-+else
-+#LIBPRI_OPT = -O2 # Probably the sane default (Tzafrir)
- endif
- 
- all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+ libdir?=$(INSTALL_BASE)/lib

Modified: libpri/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/rules?rev=6934&op=diff
==============================================================================
--- libpri/trunk/debian/rules (original)
+++ libpri/trunk/debian/rules Sun Mar 29 10:25:58 2009
@@ -1,134 +1,24 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-include /usr/share/dpatch/dpatch.make
+# makefile.mk doesn't use upstream Makefile CFLAGS (-fPIC etc)
+#include /usr/share/cdbs/1/class/makefile.mk
 
+FILENAME := libpri_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+URL := http://downloads.digium.com/pub/libpri/releases/libpri-$(DEB_UPSTREAM_VERSION).tar.gz
 
-LIBPRI_OPTS = -Wall -g
+export DEB_BUILD_OPTIONS = noopt
 
-USE_BRISTUFF=0
+build/libpri-dev::
+	$(MAKE)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	LIBPRI_OPTS += -O0
-else
-	LIBPRI_OPTS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-PKGNAME:=$(shell sed -nre 's/^Package: (.*[0-9])$$/\1/p' debian/control)
-DEBVERSION:=$(shell head -n 1 debian/changelog \
-		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
-UPVERSIONMAJOR:=$(shell echo $(UPVERSION) | sed -re 's/(^[0-9]\.[0-9]).*/\1/')
-SHLIBS = $(PKGNAME) (>= $(UPVERSIONMAJOR))
-
-FILENAME := libpri_$(UPVERSION).orig.tar.gz
-URL := http://downloads.digium.com/pub/libpri/releases/libpri-$(UPVERSION).tar.gz
-
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure: configure-stamp
-configure-stamp: patch-stamp bristuff-stamp
-	dh_testdir
-	# Add here commands to configure the package.
-	
-	touch configure-stamp
-
-BRISTUFF_DIR=bristuffed
-bristuff-stamp: patch-stamp
-ifeq ($(USE_BRISTUFF),1)
-	mkdir -p $(BRISTUFF_DIR)
-	tar cf - . --exclude=./debian/ --exclude=./$(BRISTUFF_DIR)/ \
-	| tar xf - -C $(BRISTUFF_DIR)
-	cd $(BRISTUFF_DIR); patch <$(CURDIR)/debian/patches/bristuff.dpatch -p1
-endif
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	
-	# Add here commands to compile the package.
-	LIBPRI_OPTS="$(LIBPRI_OPTS)" $(MAKE)
-ifeq ($(USE_BRISTUFF),1)
-	cd $(BRISTUFF_DIR); LIBPRI_OPTS="$(LIBPRI_OPTS)" $(MAKE) LIB_SUF=bristuffed
-endif
-	
-	touch build-stamp
-
-clean: clean-unpatched unpatch
-clean-unpatched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -rf $(BRISTUFF_DIR)
-	
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install INSTALL_PREFIX=$(CURDIR)/debian/tmp
-ifeq ($(USE_BRISTUFF),1)
-	cd $(BRISTUFF_DIR); make install INSTALL_PREFIX=$(CURDIR)/debian/tmp \
-	  LIB_SUF=bristuffed
-endif
-
-
-# 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_install --sourcedir=debian/tmp
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V "$(SHLIBS)"
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
-	@@echo "Upstream major version:  $(UPVERSIONMAJOR)"
+install/libpri-dev::
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@echo Downloading $(FILENAME) from $(URL) ...
 	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure unpatch patch

More information about the Pkg-voip-commits mailing list