libgsf r1002 - trunk/debian

From: jdassen svn gnome org
To: svn-commits-list gnome org
Subject: libgsf r1002 - trunk/debian
Date: Sat, 30 Aug 2008 14:28:39 +0000 (UTC)
Author: jdassen
Date: Sat Aug 30 14:28:39 2008
New Revision: 1002
URL: http://svn.gnome.org/viewvc/libgsf?rev=1002&view=rev

Log:
Updated debianisation

Added:
   trunk/debian/clean
Modified:
   trunk/debian/changelog
   trunk/debian/compat
   trunk/debian/control
   trunk/debian/libgsf-bin.install
   trunk/debian/libgsf-gnome-1-dev.install
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sat Aug 30 14:28:39 2008
@@ -1,16 +1,38 @@
+libgsf (1.14.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/compat] Update to v7.
+  * [debian/clean] New.
+  * [debian/rules]
+    * Removed some cleanup that's now handled by debian/clean.
+    * Use "dh_prep" instead of "dh_clean -k".
+  * [debian/rules, debian/control]
+    * Enable gio support; bumped glib build and runtime dependencies
+      accordingly.
+    * Explicitly disable use of gnomevfs - use gio's implementation instead.
+    * Moved gtk-doc symlink from libgsf-gnome-1-dev to libgsf-1-dev.
+  * [debian/control]
+    * Fix dependencies of libgsf-1-114-dbg.
+    * Removed duplicate words.
+    * Updated debhelper build dependency.
+  * [debian/libgsf-bin.install] Add gsf-vba-dump manual page (new).
+  * [debian/libgsf-gnome-1-dev.install] Remove pattern that was not used.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Sat, 30 Aug 2008 16:19:49 +0200
+
 libgsf (1.14.8-1) unstable; urgency=low
 
-   * New upstream release.
-   * [debian/rules] No longer exclude win32.h on dh_install; upstream now only
-     tries to install it on win32 platforms.
-   * [debian/control]
-     * Bumped debhelper build dependency to match compatibility level
-       specified in debian/compat.
-     * Updated Standards-Version.
-   * [doc/gsf-office-thumbnailer.1, doc/gsf.1] Fixed lintian warnings:
-     corrected font reference and switched to .URL for hyperlinks.
-   * [debian/libgsf-1-dev.doc-base] Changed section to fit in the new section
-     hierarchy.
+  * New upstream release.
+  * [debian/rules] No longer exclude win32.h on dh_install; upstream now only
+    tries to install it on win32 platforms.
+  * [debian/control]
+    * Bumped debhelper build dependency to match compatibility level
+      specified in debian/compat.
+    * Updated Standards-Version.
+  * [doc/gsf-office-thumbnailer.1, doc/gsf.1] Fixed lintian warnings:
+    corrected font reference and switched to .URL for hyperlinks.
+  * [debian/libgsf-1-dev.doc-base] Changed section to fit in the new section
+    hierarchy.
 
  -- J.H.M. Dassen (Ray) <jdassen debian org>  Thu, 06 Mar 2008 07:57:05 +0100
 

