...That explains why I just did it ;-)

-- 
Gunnar Wolf - [EMAIL PROTECTED] - (+52-55)5623-0154 / 1451-2244
PGP key 1024D/8BB527AF 2001-10-23
Fingerprint: 0C79 D2D1 2C4E 9CE4 5973  F800 D80E F35A 8BB5 27AF
Only in libembperl-perl-2.2.0/: dbinitembperlapache
diff -ru old/libembperl-perl-2.2.0/debian/control libembperl-perl-2.2.0/debian/control
--- old/libembperl-perl-2.2.0/debian/control	2007-07-10 00:32:12.000000000 -0500
+++ libembperl-perl-2.2.0/debian/control	2007-07-10 00:11:32.000000000 -0500
@@ -1,7 +1,7 @@
 Source: libembperl-perl
 Section: web
 Priority: optional
-Build-Depends: apache-dev, apache, libapache-mod-perl, apache2-prefork-dev (>= 2.2.3-3.3), apache2-mpm-prefork (>= 2.2.3-3.3), libapache2-mod-perl2 (>= 2.0.2-2.3), libwww-perl, libapache-sessionx-perl, libcgi-pm-perl | perl-modules (>= 5.8.0) | libcgi-perl, libxslt1-dev, debhelper (>= 3.0.5), perl (>= 5.6.0-17), netbase
+Build-Depends: apache2-prefork-dev (>= 2.2.3-3.3), apache2-mpm-prefork (>= 2.2.3-3.3), libapache2-mod-perl2 (>= 2.0.2-2.3), libwww-perl, libapache-sessionx-perl, libcgi-pm-perl | perl-modules (>= 5.8.0) | libcgi-perl, libxslt1-dev, debhelper (>= 3.0.5), perl (>= 5.6.0-17), netbase
 Maintainer: Angus Lees <[EMAIL PROTECTED]>
 Uploaders: Gunnar Wolf <[EMAIL PROTECTED]>
 Standards-Version: 3.6.2
@@ -9,7 +9,7 @@
 Package: libembperl-perl
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}, libwww-perl, libcgi-pm-perl | perl-modules (>= 5.8.0) | libcgi-perl
-Recommends: libapache2-mod-perl2 (>= 2.0.2-2.3) | libapache-mod-perl | libfcgi-perl, libapache-sessionx-perl
+Recommends: libapache2-mod-perl2 (>= 2.0.2-2.3) | libfcgi-perl, libapache-sessionx-perl
 Suggests: mmm-mode, libdbix-recordset-perl
 Description: A system for building dynamic websites with Perl
  Embperl gives you the power to embed Perl code in your HTML/XML
@@ -30,7 +30,7 @@
  (English) or http://www.ecos.de/embperl/ (German) for more
  information about Embperl.
  .
- This package contains Apache, Apache2, FastCGI, CGI and offline
- versions of Embperl, although you may need to install some additional
- packages to use some of those modes.
+ This package contains Apache2, FastCGI, CGI and offline versions of
+ Embperl, although you may need to install some additional packages to
+ use some of those modes. 
 
diff -ru old/libembperl-perl-2.2.0/debian/rules libembperl-perl-2.2.0/debian/rules
--- old/libembperl-perl-2.2.0/debian/rules	2007-07-10 00:32:12.000000000 -0500
+++ libembperl-perl-2.2.0/debian/rules	2007-07-10 00:26:56.000000000 -0500
@@ -33,6 +33,8 @@
 OPTIMIZE += -O2
 endif
 
+APXS=apxs2
+
 # extra files required for builds from CVS
 #CVSEXTRAS = xs/Makefile.PL Config.pod
 
@@ -43,37 +45,24 @@
 APAHCE_SRC=$(shell $(APXS) -q LIBEXECDIR)
 EPHTTPD=$(shell $(APXS) -q SBINDIR)/$(shell $(APXS) -q TARGET)
 
-config13: APXS=apxs
-config13: FORCEMP=1
-config2: APXS=apxs2
-config2: FORCEMP=0
-
 %: %.pod
 	pod2text < $< > $@
 
-config-common: $(CVSEXTRAS)
+config: $(CVSEXTRAS)
+	FORCEMP=0
 	dh_testdir
-
-config%: config-common
 	APACHE_HDR=$(APACHE_HDR) \
 	APACHE_SRC=$(APAHCE_SRC) \
 	EPHTTPD=$(EPHTTPD) \
 	FORCEMP1=$(FORCEMP) \
 	$(PERL) Makefile.PL $(DEBUG) INSTALLDIRS=vendor
 
-build: build-stamp
+build: config build-stamp
 build-stamp: $(POD2TEXT)
-# NB: the Embperl_BS "-13" hack requires an Embperl.so to exist, else
-# the Embperl.bs file isn't even used.  Rather than mess with
-# temporary symlinks or copies or something, we just build v2 first.
-	$(MAKE) -f debian/rules build2
-	$(MAKE) -f debian/rules build13
-	touch $@
-
-build%: config%
 	dh_testdir
 	$(MAKE) OPTIMIZE="$(OPTIMIZE)" LD_RUN_PATH=""
 	$(MAKE) TESTARGS="$(TESTARGS)" test
+	touch $@
 
 install: build
 	dh_testdir
@@ -105,7 +94,7 @@
 	dh_testroot
 
 	$(RM) build-stamp
-	-$(MAKE) realclean
+	[ ! -f Makefile ] || $(MAKE) realclean
 	$(RM) $(POD2TEXT)
 
 	dh_clean
Only in libembperl-perl-2.2.0/test: tmp

Attachment: pgpkTRlOT3XUr.pgp
Description: PGP signature



Reply via email to