[interchange-cvs] interchange - racke modified 6 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2007-06-17 19:34:39 GMT
Modified:  debian   Tag: STABLE_5_4-branch changelog control rules
Removed:   debian   Tag: STABLE_5_4-branch
Removed:            libapache-mod-interchange.doc-base
Removed:            libapache-mod-interchange.docs
Removed:            libapache-mod-interchange.files
Log:
removed libapache-mod-interchange package as Apache 1.3 has been
removed from unstable (Closes: #428849, thanks to Bastian Blank
<waldi at debian.org>)

Revision  Changes    Path
No                   revision



No                   revision



2.67.2.20 +8 -0      interchange/debian/changelog


rev 2.67.2.20, prev_rev 2.67.2.19
Index: changelog
===================================================================
RCS file: /var/cvs/interchange/debian/changelog,v
retrieving revision 2.67.2.19
retrieving revision 2.67.2.20
diff -u -r2.67.2.19 -r2.67.2.20
--- changelog	13 Jun 2007 11:35:52 -0000	2.67.2.19
+++ changelog	17 Jun 2007 19:34:39 -0000	2.67.2.20
@@ -1,3 +1,11 @@
+interchange (5.4.2-3) unstable; urgency=low
+
+  * removed libapache-mod-interchange package as Apache 1.3 has been
+    removed from unstable (Closes: #428849, thanks to Bastian Blank
+    <waldi at debian.org>)
+
+ -- Stefan Hornburg (Racke) <racke at linuxia.de>  Sun, 17 Jun 2007 21:10:52 +0200
+
 interchange (5.4.2-2) unstable; urgency=low
 
   * removed Debconf dependency from interchange-ui postrm script 



2.21.2.2  +2 -13     interchange/debian/control


rev 2.21.2.2, prev_rev 2.21.2.1
Index: control
===================================================================
RCS file: /var/cvs/interchange/debian/control,v
retrieving revision 2.21.2.1
retrieving revision 2.21.2.2
diff -u -r2.21.2.1 -r2.21.2.2
--- control	31 Jan 2007 10:35:35 -0000	2.21.2.1
+++ control	17 Jun 2007 19:34:39 -0000	2.21.2.2
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Stefan Hornburg (Racke) <racke at linuxia.de>
 Standards-Version: 3.5.6.0
-Build-Depends: debhelper (>= 4.1.16), libdigest-md5-perl, libmime-base64-perl, libsafe-hole-perl, libstorable-perl, liburi-perl, libhtml-parser-perl, apache-dev
+Build-Depends: debhelper (>= 4.1.16), libdigest-md5-perl, libmime-base64-perl, libsafe-hole-perl, libstorable-perl, liburi-perl, libhtml-parser-perl
 
 Package: interchange-cat-standard
 Architecture: all
@@ -19,7 +19,7 @@
 Package: interchange-ui
 Architecture: all
 Depends: ${perl:Depends}, debconf | debconf-2.0, interchange (>=4.8.1)
-Suggests: apache-ssl | libapache-mod-ssl, libspreadsheet-parseexcel-perl, libspreadsheet-writeexcel-perl
+Suggests: libspreadsheet-parseexcel-perl, libspreadsheet-writeexcel-perl
 Description: Interchange administration interface (UI)
  With the Interchange administration interface, called UI, you are able
  to perform several useful operations like page edit, user's administration
@@ -30,19 +30,8 @@
 Depends: perl (>= 5.8.8), debconf | debconf-2.0, libdigest-md5-perl, libhtml-parser-perl, libmime-base64-perl, libsafe-hole-perl (>=0.06), libstorable-perl, liburi-perl, logrotate, libwww-perl, libset-crontab-perl
 Conflicts: libdbi-perl (<< 1.53)
 Recommends: interchange-ui
-Suggests: apache-ssl | libapache-mod-ssl
 Description: e-commerce and general HTTP database display system
  Interchange is a database access and retrieval system focused on e-commerce.
  It allows customers to select items to buy from catalog pages. The program
  tracks user information in sessions and interacts with a HTTP server
  through sockets.
-
-Package: libapache-mod-interchange
-Architecture: any
-Depends: ${shlibs:Depends}, apache-common (>= ${THISDEV})
-Suggests: interchange (>=4.8.1)
-Description: Integration of the Interchange link protocol with Apache
- mod_interchange is designed to replace the vlink and tlink programs that
- come with Interchange. The Interchange link protocol is implemented via
- an Apache module which saves us the (small) overhead of the execution
- of a CGI program.



2.29.2.4  +2 -11     interchange/debian/rules


rev 2.29.2.4, prev_rev 2.29.2.3
Index: rules
===================================================================
RCS file: /var/cvs/interchange/debian/rules,v
retrieving revision 2.29.2.3
retrieving revision 2.29.2.4
diff -u -r2.29.2.3 -r2.29.2.4
--- rules	30 Mar 2007 12:15:19 -0000	2.29.2.3
+++ rules	17 Jun 2007 19:34:39 -0000	2.29.2.4
@@ -28,11 +28,6 @@
 endif
 TMP = $(shell pwd)/debian/tmp
 
-APXS=/usr/bin/apxs
-
-# (From mod-perl packaging)
-DEV_DPKG_VERSION := $(shell dpkg -s apache-dev | awk '/Version:/ {print $2}')
-DEV_VERSION := $(shell echo $(DEV_DPKG_VERSION) | sed "s/^Version: \(.*\)-.*$$/\1/")
 IC_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if /^Version: (.*?)-(.*)$$/')
 IC_MAJOR_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if /^Version: (\d+\.\d+)(.*?)-(.*)$$/')
 
@@ -115,10 +110,6 @@
 	for dir in $(TMP)/usr/lib/interchange/share/interchange-5/*; do mv $$dir $(TMP)/var/www/interchange-5; done
 	chmod -x -R $(TMP)/var/www/interchange-5
 	rm -r $(TMP)/usr/lib/interchange/share/interchange-5
-# mod_interchange
-	mkdir -p $(TMP)/usr/lib/apache/1.3
-	(cd dist/src/mod_interchange; $(APXS) -i -S LIBEXECDIR=$(TMP)/usr/lib/apache/1.3 -n interchange mod_interchange.so)
-	cp debian/400mod_interchange.info $(TMP)/usr/lib/apache/1.3
 # remove unneeded stuff
 	rm $(TMP)/usr/lib/interchange/error.log
 	rm $(TMP)/usr/lib/interchange/*.pl
@@ -154,7 +145,7 @@
 	dh_installdeb -i
 	dh_shlibdeps -i
 	dh_perl -i usr/lib/interchange
-	dh_gencontrol -i -- -VTHISDEV="$(DEV_VERSION)"
+	dh_gencontrol -i 
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -176,7 +167,7 @@
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_perl -a usr/lib/interchange
-	dh_gencontrol -a -- -VTHISDEV="$(DEV_VERSION)"
+	dh_gencontrol -a 
 	dh_md5sums -a
 	dh_builddeb -a