Hi,
Here is a debdiff of the NMU I uploaded.
Thank you,
Barry deFreese
reverted:
--- pgfouine-1.0/.pc/.version
+++ pgfouine-1.0.orig/.pc/.version
@@ -1 +0,0 @@
-2
diff -u pgfouine-1.0/debian/rules pgfouine-1.0/debian/rules
--- pgfouine-1.0/debian/rules
+++ pgfouine-1.0/debian/rules
@@ -11,6 +11,9 @@
dh_testroot
-rm -f build-stamp
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+
+ rm -rf .pc
+
dh_clean
install: build
@@ -26,11 +29,8 @@
cp pgfouine_vacuum.php debian/pgfouine/usr/bin/pgfouine_vacuum
dh_install -A
# Remove useless stuff
- rm -rf
debian/pgfouine/usr/share/pgfouine/include/reporting/geshi/docs
+ rm -rf
debian/pgfouine/usr/share/pgfouine/include/reporting/geshi/docs/COPYING
rm -rf
debian/pgfouine/usr/share/pgfouine/include/reporting/artichow/font
- # Override duplicate font warning
- install -o root -g root -m 0644 debian/linda.override \
- debian/pgfouine/usr/share/linda/overrides/pgfouine
dh_installman -A debian/pgfouine.1
dh_installman -A debian/pgfouine_vacuum.1
dh_installchangelogs -A ChangeLog
@@ -43,8 +43,7 @@
dh_builddeb -A
binary-arch:
- dh_testdir
- dh_testroot
+ #Nothing to be done here.
binary: binary-indep binary-arch
.PHONY: binary binary-indep binary-arch clean
reverted:
--- pgfouine-1.0/debian/linda.override
+++ pgfouine-1.0.orig/debian/linda.override
@@ -1 +0,0 @@
-Tag: duplicate-truetype-font
diff -u pgfouine-1.0/debian/patches/series
pgfouine-1.0/debian/patches/series
--- pgfouine-1.0/debian/patches/series
+++ pgfouine-1.0/debian/patches/series
@@ -3,0 +4 @@
+30-use-php-gesi
diff -u pgfouine-1.0/debian/changelog pgfouine-1.0/debian/changelog
--- pgfouine-1.0/debian/changelog
+++ pgfouine-1.0/debian/changelog
@@ -1,3 +1,15 @@
+pgfouine (1.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 30-use-php-gesi. Use php-gesi. (Closes: #504681).
+ + Thanks to Marcos Marado for the patch.
+ * Remove .pc dir on clean.
+ * Remove binary-arch commands as package is binary-indep.
+ * Remove unnecessary linda override file.
+ * Bump Standards Version to 3.8.0. (No changes needed).
+
+ -- Barry deFreese <[EMAIL PROTECTED]> Thu, 06 Nov 2008 16:50:59 -0500
+
pgfouine (1.0-1) unstable; urgency=low
* New upstream version (Closes: #433760)
diff -u pgfouine-1.0/debian/control pgfouine-1.0/debian/control
--- pgfouine-1.0/debian/control
+++ pgfouine-1.0/debian/control
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Clément Stenac <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4), quilt
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Package: pgfouine
Architecture: all
-Depends: php5-cli, php5-gd, ttf-bitstream-vera
+Depends: php5-cli, php5-gd, ttf-bitstream-vera, php-gesi
Description: PostgreSQL log analyzer
pgFouine is a log analyzer for the PostgreSQL database system,
used to generate detailed reports from a PostgreSQL log file.
diff -u pgfouine-1.0/debian/dirs pgfouine-1.0/debian/dirs
--- pgfouine-1.0/debian/dirs
+++ pgfouine-1.0/debian/dirs
@@ -3 +2,0 @@
-/usr/share/linda/overrides
only in patch2:
unchanged:
--- pgfouine-1.0.orig/debian/patches/30-use-php-gesi
+++ pgfouine-1.0/debian/patches/30-use-php-gesi
@@ -0,0 +1,20 @@
+Index: pgfouine-1.0/include/reporting/reports.lib.php
+===================================================================
+--- pgfouine-1.0.orig/include/reporting/reports.lib.php
2008-11-06 16:49:49.000000000 -0500
++++ pgfouine-1.0/include/reporting/reports.lib.php 2008-11-06
16:50:19.000000000 -0500
+@@ -24,7 +24,7 @@
+ require_once('ReportAggregator.class.php');
+ require_once('TextReportAggregator.class.php');
+
+-include_once('geshi/geshi.php');
++include_once('/usr/share/php-geshi/geshi.php');
+ require_once('HtmlReportAggregator.class.php');
+
+ require_once('HtmlWithGraphsReportAggregator.class.php');
+@@ -45,4 +45,4 @@
+ require_once('reports/NormalizedErrorsReport.class.php');
+ require_once('reports/NormalizedErrorsMostFrequentReport.class.php');
+
+-?>
+\ No newline at end of file
++?>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
