goffice r2205 - trunk/debian

[jdassen svn gnome org]

Author: jdassen
Date: Sat Aug 30 14:48:46 2008
New Revision: 2205
URL: http://svn.gnome.org/viewvc/goffice?rev=2205&view=rev

Log:
Updated debianisation

Added:
   trunk/debian/clean
Modified:
   trunk/debian/changelog
   trunk/debian/compat
   trunk/debian/control
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sat Aug 30 14:48:46 2008
@@ -1,3 +1,21 @@
+goffice (0.7.1) experimental; urgency=low
+
+  * New upstream development release.
+  * [debian/control]
+    * Updated debhelper build dependency.
+    * Removed libart and libgsf-gnome build dependencies and
+      libgoffice-0-8-dev runtime dependencies as per configure.in changes.
+    * Updated libgsf build dependency as per configure.in .
+    * Brought libgoffice-0-8-dev runtime dependencies in sync with build
+      dependencies.
+  * [debian/compat] Updated to current debhelper compatibility level.
+  * [debian/clean] New.
+  * [debian/rules]
+    * Use "dh_prep" instead of "dh_clean -k".
+    * Removed some cleanup that's now handled by debian/clean.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Sat, 30 Aug 2008 16:34:52 +0200
+
 goffice (0.7.0-1) experimental; urgency=low
 
   * New upstream development release.

Added: trunk/debian/clean
==============================================================================
--- (empty file)
+++ trunk/debian/clean	Sat Aug 30 14:48:46 2008
@@ -0,0 +1,3 @@
+build
+config.cache
+config.status

Modified: trunk/debian/compat
==============================================================================
--- trunk/debian/compat	(original)
+++ trunk/debian/compat	Sat Aug 30 14:48:46 2008
@@ -1 +1 @@
-5
+7

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Sat Aug 30 14:48:46 2008
@@ -2,13 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: J.H.M. Dassen (Ray) <jdassen debian org>
-Build-Depends: debhelper (>= 4.2.21), dh-buildinfo,
+Build-Depends: debhelper (>= 7.0.0), dh-buildinfo,
  gtk-doc-tools (>= 1.4), libxml-parser-perl,
- libglib2.0-dev (>= 2.16.0), libgsf-1-dev (>= 1.14.0),
+ libglib2.0-dev (>= 2.16.0), libgsf-1-dev (>= 1.14.9),
  libxml2-dev (>= 2.6.10-2), libpango1.0-dev (>= 1.12.1-2),
  libgtk2.0-dev (>= 2.8.17), libglade2-dev (>= 1:2.4.0-1),
- libart-2.0-dev (>= 2.3.16-5), libgconf2-dev (>= 2.6.2-1),
- libgnomeui-dev (>= 2.14.1-1), libgsf-gnome-1-dev (>= 1.14.0),
+ libgconf2-dev (>= 2.6.2-1),
+ libgnomeui-dev (>= 2.14.1-1),
  libxrender-dev, libxext-dev, libcairo2-dev (>= 1.2.0)
 Vcs-Svn: svn://svn.gnome.org/svn/goffice/trunk
 Vcs-Browser: http://svn.gnome.org/viewcvs/goffice/trunk/
@@ -19,7 +19,7 @@
 Architecture: any
 Conflicts: libgoffice-0-dev (<< 0.4.2-2), libgoffice-0-5-dev
 Replaces: libgoffice-0-5-dev
-Depends: libgoffice-0-8 (= ${Source-Version}), libglib2.0-dev (>= 2.8.0), libgsf-gnome-1-dev (>= 1.14.0), libxml2-dev (>= 2.6.10-2), libgtk2.0-dev (>= 2.8.17), libglade2-dev (>= 1:2.4.0-1), libart-2.0-dev (>= 2.3.16-5), libgnomeui-dev (>= 2.14.1-1), libcairo2-dev
+Depends: libgoffice-0-8 (= ${Source-Version}), libglib2.0-dev (>= 2.16.0), libxml2-dev (>= 2.6.10-2), libgtk2.0-dev (>= 2.8.17), libglade2-dev (>= 1:2.4.0-1), libgnomeui-dev (>= 2.14.1-1), libcairo2-dev (>= 1.2.0)
 Description: Document centric objects library - runtime files
  GOffice is a library of document centric objects and utilities building on
  top of GLib and Gtk+.

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sat Aug 30 14:48:46 2008
@@ -85,11 +85,12 @@
 		install -p $$tf $$file && \
 		rm -f $$tf ; \
 	done
-	rm -rf autom4te.cache configure-stamp
+	rm -rf autom4te.cache config-stamp
 
-configure: configure-stamp
-configure-stamp:
+configure: config-stamp
+config-stamp:
 	dh_testdir
+	dh_prep
 	if ! test -r debian/$(pruntime).install ; then \
 		echo "Packaging files are not set up for base library name $(pruntime). Aborting." ; \
 		exit 1 ; \
@@ -101,10 +102,10 @@
 	rm -f goffice/goffice-paths.h
 	cd build && env "CC=$(CC) $(LDFLAGS)" ../configure $(confflags)
 
-	touch configure-stamp
+	touch config-stamp
 
 build: build-stamp
-build-stamp:  configure-stamp
+build-stamp:  config-stamp
 	dh_testdir
 
 	$(MAKE) -C build
@@ -114,11 +115,10 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f configure-stamp build-stamp
+	rm -f config-stamp build-stamp
 
 	-$(MAKE) -C build distclean
 	rm -rf build
-	rm -f config.cache config.status
 	-find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f
 
 	# Update config.{sub,guess} from autotools-dev, if possible.
@@ -138,7 +138,6 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
 	dh_installdirs
 
 	# Install the package into debian/tmp