[Pkg-voip-commits] r2386 - sofia-sip/trunk/debian

[Kai Vehmanen]

Author: kaiv-guest
Date: 2006-09-13 10:55:06 +0000 (Wed, 13 Sep 2006)
New Revision: 2386

Modified:
   sofia-sip/trunk/debian/TODO.Debian
   sofia-sip/trunk/debian/changelog
   sofia-sip/trunk/debian/rules
Log:
Reverted the patches for removing duplicated documentation as lintian complains about it. Added a new section on for pending tasks for next upstream release to TODO.Debian.

Modified: sofia-sip/trunk/debian/TODO.Debian
===================================================================
--- sofia-sip/trunk/debian/TODO.Debian	2006-09-13 07:59:42 UTC (rev 2385)
+++ sofia-sip/trunk/debian/TODO.Debian	2006-09-13 10:55:06 UTC (rev 2386)
@@ -1,39 +1,13 @@
+1) todo list for next upstream release (1.12.2) 
 
-1) Currently all the debs include the rather huge 
-   'usr/share/doc/libsofia-sip-ua0/changelog.gz' file, 
-   wasting some diskspace. This is not so bad for the
-   other packages, but it would be very important for 
-   libsofia-sip-ua0 to be as lightweight as possible. 
-   Ideally the changelog would only be in the docs package.
-   What is the clean cdbs rule to exclude this one file. Any ideas?
+   a) add to libsofia-sip-ua-dev.install:
 
-Comments by George Danchev:
+   +usr/share/sofia-sip/tag_dll.awk
+   +usr/share/sofia-sip/msg_parser.awk
+  
+   b) add to libsofia-sip-ua-dev-glib.install:
 
-   I don't see how libsofia-sip-ua0 would become more lightweight with 
-   the changes of Rémi Denis-Courmont ? Or am I missing something here ?
-   
-   Having a lightweight libsofia-sip-ua0 package is important for the
-   embedded systems, and it is good to cut it down as much as possible,
-   but keep in mind that we must provide debian/changelog.Debian.gz and
-   debian/copyright as regular files (not symlinks) as they are needed for:
+   usr/include/*/*/su_glib_source.h
 
-http://packages.debian.org/changelogs/pool/main/s/sofia-sip/sofia-sip_1.12.1.dfsg-1/changelog
-http://packages.debian.org/changelogs/pool/main/s/sofia-sip/sofia-sip_1.12.1.dfsg-1/libsofia-sip-ua0.copyright
-
-   (at least ??? )
-
-   I guess if an embedded system needs lightweight packages, then that 
-   should be done for all of the installed packages, i.e. removing /usr/share/doc
-   and /usr/share/man directories entirely (manually).
-   
-   Btw, the above changes (rm, ln on docs) do not work with debhelper compat 5 
-   (and build-depend on debhelper >=5 ), since the dh_install errors out 
-   if wildcards expand to nothing, which appears to be the case here.
-
-
-
-2) Add the two awk scripts to the distribution (under 
-   'usr/share/sofia-sip/'). The current upstream install 
-   the files to the wrong directory (under libexec), so better
-   wait for the next upstream release (1.12.2).
-
+   c) remove the custom rules for removing 'rfc*txt' from the
+      upstream tarball (not needed anymore)

Modified: sofia-sip/trunk/debian/changelog
===================================================================
--- sofia-sip/trunk/debian/changelog	2006-09-13 07:59:42 UTC (rev 2385)
+++ sofia-sip/trunk/debian/changelog	2006-09-13 10:55:06 UTC (rev 2386)
@@ -7,8 +7,6 @@
   * changelog: converted from ISO-8859-1 to UTF-8
 
   [ Rémi Denis-Courmont ]
-  * Removed duplicated documentation. Optional packages provide symlinks
-    to documentation installed by core libsofia-sip-ua0 package.
   * Added explicit dependency between libsofia-sip-ua-glib0 and libsofia-sip-ua0.
   
  -- Kilian Krause <kilian at debian.org>  Sun, 30 Jul 2006 19:29:35 +0000

Modified: sofia-sip/trunk/debian/rules
===================================================================
--- sofia-sip/trunk/debian/rules	2006-09-13 07:59:42 UTC (rev 2385)
+++ sofia-sip/trunk/debian/rules	2006-09-13 10:55:06 UTC (rev 2386)
@@ -23,22 +23,6 @@
 	rm -f libsofia-sip-ua/soa/soa_tag_ref.c
 	rm -f libsofia-sip-ua/nua/nua_tag_ref.c
 
-binary-post-install/sofia-sip-bin::
-	rm -Rf debian/sofia-sip-bin/usr/share/doc/sofia-sip-bin
-	cd debian/sofia-sip-bin/usr/share/doc && ln -sf libsofia-sip-ua0 sofia-sip-bin
-
-binary-post-install/libsofia-sip-ua-dev::
-	rm -Rf debian/libsofia-sip-ua-dev/usr/share/doc/libsofia-sip-ua-dev
-	cd debian/libsofia-sip-ua-dev/usr/share/doc && ln -sf libsofia-sip-ua0 libsofia-sip-ua-dev
-
-binary-post-install/libsofia-sip-ua-glib0::
-	rm -Rf debian/libsofia-sip-ua-glib0/usr/share/doc/libsofia-sip-ua-glib0
-	cd debian/libsofia-sip-ua-glib0/usr/share/doc && ln -sf libsofia-sip-ua0 libsofia-sip-ua-glib0
-
-binary-post-install/libsofia-sip-ua-glib-dev::
-	rm -Rf debian/libsofia-sip-ua-glib-dev/usr/share/doc/libsofia-sip-ua-glib-dev
-	cd debian/libsofia-sip-ua-glib-dev/usr/share/doc && ln -sf libsofia-sip-ua-glib0 libsofia-sip-ua-glib-dev
-
 # The following is for internal development usage only
 # Update that sum when new releases occur, this
 # catches silent file content forges at the server side
@@ -76,7 +60,7 @@
 	else \
 		echo "Upstream filename md5sum is trusted!" ; \
 	fi
-	
+
 	@@echo Removing non dfsg compliant parts out of it
 	@@[ -d ../tarballs/dfsg/. ]||mkdir -p ../tarballs/dfsg
 	@@tar -xzf ../tarballs/$(DEFILE) -C ../tarballs/dfsg