r18421 - in /trunk/libwx-perl/debian: changelog control rules

[roberto at users.alioth.debian.org]

Author: roberto
Date: Tue Apr  8 19:56:51 2008
New Revision: 18421

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18421
Log:
Revert bogus attempted fix of #474404

Modified:
    trunk/libwx-perl/debian/changelog
    trunk/libwx-perl/debian/control
    trunk/libwx-perl/debian/rules

Modified: trunk/libwx-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwx-perl/debian/changelog?rev=18421&op=diff
==============================================================================
--- trunk/libwx-perl/debian/changelog (original)
+++ trunk/libwx-perl/debian/changelog Tue Apr  8 19:56:51 2008
@@ -1,9 +1,3 @@
-libwx-perl (0.82-2) UNRELEASED; urgency=low
-
-  * WORK IN PROGRESS: Depend on and build with g++-4.2 (Closes: #474404)
-
- -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 05 Apr 2008 17:10:59 -0400
-
 libwx-perl (0.82-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libwx-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwx-perl/debian/control?rev=18421&op=diff
==============================================================================
--- trunk/libwx-perl/debian/control (original)
+++ trunk/libwx-perl/debian/control Tue Apr  8 19:56:51 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Roberto C. Sanchez <roberto at connexer.com>,
  gregor herrmann <gregor+debian at comodo.priv.at>
-Build-Depends: debhelper (>= 5), quilt, libalien-wxwidgets-perl, xvfb, xbase-clients, xfonts-base, libtest-pod-perl, libyaml-perl, libio-string-perl, libmodule-info-perl, g++-4.2
+Build-Depends: debhelper (>= 5), quilt, libalien-wxwidgets-perl, xvfb, xbase-clients, xfonts-base, libtest-pod-perl, libyaml-perl, libio-string-perl, libmodule-info-perl
 Standards-Version: 3.7.3
 Homepage: http://wxperl.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libwx-perl/

Modified: trunk/libwx-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwx-perl/debian/rules?rev=18421&op=diff
==============================================================================
--- trunk/libwx-perl/debian/rules (original)
+++ trunk/libwx-perl/debian/rules Tue Apr  8 19:56:51 2008
@@ -29,17 +29,15 @@
 else
         CFLAGS += -O2
 endif
-CC=gcc-4.2
-CXX=g++-4.2
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Add commands to compile the package here
-	CC="$(CC)" CXX="$(CXX)" $(PERL) Makefile.PL INSTALLDIRS=vendor
-	CC="$(CC)" CXX="$(CXX)" $(MAKE)
-	CC="$(CC)" CXX="$(CXX)" xvfb-run $(MAKE) test
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE)
+	xvfb-run $(MAKE) test
 
 	touch build-stamp
 
@@ -50,7 +48,7 @@
 	dh_clean build-stamp install-stamp
 	
 	# Add commands to clean up after the build process here
-	[ ! -f Makefile ] || CC="$(CC)" CXX="$(CXX)" $(MAKE) realclean
+	[ ! -f Makefile ] || $(MAKE) realclean
 	
 	dh_clean ext/richtext/Makefile.old ext/dataview/Makefile.old \
 	    ext/aui/Makefile.old \
@@ -63,7 +61,7 @@
 	dh_clean -k
 
 	# Add commands to install the package into debian/$PACKAGE_NAME here
-	CC="$(CC)" CXX="$(CXX)" $(MAKE) install DESTDIR=$(TMP)
+	$(MAKE) install DESTDIR=$(TMP)
 	rename 's/build:://' $(TMP)/usr/share/man/man3/build*
 
 	find $(TMP) -type f -name .packlist | xargs rm -f