[Pkg-voip-commits] r9681 - in /yate/trunk/debian: changelog control rules

[msp at alioth.debian.org]

Author: msp
Date: Sun May 13 21:16:43 2012
New Revision: 9681

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9681
Log:
* New upstream release
* Add explicit install target
  - Fixes "FTBFS: skips upstream installation step" (Closes: #668232)
* Fix "fails to upgrade from 'testing' - trying to overwrite
  /etc/yate/providers.conf" cleanup Conflicts/ Replaces (Closes: #666883)

Modified:
    yate/trunk/debian/changelog
    yate/trunk/debian/control
    yate/trunk/debian/rules

Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=9681&op=diff
==============================================================================
--- yate/trunk/debian/changelog (original)
+++ yate/trunk/debian/changelog Sun May 13 21:16:43 2012
@@ -1,3 +1,13 @@
+yate (4.1.0-1~dfsg-1) unstable; urgency=low
+
+  * New upstream release
+  * Add explicit install target
+    - Fixes "FTBFS: skips upstream installation step" (Closes: #668232)
+  * Fix "fails to upgrade from 'testing' - trying to overwrite
+    /etc/yate/providers.conf" cleanup Conflicts/ Replaces (Closes: #666883)
+
+ -- Mark Purcell <msp at debian.org>  Sun, 13 May 2012 17:09:17 +1000
+
 yate (4.0.0-1~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: yate/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/control?rev=9681&op=diff
==============================================================================
--- yate/trunk/debian/control (original)
+++ yate/trunk/debian/control Sun May 13 21:16:43 2012
@@ -51,8 +51,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: yate (<= 2.1.0-1~dfsg-1)
-Replaces: yate (<= 2.1.0-1~dfsg-1)
 Description: YATE core modules
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -63,8 +61,6 @@
 Package: yate-dev
 Architecture: any
 Section: libdevel
-Conflicts: yate (<= 2.1.0-1~dfsg-1)
-Replaces: yate (<= 2.1.0-1~dfsg-1)
 Depends: ${misc:Depends}, libyate4.0.0 (= ${binary:Version})
 Description: Development files for YATE
  YATE is a telephony engine aimed at creating a telephony server that
@@ -88,8 +84,6 @@
 Package: yate-scripts
 Architecture: any
 Depends: ${misc:Depends}, yate (>= ${binary:Version}), php5-cli
-Conflicts: yate (<= 2.1.0-1~dfsg-1)
-Replaces: yate (<= 2.1.0-1~dfsg-1)
 Description: PHP scripts for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -110,8 +104,6 @@
 Package: yate-h323chan
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
-Conflicts: yate-openh323
-Replaces: yate-openh323
 Description: H323 module for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -120,8 +112,8 @@
  This is the H.323 protocol module.
 
 Package: yate-qt4
-Conflicts: yate-gtk2
-Replaces: yate-gtk2
+Conflicts: yate (<= 2.2.0-1~dfsg-1.2)
+Replaces: yate (<= 2.2.0-1~dfsg-1.2)
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version}), yate-alsa (= ${binary:Version}) [linux-any]
 Description: YATE-based universal telephony client

Modified: yate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/rules?rev=9681&op=diff
==============================================================================
--- yate/trunk/debian/rules (original)
+++ yate/trunk/debian/rules Sun May 13 21:16:43 2012
@@ -93,6 +93,9 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
+install:
+	dh install
+
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "DFSG     version:        $(DFSG)"
@@ -114,5 +117,8 @@
 	@@rm -rf ../tarballs/dfsg
 	@@rm -f ../tarballs/$(FILENAME)
 
+# Commands not to run
+override_dh_auto_test:
+
 binary: binary-indep binary-arch
 .PHONY: build build-arch build-indep clean clean-patched patch unpatch binary-indep binary-arch binary install