[Pkg-voip-commits] r886 - in twinkle/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2005-10-30 20:54:25 +0000 (Sun, 30 Oct 2005)
New Revision: 886

Removed:
   twinkle/trunk/debian/patches/configure.in.patch
Modified:
   twinkle/trunk/debian/changelog
   twinkle/trunk/debian/rules
Log:
* Use correct QTDIR=/usr/share/qt3, negates need for
  DEB_AUTO_UPDATE_AUTOCONF
* Remove patch against configure.in

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2005-10-30 19:37:32 UTC (rev 885)
+++ twinkle/trunk/debian/changelog	2005-10-30 20:54:25 UTC (rev 886)
@@ -1,3 +1,11 @@
+twinkle (0.3.2-5) unstable; urgency=low
+
+  * Use correct QTDIR=/usr/share/qt3, negates need for
+    DEB_AUTO_UPDATE_AUTOCONF
+  * Remove patch against configure.in
+
+ -- Mark Purcell <msp at debian.org>  Sun, 30 Oct 2005 20:41:33 +0000
+
 twinkle (0.3.2-4) unstable; urgency=low
 
   * Add Build-Depends: kdelibs4-dev kdelibs-bin, libasounds2-dev, libxml2-dev

Deleted: twinkle/trunk/debian/patches/configure.in.patch
===================================================================
--- twinkle/trunk/debian/patches/configure.in.patch	2005-10-30 19:37:32 UTC (rev 885)
+++ twinkle/trunk/debian/patches/configure.in.patch	2005-10-30 20:54:25 UTC (rev 886)
@@ -1,11 +0,0 @@
---- configure.in.orig	2005-10-29 15:15:22.000000000 +0100
-+++ configure.in	2005-10-29 15:04:32.000000000 +0100
-@@ -92,7 +92,7 @@
- 	echo "LIBS += -lasound" >> $QT_INCL_PRO
- 	])
- 
--$QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
-+/usr/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
- echo "distdir:" >> src/gui/Makefile
- 
- # Strip the -O2 flag from CXXFLAGS for building the SIP parser.

Modified: twinkle/trunk/debian/rules
===================================================================
--- twinkle/trunk/debian/rules	2005-10-30 19:37:32 UTC (rev 885)
+++ twinkle/trunk/debian/rules	2005-10-30 20:54:25 UTC (rev 886)
@@ -4,9 +4,7 @@
   
 # Add here any variable or target overrides you need
 
-DEB_AUTO_UPDATE_AUTOCONF := 2.50
-
-export QTDIR=/usr/lib/qt3
+export QTDIR=/usr/share/qt3
   
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk