Hello,
The latest upstream is version 6.1.3.
On examining the code, the package is native debian package, possibly
because the diff files are in debian/patches.
I think it should still come with pristine source tar.gz + diff, but I
would assume at least the pristine code is available.
I also found several bugs, e.g. the clean target doesn't unapply the
patches, and the changes to the man pages aren't reversed either. This
means for example, the word "index" is transformed into index++ on the
first build, index++++ on the next build, etc.
Also debian/rules clean should remove the autogenerated file
init_mod_vars.c.
Anyway, to build swish++ 6.1.3 I copied the debian tree from swish
5.15.3, and applied the changes in the diff file (Attached).
I have fixed all the problems I found, and it seems to build OK now.
The only possible question mark with my changes is that I changed the
patches to use the quilt system from cdbs. This could be easily changed
if required.
PS. Is swish++ still being maintained in Debian? - it looks like it
hasn't been changed except by NMU since 2004.
--
Brian May <[EMAIL PROTECTED]>
Only in swish++-5.15.3/debian: all_in_one.patch
diff -u swish++-5.15.3/debian/changelog swish++-6.1.3/debian/changelog
--- swish++-5.15.3/debian/changelog 2005-08-07 06:26:46.000000000 +1000
+++ swish++-6.1.3/debian/changelog 2006-03-07 15:16:42.253277496 +1100
@@ -1,3 +1,9 @@
+swish++ (6.1.3-1) unstable; urgency=low
+
+ * Latest upstream version.
+
+ -- Brian May <[EMAIL PROTECTED]> Tue, 7 Mar 2006 15:16:10 +1100
+
swish++ (5.15.3-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u swish++-5.15.3/debian/control swish++-6.1.3/debian/control
--- swish++-5.15.3/debian/control 2005-08-07 06:29:38.000000000 +1000
+++ swish++-6.1.3/debian/control 2006-03-08 10:26:38.083935560 +1100
@@ -2,7 +2,7 @@
Section: web
Priority: optional
Maintainer: Michael Hummel <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), zlib1g-dev
+Build-Depends: debhelper (>> 3.0.0), zlib1g-dev, cdbs, quilt
Standards-Version: 3.6.1
Package: swish++
Only in swish++-6.1.3/debian: daemon
diff -u swish++-5.15.3/debian/docs swish++-6.1.3/debian/docs
--- swish++-5.15.3/debian/docs 2003-06-06 14:55:44.000000000 +1000
+++ swish++-6.1.3/debian/docs 2006-03-07 15:20:33.987048608 +1100
@@ -1,3 +1,3 @@
README
./debian/README.Debian
-./debian/FAQ.Debian
\ No newline at end of file
+./debian/FAQ.Debian
Common subdirectories: swish++-5.15.3/debian/email_indexing and swish++-6.1.3/debian/email_indexing
Common subdirectories: swish++-5.15.3/debian/patches and swish++-6.1.3/debian/patches
diff -u swish++-5.15.3/debian/rules swish++-6.1.3/debian/rules
--- swish++-5.15.3/debian/rules 2004-03-30 02:13:15.000000000 +1000
+++ swish++-6.1.3/debian/rules 2006-03-08 11:23:26.603761784 +1100
@@ -1,11 +1,15 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+DEB_PATCHDIRS=$(shell pwd)/debian/patches
+QUILT_PATCHES=$(shell pwd)/debian/patches
+DEB_QUILT_PATCHDIR_LINK=
+
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
tmp := $(CURDIR)/debian/swish++
renamed := extract index search splitmail
norename := man1/httpindex.1 man4/swish++.conf.4 man4/swish++.index.4
fm := $(CURDIR)/debian/fixmanpage
-patchdir := $(CURDIR)/debian/patches/*
install_file = install -p -o root -g root -m 644
install_program = install -p -o root -g root -m 755
makedirectory = install -p -d -o root -g root -m 755
@@ -16,10 +20,8 @@
export DH_COMPAT=3
configure: configure-stamp
-configure-stamp:
+configure-stamp: apply-patches
dh_testdir
- # Add here commands to configure the package.
- for i in $(patchdir); do patch -p0 < $${i}; done;
touch configure-stamp
build: build-stamp
@@ -35,13 +37,15 @@
touch build-stamp
-clean:
+clean::
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+ rm -rf tmp init_mod_vars.c
+
# Add here commands to clean up after the build process.
- #-$(MAKE) clean
+ -$(MAKE) distclean
dh_clean
@@ -56,18 +60,17 @@
$(install_program) search $(tmp)/usr/bin/search++
$(install_program) extract $(tmp)/usr/bin/extract++
$(install_program) index $(tmp)/usr/bin/index++
- $(install_program) splitmail $(tmp)/usr/bin/splitmail++
- $(install_program) httpindex $(tmp)/usr/bin/httpindex
- #cd $(tmp)/usr/bin && for i in $(renamed); do mv $${i} $${i}++; done;
- cd $(CURDIR)/man/man1 && for i in $(renamed); do sh $(fm) $${i}.1; done; for i in $(renamed);\
+ $(install_program) scripts/splitmail $(tmp)/usr/bin/splitmail++
+ $(install_program) scripts/httpindex $(tmp)/usr/bin/httpindex
+ rm -rf tmp
+ cp -a $(CURDIR)/man tmp
+ cd $(CURDIR)/tmp/man1 && for i in $(renamed); do sh $(fm) $${i}.1; done; for i in $(renamed);\
do mv $${i}.1 $${i}++.1; done; \
- cd $(CURDIR)/man && for i in $(norename); do sh $(fm) $${i}; done;
- #rm $(tmp)/usr/share/man/man8/searchd.8
- #rm $(tmp)/usr/share/man/man8/searchmonitor.8
+ cd $(CURDIR)/tmp && for i in $(norename); do sh $(fm) $${i}; done;
$(makedirectory) $(CURDIR)/debian/daemon
- $(install_program) searchmonitor $(CURDIR)/debian/daemon/searchmonitor
- $(install_program) searchc $(CURDIR)/debian/daemon/searchc
- $(install_program) searchd $(CURDIR)/debian/daemon/searchd
+ $(install_program) scripts/searchmonitor $(CURDIR)/debian/daemon/searchmonitor
+ $(install_program) scripts/searchc $(CURDIR)/debian/daemon/searchc
+ $(install_program) scripts/searchd $(CURDIR)/debian/daemon/searchd
# $(install_file) man/man8/searchd.txt $(CURDIR)/debian/daemon/searchd.txt
# $(install_file) man/man8/searchmonitor.txt $(CURDIR)/debian/daemon/searchmonitor.txt
# $(install_file) debian/searchc.txt $(CURDIR)/debian/daemon/searchc.txt
@@ -95,8 +98,8 @@
# dh_installmime
# dh_installinit
dh_installcron
- dh_installman man/man1/splitmail++.1 man/man1/search++.1 man/man1/extract++.1 man/man1/index++.1 \
- man/man1/httpindex.1 man/man3/WWW.3 man/man4/swish++.conf.4 man/man4/swish++.index.4
+ dh_installman tmp/man1/splitmail++.1 tmp/man1/search++.1 tmp/man1/extract++.1 tmp/man1/index++.1 \
+ tmp/man1/httpindex.1 tmp/man3/WWW.3 tmp/man4/swish++.conf.4 tmp/man4/swish++.index.4
dh_installinfo
dh_undocumented
dh_installchangelogs Changes
Only in swish++-6.1.3/debian: rules.bak
Only in swish++-6.1.3/debian: rules.old
Only in swish++-6.1.3/debian: stamp-patched
Only in swish++-5.15.3/debian: swish++.conf.patch
