[interchange-cvs] interchange - racke modified 4 files

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Wed Feb 13 04:17:00 2002


User:      racke
Date:      2002-02-13 09:16:03 GMT
Modified:  .        Tag: STABLE_4_8-branch WHATSNEW
Modified:  debian   Tag: STABLE_4_8-branch changelog control rules
Log:
fixed overly strict dependency on apache-common (Closes: #133671,
thanks to Matthew Wilcox <willy@debian.org>)

Revision  Changes    Path
No                   revision



No                   revision



2.6.2.34  +5 -1      interchange/WHATSNEW


rev 2.6.2.34, prev_rev 2.6.2.33
Index: WHATSNEW
===================================================================
RCS file: /anon_cvs/repository/interchange/WHATSNEW,v
retrieving revision 2.6.2.33
retrieving revision 2.6.2.34
diff -u -r2.6.2.33 -r2.6.2.34
--- WHATSNEW	9 Feb 2002 11:29:11 -0000	2.6.2.33
+++ WHATSNEW	13 Feb 2002 09:16:03 -0000	2.6.2.34
@@ -80,7 +80,11 @@
 * Directory /etc/interchange/usertag for locally used global usertags 
   add to the interchange Debian package.
 
-* interchange-ui Debian package now suggests a HTTPS server
+* Fixed overly strict dependency of the libapache-mod-interchange
+  Debian package on apache-common. Thanks to Matthew Wilcox 
+  <willy@debian.org>).
+
+* interchange-ui Debian package now suggests a HTTPS server.
 
 ------------------------------------------------------------------------------
 



No                   revision



No                   revision



2.10.2.18 +3 -1      interchange/debian/changelog


rev 2.10.2.18, prev_rev 2.10.2.17
Index: changelog
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/changelog,v
retrieving revision 2.10.2.17
retrieving revision 2.10.2.18
diff -u -r2.10.2.17 -r2.10.2.18
--- changelog	7 Feb 2002 10:24:35 -0000	2.10.2.17
+++ changelog	13 Feb 2002 09:16:03 -0000	2.10.2.18
@@ -1,5 +1,7 @@
 interchange (4.8.4-1) unstable; urgency=low
 
+  * fixed overly strict dependency on apache-common (Closes: #133671,
+    thanks to Matthew Wilcox <willy@debian.org>)
   * add version to dependency on libsql-statement-perl, because newer
     versions cause Interchange to fail in some cases
   * /etc/interchange/usertag directory for locally used global usertags added
@@ -7,7 +9,7 @@
   * query username and password for UI superuser account in the foundation
     catalog from the user via debconf
   
- -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu,  7 Feb 2002 11:23:41 +0100
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 13 Feb 2002 09:58:39 +0100
 
 interchange (4.8.3-1) unstable; urgency=low
 



2.6.2.6   +1 -1      interchange/debian/control


rev 2.6.2.6, prev_rev 2.6.2.5
Index: control
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/control,v
retrieving revision 2.6.2.5
retrieving revision 2.6.2.6
diff -u -r2.6.2.5 -r2.6.2.6
--- control	31 Jan 2002 18:22:56 -0000	2.6.2.5
+++ control	13 Feb 2002 09:16:03 -0000	2.6.2.6
@@ -38,7 +38,7 @@
 
 Package: libapache-mod-interchange
 Architecture: any
-Depends: ${shlibs:Depends}, apache-common (>= ${THISDEV}), apache-common (<< ${NEXTDEV}), interchange (>=4.8.1)
+Depends: ${shlibs:Depends}, apache-common (>= ${THISDEV}), 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



2.4.2.3   +2 -3      interchange/debian/rules


rev 2.4.2.3, prev_rev 2.4.2.2
Index: rules
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/rules,v
retrieving revision 2.4.2.2
retrieving revision 2.4.2.3
diff -u -r2.4.2.2 -r2.4.2.3
--- rules	1 Oct 2001 10:19:55 -0000	2.4.2.2
+++ rules	13 Feb 2002 09:16:03 -0000	2.4.2.3
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# Copyright 2000,2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+# Copyright 2000,2001,2002 by Stefan Hornburg (Racke) <racke@linuxia.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
 # (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/")
-NEXTVERNO := $(shell echo $(DEV_VERSION) | awk -F. '{OFS="."; $$NF = $$NF + 1; print}')
 
 build: build-stamp
 build-stamp:
@@ -143,7 +142,7 @@
 	dh_installdeb
 	dh_shlibdeps
 	dh_perl usr/lib/interchange
-	dh_gencontrol -- -VTHISDEV="$(DEV_VERSION)" -VNEXTDEV="$(NEXTVERNO)"
+	dh_gencontrol -- -VTHISDEV="$(DEV_VERSION)"
 	dh_md5sums
 	dh_builddeb