[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. upstream/0.3.2.1-20-g67112aa

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 10ca752ac5e3283ed4c493da8dbdae91cf19a016
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Thu Aug 13 18:25:31 2009 +0800

    Remove --enable-debug, and add tangerine-dbg
    
      + Add a debug package, tangerine-dbg
      + Add dh_{,cli}strip overrides to strip into tangerine-dbg

diff --git a/debian/changelog b/debian/changelog
index 7d9391d..4269c0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,10 +23,12 @@ tangerine (0.3.2.1-1) UNRELEASED; urgency=low
       - Drop libavahi1.0-cil, libmono-sqlite2.0-cil, cdbs
       - Add banshee, libmono-zeroconf1.0-cil, libndesk-dbus-glib1.0-cil
       - Use DH7
+    + Add a debug package, tangerine-dbg
   * debian/rules:
     + Rewrite to use DH7
     + Clean up get-orig-source rule
     + Add some custom configure flags
+    + Add dh_{,cli}strip overrides to strip into tangerine-dbg
   * debian/compat:
     + Bump to 7
   * debian/copyright:
@@ -34,7 +36,7 @@ tangerine (0.3.2.1-1) UNRELEASED; urgency=low
   * debian/tangerine*.1, debian/tangerine.manpages:
     + Added manpages for tangerine and tangerine-properties.
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 11 Aug 2009 11:02:44 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 13 Aug 2009 18:23:28 +0800
 
 tangerine (0.3.0+dfsg-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4389af6..19e53d2 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,23 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
 Suggests: banshee, beagle, rhythmbox
 Description: music server using DAAP
- This package contains a simple music sharing server that uses DAAP to share
- your music over the local network.
+ Tangerine is a simple music sharing server that uses DAAP to share your music
+ over the local network.
  .
  There are several clients that you can then use to connect to it, such as
  Apple's iTunes, Banshee, and Rhythmbox.
+
+Package: tangerine-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: tangerine (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends},
+         ${cli:Depends}
+Suggests: banshee, beagle, rhythmbox
+Description: music server using DAAP (debug symbols)
+ Tangerine is a simple music sharing server that uses DAAP to share your music
+ over the local network.
+ .
+ this package contains the debugging symbols for Tangerine.
diff --git a/debian/rules b/debian/rules
index 01a6789..70f131b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,11 +20,16 @@ get-orig-source:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--enable-release \
 		--enable-debug \
 		--enable-banshee \
 		--disable-beagle
 
+override_dh_strip:
+	dh_strip --dbg-package=tangerine-dbg
+
+override_dh_clistrip:
+	dh_clistrip --dbg-package=tangerine-dbg
+
 # disable dh_makeshlibs (problems with /usr/lib/tangerine/*.so*)
 override_dh_makeshlibs:
 
@@ -36,46 +41,3 @@ override_dh_auto_install:
 
 %:
 	dh $@
-
-# export MONO_SHARED_DIR=$(CURDIR)
-
-# include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# include /usr/share/cdbs/1/class/gnome.mk
-
-# DEB_DH_MAKESHLIBS_ARGS += -n
-# DEB_CONFIGURE_EXTRA_FLAGS += --disable-static MCS=/usr/bin/csc
-
-# CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"+" -f1)
-
-# common-configure-arch::
-# 	mkdir -p $(MONO_SHARED_DIR)/.wapi
-
-# common-binary-predeb-arch::
-# 	dh_clifixperms
-# 	dh_clideps -d
-
-# install/tangerine::
-# 	cp -v debian/tangerine.dll.config debian/tangerine/usr/lib/tangerine
-# 	cp -v debian/tangerine-session.dll.config debian/tangerine/usr/lib/tangerine
-# 	cp -v debian/Util.dll.config debian/tangerine/usr/lib/tangerine/plugins
-
-# clean::
-# 	rm -rf $(MONO_SHARED_DIR)/.wapi
-# 	find . -name '*.mdb' -delete
-
-# 	find . -name '*dll' -exec echo "This file has to be removed:" {} \; -exec exit 1 \; 
-
-# get-orig-source::
-# 	[ -d ../tarballs ] || mkdir ../tarballs
-# 	uscan \
-# 		--download-version $(CURVER) \
-# 		--force-download \
-# 		--no-symlink
-# 	tar zxvf ../tangerine-$(CURVER).tar.gz
-# 	find tangerine-$(CURVER)/ -name "*.dll" -delete
-# 	tar cf ../tangerine_$(CURVER)+dfsg.orig.tar tangerine-$(CURVER)/
-# 	gzip -9 ../tangerine_$(CURVER)+dfsg.orig.tar
-# 	mv ../*dfsg.orig.tar.gz ../tarballs
-# 	rm -rf tangerine-$(CURVER)*
-

-- 
tangerine