[Pkg-voip-commits] r4546 - in /sofia-sip/trunk/debian: changelog rules

[kaiv-guest at alioth.debian.org]

Author: kaiv-guest
Date: Fri Sep 21 16:22:45 2007
New Revision: 4546

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4546
Log:
Various bugfixes to sofia-sip rules file, including a potential fix to #442732.

Modified:
    sofia-sip/trunk/debian/changelog
    sofia-sip/trunk/debian/rules

Modified: sofia-sip/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/sofia-sip/trunk/debian/changelog?rev=4546&op=diff
==============================================================================
--- sofia-sip/trunk/debian/changelog (original)
+++ sofia-sip/trunk/debian/changelog Fri Sep 21 16:22:45 2007
@@ -1,7 +1,16 @@
 sofia-sip (1.12.6-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-
+  [ Kai Vehmanen ]
+  * Set DEB_* variables after including CDBS macros, not before.
+  * The "--as-needed" linked option is now explicitly disabled (was
+    enabled before, but didn't work as it was in the wrong place).
+  * To fix buf #424081, CDBS clean target was set to "clean". See
+    http://www.bononia.it/~zack/blog/posts/2007/09/clean_distclean.html.
+  * Another fix related to #424081: remove the doxygen output directories
+    in clean target. In upstream, the doxygen targets are not run
+    by default, so also the cleaning has to be done separately.
+  
  -- Kilian Krause <kilian at debian.org>  Fri, 18 May 2007 21:38:58 +0200
 
 sofia-sip (1.12.6-1) unstable; urgency=low

Modified: sofia-sip/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/sofia-sip/trunk/debian/rules?rev=4546&op=diff
==============================================================================
--- sofia-sip/trunk/debian/rules (original)
+++ sofia-sip/trunk/debian/rules Fri Sep 21 16:22:45 2007
@@ -1,23 +1,24 @@
 #!/usr/bin/make -f
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs,--as-needed"
-DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_INSTALL_DOCS_sofia-sip-doc          := libsofia-sip-ua/docs/html
+# not used:
+#DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs,--as-needed"
+
+DEB_MAKE_CLEAN_TARGET 		= clean
+DEB_DH_INSTALL_SOURCEDIR 	= debian/tmp
+DEB_INSTALL_DOCS_sofia-sip-doc  := libsofia-sip-ua/docs/html
 
 common-build-indep::
 	$(MAKE) doxygen
 
 common-binary-post-install-arch:: list-missing
 
-cleanbuilddir/sofia-sip::
-	rm -f libsofia-sip-ua/nta/nta_tag_ref.c
-	rm -f libsofia-sip-ua/soa/soa_tag_ref.c
-	rm -f libsofia-sip-ua/nua/nua_tag_ref.c
+clean::
+	rm -Rf libsofia-sip-ua/docs/html
+	rm -Rf libsofia-sip-ua-glib/docs/html
 
 # The following is for internal development usage only
 # Update that sum when new releases occur, this