[Mud-builder-commits] r182 - in trunk/packages: . patch

[keesj at garage.maemo.org]

Author: keesj
Date: 2007-05-17 09:26:33 +0300 (Thu, 17 May 2007)
New Revision: 182

Modified:
   trunk/packages/libwxgtk.xml
   trunk/packages/patch/libwxgtk.patch
Log:
added wxstc from the contrib to the default build


Modified: trunk/packages/libwxgtk.xml
===================================================================
--- trunk/packages/libwxgtk.xml	2007-05-15 20:17:02 UTC (rev 181)
+++ trunk/packages/libwxgtk.xml	2007-05-17 06:26:33 UTC (rev 182)
@@ -7,7 +7,7 @@
    </build>
    <deb>
       <icon>http://www.wxwidgets.org/favicon.ico</icon>
-      <description>Multi-platform GUI library\nwxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11, Motif, WinCE, and more  using one codebase. It can be used from languages such as C++, Python, Perl, and C#/.NET. Unlike other cross-platform toolkits, wxWidgets applications look and feel native. This is because wxWidgets uses the platform's own native controls rather than emulating them.</description>
+      <description>Multi-platform GUI library\nwxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11, Motif, WinCE, and more  using one codebase. It can be used from languages such as C++, Python, Perl, and C#/.NET. Unlike other cross-platform toolkits, wxWidgets applications look and feel native. This is because wxWidgets uses the platform's own native controls rather than emulating them. Maintainer note: also contains wxstc</description>
       <section>dev/libs</section>
    </deb>
 </package>

Modified: trunk/packages/patch/libwxgtk.patch
===================================================================
--- trunk/packages/patch/libwxgtk.patch	2007-05-15 20:17:02 UTC (rev 181)
+++ trunk/packages/patch/libwxgtk.patch	2007-05-17 06:26:33 UTC (rev 182)
@@ -1,22 +1,46 @@
-Index: debian/libwxgtk-dev.links
+Index: debian/rules
 ===================================================================
---- debian/libwxgtk-dev.links	(revision 0)
-+++ debian/libwxgtk-dev.links	(revision 0)
-@@ -0,0 +1 @@
-+/usr/lib/wx/config/gtk2-ansi-release-2.8 /usr/bin/wx-config 
-Index: debian/libwxgtk-dev.install
-===================================================================
---- debian/libwxgtk-dev.install	(revision 1)
-+++ debian/libwxgtk-dev.install	(working copy)
-@@ -1,3 +1,4 @@
-+usr/bin/wxrc*
- usr/include/*
- usr/lib/lib*.a
- usr/lib/lib*.so
-@@ -3,2 +4,6 @@
- usr/lib/pkgconfig/*
- usr/lib/*.la
-+usr/lib/wx/*
-+usr/lib/wx/config/*
-+usr/lib/wx/include/*
-+
+--- debian/rules	(revision 1)
++++ debian/rules	(working copy)
+@@ -39,7 +39,7 @@
+ config.status: configure
+ 	dh_testdir
+ 	# Add here commands to configure the package.
+-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
++	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-hildon
+ 
+ 
+ build: build-stamp
+@@ -76,6 +76,8 @@
+ 
+ 	# Add here commands to install the package into debian/tmp
+ 	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
++	cd contrib/ && $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
++	cd $(CURDIR)
+ 
+ 
+ # Build architecture-independent files here.
+@@ -86,10 +88,10 @@
+ binary-arch: build install
+ 	dh_testdir
+ 	dh_testroot
+-	dh_installchangelogs 
+-	dh_installdocs
+-	dh_installexamples
+-#	dh_install
++#	dh_installchangelogs 
++#	dh_installdocs
++#	dh_installexamples
++	dh_install --sourcedir=debian/tmp
+ #	dh_installmenu
+ #	dh_installdebconf	
+ #	dh_installlogrotate
+@@ -99,7 +101,7 @@
+ #	dh_installinit
+ #	dh_installcron
+ #	dh_installinfo
+-	dh_installman
++#	dh_installman
+ 	dh_link
+ 	dh_strip
+ 	dh_compress