GNOME.org
 

goffice r2030 - trunk/debian

Author: jdassen
Date: Fri Jan 18 11:55:55 2008
New Revision: 2030
URL: http://svn.gnome.org/viewvc/goffice?rev=2030&view=rev

Log:
Updated debianisation

Added:
   trunk/debian/libgoffice-dbg.dirs
      - copied unchanged from r2029, /trunk/debian/libgoffice-0-6-dbg.dirs
   trunk/debian/libgoffice-dbg.install
      - copied, changed from r2029, /trunk/debian/libgoffice-0-6-dbg.install
   trunk/debian/libgoffice-dbg.links
      - copied, changed from r2029, /trunk/debian/libgoffice-0-6-dbg.links
Removed:
   trunk/debian/dirs
   trunk/debian/libgoffice-0-6-dbg.dirs
   trunk/debian/libgoffice-0-6-dbg.install
   trunk/debian/libgoffice-0-6-dbg.links
Modified:
   trunk/debian/changelog
   trunk/debian/compat
   trunk/debian/control
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Fri Jan 18 11:55:55 2008
@@ -1,3 +1,23 @@
+goffice (0.6.1-2) unstable; urgency=medium
+
+  * [debian/rules]
+    * Build static library.
+    * Use variables for package names.
+    * Have the debug package be filled by dh_strip --dbg-package, debhelper
+      compatibility level 5 style.
+  * [debian/compat] Update to the current recommended version (5).
+  * [debian/control] Drop the version from the debug package name, as there is
+    only need for a debug package for the current version and this eases
+    gnome-dbg maintenance; added Conflicts and Replaces on the previous name
+    for smooth transition.
+  * [libgoffice-0-6-dbg.dirs, libgoffice-0-6-dbg.install,
+    libgoffice-0-6-dbg.links] Renamed and adjusted accordingly.
+  * [debian/dirs] Dropped.
+  * The debug package is now generated through dh_strip and has an unversioned
+    name. (Closes: #459604)
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Fri, 18 Jan 2008 12:24:05 +0100
+
 goffice (0.6.1-1) unstable; urgency=medium
 
   * New upstream stable release, needed for the forthcoming gnumeric 1.8

Modified: trunk/debian/compat
==============================================================================
--- trunk/debian/compat	(original)
+++ trunk/debian/compat	Fri Jan 18 11:55:55 2008
@@ -1 +1 @@
-4
+5

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Fri Jan 18 11:55:55 2008
@@ -19,11 +19,13 @@
  .
  These are the files needed when building applications that use GOffice.
 
-Package: libgoffice-0-6-dbg
+Package: libgoffice-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libgoffice-0-6 (= ${Source-Version})
+Conflicts: libgoffice-0-6-dbg
+Replaces: libgoffice-0-6-dbg
 Description: Document centric objects library - debugging files
  GOffice is a library of document centric objects and utilities building on
  top of GLib and Gtk+.

Copied: trunk/debian/libgoffice-dbg.install (from r2029, /trunk/debian/libgoffice-0-6-dbg.install)
==============================================================================
--- /trunk/debian/libgoffice-0-6-dbg.install	(original)
+++ trunk/debian/libgoffice-dbg.install	Fri Jan 18 11:55:55 2008
@@ -1 +1,2 @@
-usr/lib/debug/libgoffice*
+# Empty - dh_strip takes care of filling the dbg package now.
+#usr/lib/debug/libgoffice*

Copied: trunk/debian/libgoffice-dbg.links (from r2029, /trunk/debian/libgoffice-0-6-dbg.links)
==============================================================================
--- /trunk/debian/libgoffice-0-6-dbg.links	(original)
+++ trunk/debian/libgoffice-dbg.links	Fri Jan 18 11:55:55 2008
@@ -1 +1 @@
-/usr/share/doc/libgoffice-0-6	/usr/share/doc/libgoffice-0-6-dbg
+/usr/share/doc/libgoffice-0-6	/usr/share/doc/libgoffice-dbg

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Fri Jan 18 11:55:55 2008
@@ -18,6 +18,10 @@
 # need to change the periods in it). The debian/* files must match.
 baselibname=$(shell grep -i '^GOFFICE_API_VER=[0-9]' configure | sed -e 's/^.*=/libgoffice-/' -e s/\\./-/g)
 
+pruntime=$(baselibname)
+pdevel=$(baselibname)-dev
+pdbg=libgoffice-dbg
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -54,7 +58,7 @@
 	--prefix=/usr \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
-	--with-html-dir=\$${prefix}/share/doc/$(baselibname)-dev/html
+	--with-html-dir=\$${prefix}/share/doc/$(pdevel)/html
 
 # FHS locations
 confflags +=	--prefix=/usr \
@@ -68,7 +72,7 @@
                 --enable-compile-warnings=maximum
 
 # Features
-confflags +=    --with-cairo --enable-gtk-doc
+confflags +=    --enable-static --with-cairo --enable-gtk-doc
 
 source-updates:
 	# Update files/links generated by autotools
@@ -86,8 +90,8 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	if ! test -r debian/$(baselibname).install ; then \
-		echo "Packaging files are not set up for base library name $(baselibname). Aborting." ; \
+	if ! test -r debian/$(pruntime).install ; then \
+		echo "Packaging files are not set up for base library name $(pruntime). Aborting." ; \
 		exit 1 ; \
 	fi
 	
@@ -140,11 +144,11 @@
 	# Install the package into debian/tmp
 	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install 
 
-	# FIXME: where do we put the debug for the plugins?
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/debug
-	for l in `find $(CURDIR)/debian/tmp/usr/lib -name '*.so*'`; do \
-		cp -vdf $$l $(CURDIR)/debian/tmp/usr/lib/debug ; \
-	done
+#	# FIXME: where do we put the debug for the plugins?
+#	mkdir -p $(CURDIR)/debian/tmp/usr/lib/debug
+#	for l in `find $(CURDIR)/debian/tmp/usr/lib -name '*.so*'`; do \
+#		cp -vdf $$l $(CURDIR)/debian/tmp/usr/lib/debug ; \
+#	done
 
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libgoffice-*.la
 
@@ -159,11 +163,11 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 ifeq ($(DH_OPTIONS),-s)
-	rm -rvf $(CURDIR)/debian/$(baselibname)-dbg/usr/share/doc/$(baselibname)-dbg
+	rm -rvf $(CURDIR)/debian/$(pdbg)/usr/share/doc/$(pdbg)
 endif
-	dh_install --sourcedir=debian/tmp -X/usr/lib/debug
+	dh_install --sourcedir=debian/tmp
 ifeq ($(DH_OPTIONS),-s)
-	dh_install -p$(baselibname)-dbg --sourcedir=debian/tmp
+	dh_install -p$(pdbg) --sourcedir=debian/tmp
 endif
 
 #	dh_installdebconf -s
@@ -195,7 +199,7 @@
 	dh_scrollkeeper
 	dh_desktop
 ifeq ($(DH_OPTIONS),-s)
-	rm -rvf $(CURDIR)/debian/$(baselibname)-dbg/usr/share/doc/$(baselibname)-dbg
+	rm -rvf $(CURDIR)/debian/$(pdbg)/usr/share/doc/$(pdbg)
 endif
 	dh_link
 	dh_buildinfo
@@ -203,14 +207,14 @@
 #	dh_perl
 #	dh_python
 ifeq ($(DH_OPTIONS),-s)
-	dh_strip -v -Nlibgoffice-0-$(so_major_version)-dbg
+	dh_strip -v --dbg-package=$(pdbg)
 
         # Unfortunately, "-s" overrides "-p" for dh_makeshlibs and by acting
         # on all architecture-dependent packages we would get wrong shlibs
         # here, so we need to undo the "-s".
-	env -u DH_OPTIONS dh_makeshlibs -s -p$(baselibname) -V '$(baselibname) (>= $(upstreamversion))'
+	env -u DH_OPTIONS dh_makeshlibs -s -p$(pruntime) -V '$(pruntime) (>= $(upstreamversion))'
 
-	dh_shlibdeps -s -l debian/$(baselibname)/usr/lib/ -L $(baselibname)
+	dh_shlibdeps -s -l debian/$(pruntime)/usr/lib/ -L $(pruntime)
 endif
 	dh_fixperms
 	dh_installdeb
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]