[Pkg-voip-commits] r8249 - in /openr2/trunk/debian: changelog control copyright libopenr2-1.docs libopenr2-1.install libopenr2-3.docs libopenr2-3.install rules

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Fri Apr 2 21:40:58 UTC 2010 

Author: tzafrir
Date: Fri Apr  2 21:40:44 2010
New Revision: 8249

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8249
Log:
* New upstream release: 1.3.0
* New SONAME (1->3)
* Switch to using dh in debian/rules
* Upstream explicitly includes GPL2 and LGPL2 now. Point to them in the
  copyright file.
* Run autoreconf to work around an rpath issue.

Added:
    openr2/trunk/debian/libopenr2-3.docs
      - copied unchanged from r8248, openr2/trunk/debian/libopenr2-1.docs
    openr2/trunk/debian/libopenr2-3.install
      - copied unchanged from r8248, openr2/trunk/debian/libopenr2-1.install
Removed:
    openr2/trunk/debian/libopenr2-1.docs
    openr2/trunk/debian/libopenr2-1.install
Modified:
    openr2/trunk/debian/changelog
    openr2/trunk/debian/control
    openr2/trunk/debian/copyright
    openr2/trunk/debian/rules

Modified: openr2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/changelog?rev=8249&op=diff
==============================================================================
--- openr2/trunk/debian/changelog (original)
+++ openr2/trunk/debian/changelog Fri Apr  2 21:40:44 2010
@@ -1,6 +1,5 @@
-openr2 (1.2.0-1) unstable; urgency=low
+openr2 (1.3.0-1) unstable; urgency=low
 
-  [ Tzafrir Cohen ]
   * Initial release. (Closes: #524118)
 
- -- Faidon Liambotis <paravoid at debian.org>  Sun, 13 Sep 2009 01:36:02 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri, 02 Apr 2010 10:13:59 +0300

Modified: openr2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/control?rev=8249&op=diff
==============================================================================
--- openr2/trunk/debian/control (original)
+++ openr2/trunk/debian/control Fri Apr  2 21:40:44 2010
@@ -5,14 +5,14 @@
 Uploaders: Alexandre Cavalcante Alencar <alexandre.alencar at gmail.com>,
  Tzafrir Cohen <tzafrir.cohen at xorcom.com>,
  Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, dahdi-source, libtool
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dahdi-source, libtool, autoconf
+Standards-Version: 3.8.4
 Homepage: http://www.libopenr2.org
 
 Package: libopenr2-dev
 Section: libdevel
 Architecture: any
-Depends: libopenr2-1 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libopenr2-3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: MFC/R2 (telephony) call setup library - Development
  OpenR2 is a library that implements the MFC/R2 telephony signalling 
  over E1 lines using the DAHDI Telephony interface.
@@ -23,8 +23,7 @@
  .
  This package contains libraries and header files for developing applications.
 
-Package: libopenr2-1
-Section: libs
+Package: libopenr2-3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dahdi
 Suggests: asterisk

Modified: openr2/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/copyright?rev=8249&op=diff
==============================================================================
--- openr2/trunk/debian/copyright (original)
+++ openr2/trunk/debian/copyright Fri Apr  2 21:40:44 2010
@@ -29,7 +29,7 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in `/usr/share/common-licenses/LGPL'.
+can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 The r2test binary (installed on the system) - same copyright, GPLv2 or later:
 
@@ -51,7 +51,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General Public License can be
-found in `/usr/share/common-licenses/GPL'.
+found in `/usr/share/common-licenses/GPL-2'.
 
 Portions written by Steve Underwood and provided under LGPLv2.1:
 
@@ -78,5 +78,5 @@
 v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 The Debian packaging is Copyright © 2008, Alexandre Cavalcante Alencar
-<alexandre.alencar at gmail.com> (and others) and is licensed under the GPL, see
-`/usr/share/common-licenses/GPL'.
+<alexandre.alencar at gmail.com> (and others) and is licensed under the GPL,
+(version 2 or later) see `/usr/share/common-licenses/GPL-2'.

Modified: openr2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/rules?rev=8249&op=diff
==============================================================================
--- openr2/trunk/debian/rules (original)
+++ openr2/trunk/debian/rules Fri Apr  2 21:40:44 2010
@@ -8,29 +8,6 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-
-# 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)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-
-
-
-# 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 src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 PACKAGE:=openr2
 DEBVERSION:=$(shell head -n 1 debian/changelog \
@@ -43,64 +20,13 @@
 UPFILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
 URL := http://openr2.googlecode.com/files/$(PACKAGE)-$(UPVERSION).tar.gz
 
-config.status: configure
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure $(CROSS) --sysconfdir=/etc/openr2 --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+%:
+	dh $@
 
+override_dh_auto_configure:
+	autoreconf -i
+	dh_auto_configure -- --sysconfdir=/etc/openr2
 
-build: build-stamp
-build-stamp:  config.status 
-	dh_testdir
-
-	$(MAKE)
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
@@ -112,5 +38,5 @@
 	@@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 print-version get-orig-source
+#binary: binary-indep binary-arch
+#.PHONY: build clean binary-indep binary-arch binary install print-version get-orig-source

More information about the Pkg-voip-commits mailing list