Added: trunk/debian/clean
==============================================================================
--- (empty file)
+++ trunk/debian/clean	Sat Aug 30 14:28:39 2008
@@ -0,0 +1,5 @@
+build
+config.cache
+config.status
+doc/html/*.png
+doc/html/*.html

Modified: trunk/debian/compat
==============================================================================
--- trunk/debian/compat	(original)
+++ trunk/debian/compat	Sat Aug 30 14:28:39 2008
@@ -1 +1 @@
-4
+7

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Sat Aug 30 14:28:39 2008
@@ -2,11 +2,11 @@
 Section: libs
 Priority: optional
 Maintainer: J.H.M. Dassen (Ray) <jdassen debian org>
-Build-Depends: debhelper (>= 4), dh-buildinfo,
+Build-Depends: debhelper (>= 7.0.0), dh-buildinfo,
  gtk-doc-tools (>= 1.2-1.2),
- libglib2.0-dev (>= 2.8.0), libxml2-dev (>= 2.6.10-1),
+ libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1),
  libbonobo2-dev (>= 2.6.0-2), libgnomevfs2-dev (>= 2.6.1.1-3),
- libbz2-dev
+ libbz2-dev, libgvfscommon-dev
 Vcs-Svn: svn://svn.gnome.org/svn/libgsf/trunk
 Vcs-Browser: http://svn.gnome.org/viewcvs/libgsf/trunk/
 Standards-Version: 3.7.3
@@ -20,7 +20,7 @@
  This package contains the development files used in building applications
  that use the GNOME Structured File Library.
  .
- The GNOME Structured File Library library aims to provide an efficient
+ The GNOME Structured File Library aims to provide an efficient
  extensible I/O abstraction for dealing with different structured file
  formats. It is actively being developed and its API is still likely to
  undergo significant changes (in particular, extensions).
@@ -43,7 +43,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Structured File Library - runtime version for GNOME
- The GNOME Structured File Library library aims to provide an efficient
+ The GNOME Structured File Library aims to provide an efficient
  extensible I/O abstraction for dealing with different structured file
  formats.
  .
@@ -54,7 +54,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libgsf-1-114 (= ${Source-Version})
+Depends: libgsf-1-114 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Structured File Library - debugging files (basic version)
  This package contains the files for debugging (applications that use the)
  the core parts of the GNOME Structured File Library.
@@ -65,13 +65,14 @@
 Package: libgsf-1-dev
 Section: libdevel
 Architecture: any
-Depends: libgsf-1-114 (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libxml2-dev (>= 2.6.10-1), libbz2-dev
+Depends: libgsf-1-114 (= ${Source-Version}), libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1), libbz2-dev
+Replaces: libgsf-gnome-1-dev (<= 1.14.8-1)
 Recommends: pkg-config
 Description: Structured File Library - development files (basic version)
  This package contains the development files used in building applications
  that use the GNOME Structured File Library.
  .
- The GNOME Structured File Library library aims to provide an efficient
+ The GNOME Structured File Library aims to provide an efficient
  extensible I/O abstraction for dealing with different structured file
  formats. It is actively being developed and its API is still likely to
  undergo significant changes (in particular, extensions).
@@ -86,7 +87,7 @@
 Depends: libgsf-1-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gnumeric (<< 1.4.4)
 Description: Structured File Library - runtime version
- The GNOME Structured File Library library aims to provide an efficient
+ The GNOME Structured File Library aims to provide an efficient
  extensible I/O abstraction for dealing with different structured file
  formats.
  .
@@ -99,7 +100,7 @@
 Depends: ${misc:Depends}
 Replaces: libgsf-1 (<= 1.12.3-4)
 Description: Structured File Library - common files
- The GNOME Structured File Library library aims to provide an efficient
+ The GNOME Structured File Library aims to provide an efficient
  extensible I/O abstraction for dealing with different structured file
  formats.
  .
@@ -112,7 +113,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libgsf-1 (<= 1.12.3-3), libgsf-gnome-1 (<= 1.12.3-4)
 Description: Structured File Library - programs
- The GNOME Structured File Library library aims to provide an efficient
+ The GNOME Structured File Library aims to provide an efficient
  extensible I/O abstraction for dealing with different structured file
  formats.
  .

Modified: trunk/debian/libgsf-bin.install
==============================================================================
--- trunk/debian/libgsf-bin.install	(original)
+++ trunk/debian/libgsf-bin.install	Sat Aug 30 14:28:39 2008
@@ -3,4 +3,5 @@
 usr/bin/gsf-office-thumbnailer
 usr/bin/gsf-vba-dump
 usr/share/man/man1/gsf-office-thumbnailer.1
+usr/share/man/man1/gsf-vba-dump.1
 usr/share/man/man1/gsf.1

Modified: trunk/debian/libgsf-gnome-1-dev.install
==============================================================================
--- trunk/debian/libgsf-gnome-1-dev.install	(original)
+++ trunk/debian/libgsf-gnome-1-dev.install	Sat Aug 30 14:28:39 2008
@@ -1,5 +1,4 @@
 usr/include/libgsf*/gsf-gnome/*
-usr/include/libgsf*/gsf-gvfs/*
 usr/lib/libgsf-gnome*.a
 usr/lib/libgsf-gnome*.so
 usr/lib/pkgconfig/libgsf-gnome*.pc

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sat Aug 30 14:28:39 2008
@@ -67,7 +67,8 @@
 confflags +=	--enable-compile-warnings=maximum
 
 # Features
-confflags +=	--with-gnome --with-bz2 --enable-gtk-doc --without-python
+confflags +=	--with-gnome --with-bz2 --enable-gtk-doc --without-python \
+		--with-gio --without-gnome-vfs
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -92,6 +93,7 @@
 configure: config-stamp
 config-stamp:
 	dh_testdir
+	dh_prep
 
 	rm -rf build && mkdir build
 	# With current libtool (1.5.24-1), LDFLAGS ends up on the actual
@@ -117,12 +119,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f config-stamp build-stamp 
 
 	-$(MAKE) -C build distclean
 	rm -rf build
-	rm -f config.cache config.status
-	rm -f doc/html/*.png doc/html/*.html
 
 	-find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f
 
@@ -143,7 +142,6 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
@@ -199,9 +197,8 @@
 	# Unfortunately, "-s" overrides "-p" for dh_link messes things up.
 	env -u DH_OPTIONS dh_link -p$(p_libgsf_dbg) /usr/share/doc/$(p_libgsf)/ /usr/share/doc/$(p_libgsf_dbg)
 	env -u DH_OPTIONS dh_link -p$(p_libgsf_gnome_dbg) /usr/share/doc/$(p_libgsf)/ /usr/share/doc/$(p_libgsf_gnome_dbg)
-
 	# Make the documentation accessible through devhelp.
-	dh_link -s -p$(p_libgsf_dev) /usr/share/doc/$(p_libgsf_dev)/html/gsf/ /usr/share/gtk-doc/html/gsf
+	env -u DH_OPTIONS dh_link -p$(p_libgsf_dev) /usr/share/doc/$(p_libgsf_dev)/html/gsf/ /usr/share/gtk-doc/html/gsf
 endif
 	dh_installdocs
 	dh_installexamples
@@ -224,7 +221,7 @@
 #	dh_perl
 #	dh_python
 ifeq ($(DH_OPTIONS),-s)
-	dh_strip -s -v -N $(p_libgsf_dbg) -N $(p_libgsf_gnome_dbg)
+	dh_strip -s -v
 
 	# Unfortunately, "-s" overrides "-p" for dh_makeshlibs and by acting
 	# on all architecture-dependent packages we would get wrong shlibs
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]