[maemo-commits] [maemo-commits] r18335 - projects/haf/branches/glib/glib-2-20/debian

Tue May 12 15:34:32 EEST 2009

Author: csaavedra
Date: 2009-05-12 15:34:25 +0300 (Tue, 12 May 2009)
New Revision: 18335

Removed:
   projects/haf/branches/glib/glib-2-20/debian/libgio-fam.install
   projects/haf/branches/glib/glib-2-20/debian/libglib2.0-udeb.install
Modified:
   projects/haf/branches/glib/glib-2-20/debian/changelog
   projects/haf/branches/glib/glib-2-20/debian/control.in
   projects/haf/branches/glib/glib-2-20/debian/rules
Log:
* Remove libgio-fam and udeb packages.



Modified: projects/haf/branches/glib/glib-2-20/debian/changelog
===================================================================

--- projects/haf/branches/glib/glib-2-20/debian/changelog	2009-05-12 12:17:53 UTC (rev 18334)
+++ projects/haf/branches/glib/glib-2-20/debian/changelog	2009-05-12 12:34:25 UTC (rev 18335)
@@ -11,8 +11,9 @@
     + 55-gsignal.patch, dropped.
   * 70_use-monotonic-clock-for-timeouts.patch: new patch.
     Fixes: NB#115307 (Glib should use monotonic clock for timeouts)
+  * Remove libgio-fam and udeb packages.
 
- -- Claudio Saavedra <csaavedra at igalia.com>  Tue, 12 May 2009 14:51:17 +0300
+ -- Claudio Saavedra <csaavedra at igalia.com>  Tue, 12 May 2009 15:13:54 +0300
 
 glib2.0 (2.20.1-1) unstable; urgency=low
 

Modified: projects/haf/branches/glib/glib-2-20/debian/control.in
===================================================================
--- projects/haf/branches/glib/glib-2-20/debian/control.in	2009-05-12 12:17:53 UTC (rev 18334)
+++ projects/haf/branches/glib/glib-2-20/debian/control.in	2009-05-12 12:34:25 UTC (rev 18335)
@@ -32,23 +32,6 @@
  .
  This package contains the shared libraries.
 
-Package: libglib at APIVER@-udeb
-Section: debian-installer
-XC-Package-Type: udeb
-Priority: optional
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: The GLib library of C routines - minimal runtime
- This is a udeb, or a microdeb, for the debian-installer.
- .
- GLib is a library containing many useful C routines for things such
- as trees, hashes, lists, and strings.  It is a useful general-purpose
- C library used by projects such as GTK+, GIMP, and GNOME.
- .
- This package contains the minimal runtime library needed by the Debian
- installer.
-
 Package: @DEV_PKG@
 Section: libdevel
 Architecture: any
@@ -117,11 +100,3 @@
  .
  This package contains the HTML documentation for the GLib library
  in /usr/share/doc/@DOC_PKG@/ .
-
-Package: libgio-fam
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: GLib Input, Output and Streaming Library (fam module)
- GIO is the input, output and streaming API of GLib. This package
- provides a fam file and directory monitoring backend for it.
- 

Deleted: projects/haf/branches/glib/glib-2-20/debian/libgio-fam.install
===================================================================
--- projects/haf/branches/glib/glib-2-20/debian/libgio-fam.install	2009-05-12 12:17:53 UTC (rev 18334)
+++ projects/haf/branches/glib/glib-2-20/debian/libgio-fam.install	2009-05-12 12:34:25 UTC (rev 18335)
@@ -1 +0,0 @@
-debian/install/deb/usr/lib/gio usr/lib

Deleted: projects/haf/branches/glib/glib-2-20/debian/libglib2.0-udeb.install
===================================================================
--- projects/haf/branches/glib/glib-2-20/debian/libglib2.0-udeb.install	2009-05-12 12:17:53 UTC (rev 18334)
+++ projects/haf/branches/glib/glib-2-20/debian/libglib2.0-udeb.install	2009-05-12 12:34:25 UTC (rev 18335)
@@ -1,2 +0,0 @@
-debian/install/udeb/usr/lib/lib*.so.* usr/lib
-debian/install/udeb/usr/share/locale usr/share

Modified: projects/haf/branches/glib/glib-2-20/debian/rules
===================================================================
--- projects/haf/branches/glib/glib-2-20/debian/rules	2009-05-12 12:17:53 UTC (rev 18334)
+++ projects/haf/branches/glib/glib-2-20/debian/rules	2009-05-12 12:34:25 UTC (rev 18335)
@@ -44,14 +44,13 @@
 SHARED_PKG := libglib$(APIVER)-$(SONAME)
 DATA_PKG := libglib$(APIVER)-data
 DEV_PKG := libglib$(APIVER)-dev
-UDEB_PKG := libglib$(APIVER)-udeb
 DOC_PKG := libglib$(APIVER)-doc
 DEBUG_PKG := $(SHARED_PKG)-dbg
 
 # list of flavors we build; each gets a builddir, a configure pass (configure
 # args are defined below), a build pass, and an install pass (in two steps)
 # Note: the "deb" flavor is required
-FLAVORS := deb udeb
+FLAVORS := deb
 
 # list of flavors to run the test suite on
 CHECK_FLAVORS := $(filter deb, $(FLAVORS))
@@ -91,8 +90,6 @@
 	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 deb_configure_flags := $(common_configure_flags) 
-udeb_configure_flags := $(common_configure_flags) \
-			--disable-selinux
 
 $(STAMP_DIR)/patch-stamp:
 	dh_testdir
@@ -163,7 +160,6 @@
 		-e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
 		-e "s#@DATA_PKG@#$(DATA_PKG)#g" \
 		-e "s#@DEV_PKG@#$(DEV_PKG)#g" \
-		-e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \
 		-e "s#@DOC_PKG@#$(DOC_PKG)#g" \
 		-e "s#@DEBUG_PKG@#$(DEBUG_PKG)#g" \
 		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
@@ -218,13 +214,12 @@
 		ChangeLog
 	dh_installdocs -s -N$(DEV_PKG) -N$(DEBUG_PKG) NEWS README
 	dh_link -s
-	dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG)
-	dh_strip -p$(UDEB_PKG)
+	dh_strip -s --dbg-package=$(DEBUG_PKG)
 	dh_compress -s -X.sgml -X.devhelp
 	dh_fixperms -s
 	dh_makeshlibs	-p$(SHARED_PKG) \
 			-V "$(SHARED_PKG) (>= $(SHVER))" \
-			--add-udeb="$(UDEB_PKG)" -- -c4
+			 -- -c4
 	dh_installdeb -s
 	# override shlibs for libraries from this source before computing
 	# dependencies of packages generated from this source; we already have


