Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-11-15 Thread Jeroen Dekkers 
At Sun, 11 Nov 2012 18:36:14 +0100,
Julien Cristau wrote:
> 
> On Wed, Nov  7, 2012 at 09:28:28 +1100, Mark Purcell wrote:
> 
> > On Wed, 7 Nov 2012 00:32:36 Paul Chitescu wrote:
> > > > unblock yate/4.1.0-1~dfsg-3
> > > > 
> > > > [...]
> > >
> > > Does this require any more action?
> > 
> > Hi Paul,
> > 
> > Yes we are awaiting a decision from debian-release.
> > 
> debian-release don't like the debian/rules changes much.

I think we can all agree on that. Such changes shouldn't happen during
the freeze, but the problem is that the debian/rules file is buggy:

http://anonscm.debian.org/viewvc/pkg-voip/yate/tags/4.1.0-1~dfsg-2/debian/rules?revision=9806&view=markup

On line 21-22 and 96-97 you see the use of dh, but in lines 24-94 old
style debhelper is used. This is just wrong and causes bugs. The
proper fix would be to use only one style and this is what Mark did in
the last version.

It might be possible to spend a lot of time to see whether the known
bugs can be fixed with minimal changes and just hope there aren't more
bugs caused by the mix of debhelper styles, but I think that's a waste
of time and keeping the mix of debhelper isn't going to make reviewing
what's going on easier.

Yate is also just a leaf package. If Yate gets new RC bugs because of
these changes and those aren't quickly fixed it can simply be removed
from testing.

Kind regards,

Jeroen Dekkers


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87d2zfnjyc.wl%jer...@dekkers.ch

Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-11-11 Thread Julien Cristau 
On Wed, Nov  7, 2012 at 09:28:28 +1100, Mark Purcell wrote:

> On Wed, 7 Nov 2012 00:32:36 Paul Chitescu wrote:
> > > unblock yate/4.1.0-1~dfsg-3
> > > 
> > > [...]
> >
> > Does this require any more action?
> 
> Hi Paul,
> 
> Yes we are awaiting a decision from debian-release.
> 
debian-release don't like the debian/rules changes much.

Cheers,
Julien


signature.asc
Description: Digital signature

Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-11-06 Thread Mark Purcell 
On Wed, 7 Nov 2012 00:32:36 Paul Chitescu wrote:
> > unblock yate/4.1.0-1~dfsg-3
> > 
> > [...]
>
> Does this require any more action?

Hi Paul,

Yes we are awaiting a decision from debian-release.

Mark


signature.asc
Description: This is a digitally signed message part.

Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-11-06 Thread Paul Chitescu 
On Saturday 27 October 2012 07:18:17 am Mark Purcell wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
>
> Please unblock package yate
>
> This release fixes three RC bugs and includes missing core modules.
>
>
> Thanks,
> Mark
>
> unblock yate/4.1.0-1~dfsg-3
>
> [...]

Hi!

Does this require any more action?

Paul


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/201211061532.36732.pa...@voip.null.ro

Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-10-27 Thread Mark Purcell 
On Sat, 27 Oct 2012 20:06:52 Adam D. Barratt wrote:
> "Cleanup" here appears to mean "drop the explicit build* and binary*
> targets". Was it not feasible to fix the issue in a less drastic (for
> want of a better word that escapes me currently) manner?

Adam,

Unfortunatly not easily.

We had a mix-and-match approach with a half-and-half of dh and old style 
debhelper, so it wasn't clear what was supposed to be going on.

We have now greatly simplified with a standard dh approach with just three 
overrides:

#!/usr/bin/make -f

export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
export DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk

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$$//')

DFSG:=$(shell echo $(DEBVERSION) | sed -e 's/-[0-9.]*$$//')

FILENAME := yate_$(UPVERSION).orig.tar.gz
SRCDIR := yate
DFSGNAME := yate_$(DFSG).orig.tar.gz
URL := http://yate.null.ro/tarballs/yate4/yate-$(UPVERSION).tar.gz

%:
dh $@ --with autotools_dev,autoreconf --parallel

override_dh_auto_configure:
dh_auto_configure --\
--without-openh323 --disable-ilbc --without-amrnb --without-
coredumper --enable-sctp CFLAGS="$(CFLAGS) $(CPPFLAGS)"

override_dh_auto_build-indep:
cd share/scripts/yaypm ; python ./setup.py build

override_dh_auto_test:


Mark


signature.asc
Description: This is a digitally signed message part.

Processed: Re: Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-10-27 Thread Debian Bug Tracking System 
Processing control commands:

> tags -1 + moreinfo
Bug #691552 [release.debian.org] unblock: yate/4.1.0-1~dfsg-3
Added tag(s) moreinfo.

-- 
691552: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691552
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.b691552.135132890923387.transcr...@bugs.debian.org

Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-10-27 Thread Adam D. Barratt 
Control: tags -1 + moreinfo

