[Pkg-mono-svn-commits] rev 2164 - non-group/muine/trunk/debian

[Dave Beckett]

Author: dajobe
Date: 2006-01-15 02:28:30 +0000 (Sun, 15 Jan 2006)
New Revision: 2164

Modified:
   non-group/muine/trunk/debian/changelog
   non-group/muine/trunk/debian/control
   non-group/muine/trunk/debian/muine-plugin-trayicon.install
   non-group/muine/trunk/debian/rules
Log:
Updates for muine 0.8.3-9

Modified: non-group/muine/trunk/debian/changelog
===================================================================
--- non-group/muine/trunk/debian/changelog	2006-01-15 01:11:59 UTC (rev 2163)
+++ non-group/muine/trunk/debian/changelog	2006-01-15 02:28:30 UTC (rev 2164)
@@ -1,3 +1,13 @@
+muine (0.8.3-9) unstable; urgency=low
+
+  * debian/control: Merge some build-depend changes from ubunty -
+    cli-common (>= 0.2.0) and removal of some old GTK#1 build depends.
+  * Use dh_shlibdeps and then dh_clideps -d to remove dups rather than a
+    sed edit. 
+  * *** NOT YET RELEASED ***
+
+ -- 
+
 muine (0.8.3-8) unstable; urgency=low
 
   * debian/control: Update to use libdbus-1-cil for D-Bus 0.60

Modified: non-group/muine/trunk/debian/control
===================================================================
--- non-group/muine/trunk/debian/control	2006-01-15 01:11:59 UTC (rev 2163)
+++ non-group/muine/trunk/debian/control	2006-01-15 02:28:30 UTC (rev 2164)
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>= 4.1.87), mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-gac, libgtk-cil (>= 1.0), libgconf-cil (>= 1.0), libgnome-cil (>= 1.0), libglade-cil (>= 1.0), libgtk2.0-dev (>= 2.4.0), libgdbm-dev (>= 1.8.0), libogg-dev (>= 1.0), libvorbis-dev (>= 1.0), libid3tag0-dev (>= 0.15.1b-3), libflac-dev (>= 1.1.2-1), autotools-dev, cdbs, libmono-dev (>= 1.1.6), libgconf2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.4.0), libgnome2-dev (>= 2.4.0), libgstreamer0.8-dev (>= 0.8.0), libgstreamer-gconf0.8-dev (>= 0.8.0), intltool, libgtk2.0-cil (>= 1.9.2), libgnome2.0-cil (>= 1.9.2), libglade2.0-cil (>= 1.9.2), libgconf2.0-cil (>= 1.9.2), libdbus-1-cil (>= 0.60), gnome-icon-theme (>= 2.8.0), cli-common (>= 0.1.3)
+Build-Depends: debhelper (>= 4.1.87), mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-gac, libgtk2.0-dev (>= 2.4.0), libgdbm-dev (>= 1.8.0), libogg-dev (>= 1.0), libvorbis-dev (>= 1.0), libid3tag0-dev (>= 0.15.1b-3), libflac-dev (>= 1.1.2-1), autotools-dev, cdbs, libmono-dev (>= 1.1.6), libgconf2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.4.0), libgnome2-dev (>= 2.4.0), libgstreamer0.8-dev (>= 0.8.0), libgstreamer-gconf0.8-dev (>= 0.8.0), intltool, libgtk2.0-cil (>= 1.9.2), libgnome2.0-cil (>= 1.9.2), libglade2.0-cil (>= 1.9.2), libgconf2.0-cil (>= 1.9.2), libdbus-1-cil (>= 0.60), gnome-icon-theme (>= 2.8.0), cli-common (>= 0.2.0)
 Standards-Version: 3.6.2
 
 Package: muine

Modified: non-group/muine/trunk/debian/muine-plugin-trayicon.install
===================================================================
--- non-group/muine/trunk/debian/muine-plugin-trayicon.install	2006-01-15 01:11:59 UTC (rev 2163)
+++ non-group/muine/trunk/debian/muine-plugin-trayicon.install	2006-01-15 02:28:30 UTC (rev 2164)
@@ -1,2 +1,2 @@
 plugins/TrayIcon.dll /usr/lib/muine/plugins/
-debian/TrayIcon.dll.config /usr/lib/muine/plugins/
\ No newline at end of file
+debian/TrayIcon.dll.config /usr/lib/muine/plugins/

Modified: non-group/muine/trunk/debian/rules
===================================================================
--- non-group/muine/trunk/debian/rules	2006-01-15 01:11:59 UTC (rev 2163)
+++ non-group/muine/trunk/debian/rules	2006-01-15 02:28:30 UTC (rev 2164)
@@ -19,9 +19,9 @@
 	rm debian/muine/usr/lib/muine/libmuine.a
 	rm debian/muine/usr/lib/muine/libmuine.la
 
+	dh_shlibdeps
 	dh_makeclilibs
-	dh_clideps
-	sed -e 's/ libglib2[^,]*,//' -e 's/ libgnomevfs2[^,]*,//' -e 's/ libgtk2.0[^,]*,//' debian/muine.substvars > debian/muine.substvars.new && mv debian/muine.substvars.new debian/muine.substvars
+	dh_clideps -d
 
 binary-post-install/muine::
 	chmod 644 debian/muine/usr/lib/muine/muine.exe
@@ -36,7 +36,8 @@
 #	rm -f data/muine.desktop data/muine.schemas
 	rm -f ./libtool src/AmazonSearchService.cs
 	rm -rf $(MONO_SHARED_DIR)/.wapi
-	rm -f  debian/muine.substvars.new
+	rm -f debian/muine.substvars.new
+	find . -name \*.mdb -print | xargs rm -f
 
 # cdbs leaves junk around after patching
 	if test -r config.guess.cdbs-orig ; then \