libgsf r1048 - trunk/debian

[jdassen svn gnome org]

Author: jdassen
Date: Mon Apr  6 18:38:17 2009
New Revision: 1048
URL: http://svn.gnome.org/viewvc/libgsf?rev=1048&view=rev

Log:
Updated debianisation

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Mon Apr  6 18:38:17 2009
@@ -1,3 +1,16 @@
+libgsf (1.14.11-3) unstable; urgency=medium
+
+  * [debian/control]
+    * Dropped superfluous libgvfscommon-dev build dependency.
+    * Dropped -1 package revision from libxml2-dev build dependency.
+    * Updated section of the debug packages.
+    * Have all packages depend on ${misc:Depends}.
+    * Replaced deprecated ${Source-Version} by ${binary:Version}.
+    * Updated Standards-Version.
+  * [debian/rules] Don't ignore errors on make distclean.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Mon, 06 Apr 2009 20:28:58 +0200
+
 libgsf (1.14.11-2) unstable; urgency=high
 
   * [gsf/gsf-output-csv.c, ChangeLog] Backport fix for a code issue which
@@ -58,13 +71,6 @@
 
  -- J.H.M. Dassen (Ray) <jdassen debian org>  Sat, 30 Aug 2008 15:50:04 +0200
 
-libgsf (1.14.8-1lenny2) testing; urgency=high
-
-  * [gsf/gsf-output-csv.c, ChangeLog] Backport fix for a code issue which
-    caused FTBFS in some environments. (Closes: #513594)
-
- -- J.H.M. Dassen (Ray) <jdassen debian org>  Fri, 06 Feb 2009 20:01:27 +0100
-
 libgsf (1.14.8-1lenny1) testing; urgency=medium
 
    * Fix silent data corruption bug

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Mon Apr  6 18:38:17 2009
@@ -4,17 +4,17 @@
 Maintainer: J.H.M. Dassen (Ray) <jdassen debian org>
 Build-Depends: debhelper (>= 7.0.0), dh-buildinfo,
  gtk-doc-tools (>= 1.2-1.2),
- libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1),
+ libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10),
  libbonobo2-dev (>= 2.6.0-2), libgnomevfs2-dev (>= 2.6.1.1-3),
- libbz2-dev, zlib1g-dev, libgvfscommon-dev
+ libbz2-dev, zlib1g-dev
 Vcs-Svn: svn://svn.gnome.org/svn/libgsf/trunk
 Vcs-Browser: http://svn.gnome.org/viewcvs/libgsf/trunk/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 
 Package: libgsf-gnome-1-dev
 Section: libdevel
 Architecture: any
-Depends: libgsf-gnome-1-114 (= ${Source-Version}), libgsf-1-dev
+Depends: libgsf-gnome-1-114 (= ${binary:Version}), libgsf-1-dev, ${misc:Depends}
 Recommends: pkg-config
 Description: Structured File Library - development files for GNOME
  This package contains the development files used in building applications
@@ -29,10 +29,10 @@
  architecture and of GNOME-VFS, the GNOME virtual file-system.
 
 Package: libgsf-gnome-1-114-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
-Depends: libgsf-gnome-1-114 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgsf-gnome-1-114 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: libgsf-1-114-dbg
 Description: Structured File Library - debugging files for GNOME
  This package contains the files for debugging (applications that use the)
@@ -51,10 +51,10 @@
  architecture and of GNOME-VFS, the GNOME virtual file-system.
 
 Package: libgsf-1-114-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
-Depends: libgsf-1-114 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgsf-1-114 (= ${binary: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,7 +65,7 @@
 Package: libgsf-1-dev
 Section: libdevel
 Architecture: any
-Depends: libgsf-1-114 (= ${Source-Version}), libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1), libbz2-dev
+Depends: libgsf-1-114 (= ${binary:Version}), libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1), libbz2-dev, ${misc:Depends}
 Replaces: libgsf-gnome-1-dev (<= 1.14.8-1)
 Recommends: pkg-config
 Description: Structured File Library - development files (basic version)
@@ -84,7 +84,7 @@
 Package: libgsf-1-114
 Section: libs
 Architecture: any
-Depends: libgsf-1-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgsf-1-common (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gnumeric (<< 1.4.4)
 Description: Structured File Library - runtime version
  The GNOME Structured File Library aims to provide an efficient

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Mon Apr  6 18:38:17 2009
@@ -121,7 +121,9 @@
 	dh_testdir
 	dh_testroot
 
-	-$(MAKE) -C build distclean
+	if test -d build && test -f build/Makefile ; then \
+		$(MAKE) -C build distclean; \
+	fi
 	rm -rf build
 
 	-find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f