[maemo-commits] [maemo-commits] r8565 - projects/haf/branches/pango1.0/1.8.1-1osso16/debian

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Dec 4 09:18:50 EET 2006 
Author: tpalli
Date: 2006-12-04 09:18:48 +0200 (Mon, 04 Dec 2006)
New Revision: 8565

Modified:
   projects/haf/branches/pango1.0/1.8.1-1osso16/debian/changelog
   projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control
   projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control.in
   projects/haf/branches/pango1.0/1.8.1-1osso16/debian/rules
Log:

fixes to debian package



Modified: projects/haf/branches/pango1.0/1.8.1-1osso16/debian/changelog
===================================================================
--- projects/haf/branches/pango1.0/1.8.1-1osso16/debian/changelog	2006-12-02 23:16:56 UTC (rev 8564)
+++ projects/haf/branches/pango1.0/1.8.1-1osso16/debian/changelog	2006-12-04 07:18:48 UTC (rev 8565)
@@ -1,3 +1,16 @@
+pango1.0 (1.8.1-1osso18) unstable; urgency=low
+
+  * take away self-dependency, don't build -udeb!
+
+ -- Tapani Palli <tapani.palli at nokia.com>  Thu, 30 Nov 2006 13:57:49 +0200
+
+pango1.0 (1.8.1-1osso17) unstable; urgency=low
+
+  * fix to _really_ have debug symbols ...
+  * Fixes: NB#35625 
+
+ -- Tapani Palli <tapani.palli at nokia.com>  Fri, 17 Nov 2006 15:55:21 +0200
+
 pango1.0 (1.8.1-1osso16) unstable; urgency=low
 
   * provide debug package containing only symbols (NOBITS)

Modified: projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control
===================================================================
--- projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control	2006-12-02 23:16:56 UTC (rev 8564)
+++ projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control	2006-12-04 07:18:48 UTC (rev 8565)
@@ -100,7 +100,7 @@
 Priority: extra
 Architecture: any
 Depends: libpango1.0-0 (= ${Source-Version})
-Description: The Pango library and debugging symbols
+Description: The Pango library debugging symbols
  Pango is a library for layout and rendering of text, with an emphasis
  on internationalization. Pango can be used anywhere that text layout is
  needed. however, most of the work on Pango-1.0 was done using the GTK+
@@ -114,12 +114,8 @@
   - Direct rendering of scalable fonts using the FreeType library
   - Native fonts on Microsoft backends
  .
- This package contains unstripped shared libraries. it is provided
- primarily to provide a backtrace with names in a debugger, this makes
- it somewhat easier to interpret core dumps. The libraries are installed
- in /usr/lib/debug and can be used by placing that directory in
- LD_LIBRARY_PATH.
- Most people will not need this package.
+ This debug package contains just the debug symbols for the library and
+ its use does NOT require LD_LIBRARY_PATH.
 
 Package: libpango1.0-doc
 Section: doc

Modified: projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control.in
===================================================================
--- projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control.in	2006-12-02 23:16:56 UTC (rev 8564)
+++ projects/haf/branches/pango1.0/1.8.1-1osso16/debian/control.in	2006-12-04 07:18:48 UTC (rev 8565)
@@ -25,28 +25,6 @@
  .
  This package contains the shared libraries.
 
-Package: libpango1.0-udeb
-Section: debian-installer
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}
-Provides: libpango1.0- at SONAME@
-Description: Layout and rendering of internationalized text
- This is a udeb, or a microdeb, for the debian-installer.
- .
- Pango is a library for layout and rendering of text, with an emphasis
- on internationalization. Pango can be used anywhere that text layout is
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the shared libraries.
-
 Package: libpango1.0-common
 Section: misc
 Architecture: any