On Sat, 2012-10-27 at 15:18 +1100, Mark Purcell wrote:
> Please unblock package yate
> 
> This release fixes three RC bugs and includes missing core modules.
[...]
> +  * Cleanup debian/rules - restores missing modules
> +- Fixes "Do not call dh_installinit twice" (Closes: #680563)
> +- Fixes "package "yate" doesn't ship any module at all" (Closes: #683229)

"Cleanup" here appears to mean "drop the explicit build* and binary*
targets". Was it not feasible to fix the issue in a less drastic (for
want of a better word that escapes me currently) manner?

Regards,

Adam


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/1351328812.5616.15.ca...@jacala.jungle.funky-badger.org

Bug#691552: unblock: yate/4.1.0-1~dfsg-3

2012-10-26 Thread Mark Purcell 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package yate

This release fixes three RC bugs and includes missing core modules.


Thanks,
Mark

unblock yate/4.1.0-1~dfsg-3


diff -ur 4.1.0-1~dfsg-2/debian/changelog 4.1.0-1~dfsg-3/debian/changelog
--- 4.1.0-1~dfsg-2/debian/changelog 2012-10-20 11:44:16.0 +1100
+++ 4.1.0-1~dfsg-3/debian/changelog 2012-10-21 15:48:38.0 +1100
@@ -1,3 +1,16 @@
+yate (4.1.0-1~dfsg-3) unstable; urgency=medium
+
+  * Urgency medium as this fixes three RC bugs for wheezy
+  * Cleanup debian/rules - restores missing modules
+- Fixes "Do not call dh_installinit twice" (Closes: #680563)
+- Fixes "package "yate" doesn't ship any module at all" (Closes: #683229)
+  * Remove h323 Build-Depends and package - fixes FTBFS (Closes: #680818)
+  * Add necessary Replaces
+- Fixes "modifies conffiles during squeeze2wheezy upgrade (policy
+10.7.3): /etc/yate/providers.conf" (Closes: #689780)
+
+ -- Mark Purcell   Sat, 20 Oct 2012 11:47:40 +1100
+
 yate (4.1.0-1~dfsg-2) unstable; urgency=low
 
   * NEW package libyate4.1.0 match-soname
diff -ur 4.1.0-1~dfsg-2/debian/control 4.1.0-1~dfsg-3/debian/control
--- 4.1.0-1~dfsg-2/debian/control   2012-10-20 11:44:16.0 +1100
+++ 4.1.0-1~dfsg-3/debian/control   2012-10-21 15:35:15.0 +1100
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 8),
  autotools-dev,
  dh-autoreconf,
- libopenh323-dev | libh323plus-dev (>= 1.22.0~),
+# libopenh323-dev | libh323plus-dev (>= 1.22.0~),
  libgsm1-dev,
  dahdi-source,
  libmysqlclient-dev,
@@ -28,7 +28,7 @@
 
 Package: yate
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, yate-core (= 
${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, yate-core (= 
${binary:Version}), libcap2-bin
 Description: Yet Another Telephony Engine (YATE)
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -103,19 +103,20 @@
  .
  These are the modules that require PostgreSQL.
 
-Package: yate-h323chan
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
-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
- enough for complex Gateway and IVR solutions.
- .
- This is the H.323 protocol module.
+#Package: yate-h323chan
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+#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
+# enough for complex Gateway and IVR solutions.
+# .
+# This is the H.323 protocol module.
 
 Package: yate-qt4
 Conflicts: yate-core (<< 4)
 Breaks: yate-core (<< 4)
+Replaces: yate-core (<< 4)
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version}), 
yate-alsa (= ${binary:Version}) [linux-any]
 Description: YATE-based universal telephony client
diff -ur 4.1.0-1~dfsg-2/debian/rules 4.1.0-1~dfsg-3/debian/rules
--- 4.1.0-1~dfsg-2/debian/rules 2012-10-20 11:44:16.0 +1100
+++ 4.1.0-1~dfsg-3/debian/rules 2012-10-21 15:49:53.0 +1100
@@ -11,95 +11,17 @@
 DFSGNAME := yate_$(DFSG).orig.tar.gz
 URL := http://yate.null.ro/tarballs/yate4/yate-$(UPVERSION).tar.gz
 
-check-ilbc:
-ifneq (,$(wildcard libs/ilbc/iLBC_define.h))
-   echo "WARNING: iLBC must be removed from sources before packaging."
-   exit 1
-endif
-   touch $@
-
 %:
-   dh $@ --with autotools_dev,autoreconf 
+   dh $@ --with autotools_dev,autoreconf
 
-config.status: check-ilbc 
-   dh_autoreconf --as-needed
+override_dh_auto_configure:
dh_auto_configure --\
-   --without-openh323 --disable-ilbc --without-amrnb 
--without-coredumper --enable-sctp
-
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config.status
-   dh_testdir
-   $(MAKE)
-   touch $@
+   --without-openh323 --disable-ilbc --without-amrnb 
--without-coredumper --enable-sctp CFLAGS="$(CFLAGS) $(CPPFLAGS)"
 
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
+override_dh_auto_build-indep:
cd share/scripts/yaypm ; python ./setup.py build
-   touch $@
-
-
-# Build architecture-independent files here.
-binary-indep: install
-   dh_testdir -i
-   dh_testroot -i
-   dh_auto_install
-   dh_installlogrotate -i
-   dh_installinit -i -- defaults 21
-   dh_installdocs -i 
-   dh_installexamples -i -XCVS
-   dh_installcron -i
-   dh_installchangelogs ChangeLog -i
-   dh_install -i
-   dh_link -i
-   dh_compress -i
-   dh_fixperms -i
-   dh_installdeb -i
-   dh_gencontrol -i
-