[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2007-01-31 14:38:50 GMT
Modified:  debian   Tag: STABLE_5_4-branch changelog rules
Log:
removed Business::UPS manual page to avoid conflicts with
libbusiness-ups-perl (Closes: #404022, thanks to Michael Ablassmeier
<abi at grinser.de> for the report)

Revision  Changes    Path
No                   revision



No                   revision



2.67.2.15 +4 -1      interchange/debian/changelog


rev 2.67.2.15, prev_rev 2.67.2.14
Index: changelog
===================================================================
RCS file: /var/cvs/interchange/debian/changelog,v
retrieving revision 2.67.2.14
retrieving revision 2.67.2.15
diff -u -r2.67.2.14 -r2.67.2.15
--- changelog	31 Jan 2007 11:23:44 -0000	2.67.2.14
+++ changelog	31 Jan 2007 14:38:49 -0000	2.67.2.15
@@ -9,13 +9,16 @@
     caused creation of a directory named 775 (Closes: #404391, thanks to
     Filippo Giunchedi <filippo at debian.org> for the report and the
     investigation)
+  * removed Business::UPS manual page to avoid conflicts with
+    libbusiness-ups-perl (Closes: #404022, thanks to Michael Ablassmeier
+    <abi at grinser.de> for the report)
   * preserve debug value in settings.cfg
   * updated Swedish translation of Debconf templates (Closes: #375916,
     thanks to Daniel Nylander <yeager at lidkoping.net>)
   * updated Czech translation of Debconf templates (Closes: #391541, thanks
     to Martin Sín <martin.sin at seznam.cz>)
 
- -- Stefan Hornburg (Racke) <racke at linuxia.de>  Wed, 31 Jan 2007 12:23:25 +0100
+ -- Stefan Hornburg (Racke) <racke at linuxia.de>  Wed, 31 Jan 2007 15:37:54 +0100
 
 interchange (5.4.1-1) unstable; urgency=low
 



2.29.2.2  +3 -1      interchange/debian/rules


rev 2.29.2.2, prev_rev 2.29.2.1
Index: rules
===================================================================
RCS file: /var/cvs/interchange/debian/rules,v
retrieving revision 2.29.2.1
retrieving revision 2.29.2.2
diff -u -r2.29.2.1 -r2.29.2.2
--- rules	15 May 2006 14:22:51 -0000	2.29.2.1
+++ rules	31 Jan 2007 14:38:50 -0000	2.29.2.2
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# Copyright 2000,2001,2002,2003,2005,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2000,2001,2002,2003,2005,2006,2007 by Stefan Hornburg (Racke) <racke at 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
@@ -125,6 +125,8 @@
 	rm $(TMP)/usr/lib/interchange/_session_storable
 	rm $(TMP)/usr/lib/interchange/_uid
 	rm -rf $(TMP)/usr/lib/interchange/auto/Interchange
+# remove Business::UPS manual page (conflicts with libbusiness-ups-perl)
+	rm $(TMP)/usr/share/man/man3/Business::UPS.3pm
 # install logrotate configuration file
 	install -m 0755 -d $(TMP)/etc/logrotate.d/
 	install -m 0644 debian/interchange.logrotate $(TMP)/etc/logrotate.d/interchange