Modified: projects/haf/branches/pango1.0/1.8.1-1osso16/debian/rules
===================================================================
--- projects/haf/branches/pango1.0/1.8.1-1osso16/debian/rules	2006-12-02 23:16:56 UTC (rev 8564)
+++ projects/haf/branches/pango1.0/1.8.1-1osso16/debian/rules	2006-12-04 07:18:48 UTC (rev 8565)
@@ -244,25 +244,9 @@
 	rm -f debian/libpango$(apiver)-udeb/etc/pango/pangox.aliases
 
 install: install-static install-shared
-	# for -dbg
-	#-rm -rf $(CURDIR)/debian/libpango$(apiver)-$(soname)/usr/lib/debug
-	#mkdir -p $(CURDIR)/debian/libpango$(apiver)-$(soname)/usr/lib/debug
-	#for l in `find $(CURDIR)/debian/libpango$(apiver)-$(soname)/usr/lib -name 'lib*.so*'`; do \
-		cp -vdf $$l \
-			$(CURDIR)/debian/libpango$(apiver)-$(soname)/usr/lib/debug/; \
-	done
-
-	# for defoma
-	#install -m 644 $(CURDIR)/debian/pango.defoma \
-		       $(CURDIR)/debian/libpango$(apiver)-common/usr/share/defoma/scripts
-	#install -m 644 $(CURDIR)/debian/defoma.conf \
-		       $(CURDIR)/debian/libpango$(apiver)-common/etc/defoma/config/pango.conf
-
 	# in debian/
 	install -m 755 $(CURDIR)/debian/update-pango-modules \
 		       $(CURDIR)/debian/libpango$(apiver)-common/usr/sbin/
-	#install -m 755 $(CURDIR)/debian/update-pangox-aliases \
-		       $(CURDIR)/debian/libpango$(apiver)-common/usr/sbin/
 
 	# clean the unnecessary files up
 	rm -rf debian/libpango$(apiver)-$(soname)/usr/share/gtk-doc
@@ -306,13 +290,11 @@
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: build install binary-arch-udeb
+binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 
 	dh_installdebconf -a
-	#dh_installdefoma -a
-	#dh_installdocs -a
 
 	rm -rf $(CURDIR)/debian/libpango$(apiver)-dbg/usr/share/doc/libpango$(apiver)-dbg
 	rm -rf $(CURDIR)/debian/libpango$(apiver)-dev/usr/share/doc/libpango$(apiver)-dev
@@ -331,7 +313,6 @@
 	dh_installman -a
 	dh_installinfo -a
 	dh_installchangelogs $(BUILD_DIR)/ChangeLog
-	#dh_strip -a -Nlibpango$(apiver)-dbg
 
 	dh_strip -a --dbg-package=libpango$(apiver)-$(soname)
 
@@ -342,6 +323,9 @@
 	dh_makeshlibs -plibpango$(apiver)-dev
 	dh_installdeb -a
 	dh_shlibdeps -l$(libpath) -a
+	sed -e 's/, libpango$(apiver)-$(soname) (>= [.0-9]*)//' $(CURDIR)/debian/libpango$(apiver)-$(soname).substvars > $(CURDIR)/debian/libpango$(apiver)-$(soname).substvars.new
+	mv $(CURDIR)/debian/libpango$(apiver)-$(soname).substvars.new \
+	   $(CURDIR)/debian/libpango$(apiver)-$(soname).substvars
 	cat debian/*/DEBIAN/shlibs > debian/shlibs.local
 	dh_gencontrol -a -Nlibpango$(apiver)-udeb
 	dh_md5sums -a -Nlibpango$(apiver)-udeb
@@ -367,5 +351,5 @@
 
 	dh_builddeb -plibpango$(apiver)-udeb --filename=$(udebname)
 
-binary: binary-indep binary-arch binary-arch-udeb
+binary: binary-indep binary-arch
 .PHONY: build build-shared build-static build-udeb clean binary-indep binary-arch binary-arch-udeb binary install install-shared install-static install-udeb configure configure-shared configure-static configure-udeb debian/control update-po debian/po/templates.pot
More information about the maemo-commits mailing list