[Pkg-mono-svn-commits] rev 1627 - libgdiplus/trunk/debian

Mirco Bauer meebey-guest@costa.debian.org
Sat, 16 Apr 2005 15:07:12 +0000


Author: meebey-guest
Date: 2005-04-16 15:07:12 +0000 (Sat, 16 Apr 2005)
New Revision: 1627

Modified:
   libgdiplus/trunk/debian/changelog
   libgdiplus/trunk/debian/control
   libgdiplus/trunk/debian/rules
Log:
- 1.1.5 update



Modified: libgdiplus/trunk/debian/changelog
===================================================================
--- libgdiplus/trunk/debian/changelog	2005-04-15 21:43:42 UTC (rev 1626)
+++ libgdiplus/trunk/debian/changelog	2005-04-16 15:07:12 UTC (rev 1627)
@@ -2,8 +2,9 @@
 
   * New upstream release
   * Mirco 'meebey' Bauer
-    + Added libglitz1-dev to Build-Depends
-    + Updated version of libcairo1-dev's build-dependency to >= 0.3.0.
+    + removed libcairo1-dev's build-dependency
+      (uses embedded cairo 0.3.0, required because of big API change in 0.4.0)
+    + added libglitz1-dev to Build-Conflicts (it does not like cairo 0.3.0).
 
  -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Sat,  9 Apr 2005 22:25:57 +0200
 

Modified: libgdiplus/trunk/debian/control
===================================================================
--- libgdiplus/trunk/debian/control	2005-04-15 21:43:42 UTC (rev 1626)
+++ libgdiplus/trunk/debian/control	2005-04-16 15:07:12 UTC (rev 1627)
@@ -2,7 +2,8 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade@debian.org>, Mirco Bauer <meebey@meebey.net>
-Build-Depends: debhelper (>= 4.0.0), libcairo1-dev (>= 0.3.0), libglib2.0-dev (>= 2.2.3), libmono-dev, libmono0 (>> 1.0), libpng12-dev, libjpeg62-dev, libtiff4-dev, libungif4-dev, libglitz1-dev
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.2.3), libmono-dev, libmono0 (>> 1.0), libpng12-dev, libjpeg62-dev, libtiff4-dev, libungif4-dev
+Build-Conflicts: libglitz1-dev
 Standards-Version: 3.6.0
 
 Package: libgdiplus

Modified: libgdiplus/trunk/debian/rules
===================================================================
--- libgdiplus/trunk/debian/rules	2005-04-15 21:43:42 UTC (rev 1626)
+++ libgdiplus/trunk/debian/rules	2005-04-16 15:07:12 UTC (rev 1627)
@@ -38,36 +38,22 @@
 	# 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 \
-	  --with-cairo=installed
+	  --with-cairo=included --without-glitz
 	perl -pe 's/-Werror//' -i src/Makefile
 
-
 build: build-stamp
-build-stamp:  config.status
+build-stamp: config.status
 	dh_testdir
-
-	# Add here commands to compile the package.
 	$(MAKE)
-
 	perl -e 's/cairo-/cairo = /' -i libgdiplus.pc
-
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp config.log
-
+	rm -f build-stamp config.log config.status
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-#	cp -f /usr/share/misc/config.sub config.sub
-#endif
-#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-#	cp -f /usr/share/misc/config.guess config.guess
-#endif
-
-
 	dh_clean 
 
 install: build
@@ -75,8 +61,6 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	dh_movefiles
 
@@ -92,22 +76,11 @@
 	dh_installdocs
 	dh_installexamples
 #	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps