r11436 - in /packages/unstable/nemiver/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Jun 10 14:21:17 UTC 2007
Author: joss
Date: Sun Jun 10 14:21:17 2007
New Revision: 11436
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11436
Log:
* Correctly install the gconf schemas.
* Use patchsys-quilt snippet; build-depend on quilt.
* 01_convenience-libs_PIC.patch: pass -fPIC -DPIC to all convenience
libs.
* 02_libnemivercommon_private.patch: move libnemivercommon, which is a
private library, to a private directory.
* 03_modules_libnemivercommon.patch: correctly link modules with
libnemivercommon to avoid undefined symbols.
* 70_relibtoolize.patch: re-run the autotool suite after these
patches.
* 04_nemiveruicommon_lutil.patch: pass -lutil, as required, to
libnemiveruicommon.
Added:
packages/unstable/nemiver/debian/patches/01_convenience-libs_PIC.patch
packages/unstable/nemiver/debian/patches/02_libnemivercommon_private.patch
packages/unstable/nemiver/debian/patches/03_modules_libnemivercommon.patch
packages/unstable/nemiver/debian/patches/04_nemiveruicommon_lutil.patch
packages/unstable/nemiver/debian/patches/70_relibtoolize.patch
packages/unstable/nemiver/debian/patches/series
Modified:
packages/unstable/nemiver/debian/changelog
packages/unstable/nemiver/debian/control
packages/unstable/nemiver/debian/control.in
packages/unstable/nemiver/debian/nemiver.install
packages/unstable/nemiver/debian/rules
Modified: packages/unstable/nemiver/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/changelog?rev=11436&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/changelog (original)
+++ packages/unstable/nemiver/debian/changelog Sun Jun 10 14:21:17 2007
@@ -17,16 +17,24 @@
* Pass --no-act to dh_makeshlibs to avoid generating a shlibs file.
* Really use ${binary:Version} for nemiver-dbg.
* Really clean .a and .la files.
+ * Correctly install the gconf schemas.
* rules: pass -z defs and --as-needed to ld to strip useless
dependencies.
- * Use simple-patchsys snippet.
+ * Use patchsys-quilt snippet; build-depend on quilt.
* 99_ltmain_as-needed.patch: our standard patch to ltmain.sh to make
--as-needed work with shared objects.
- * Document why --with-pic is here.
- * Move libnemivercommon, which is a private library, to a private
- directory and pass a rpath globally.
+ * 01_convenience-libs_PIC.patch: pass -fPIC -DPIC to all convenience
+ libs.
+ * 02_libnemivercommon_private.patch: move libnemivercommon, which is a
+ private library, to a private directory.
+ * 03_modules_libnemivercommon.patch: correctly link modules with
+ libnemivercommon to avoid undefined symbols.
+ * 70_relibtoolize.patch: re-run the autotool suite after these
+ patches.
+ * 04_nemiveruicommon_lutil.patch: pass -lutil, as required, to
+ libnemiveruicommon.
- -- Josselin Mouette <joss at debian.org> Sun, 10 Jun 2007 14:11:50 +0200
+ -- Josselin Mouette <joss at debian.org> Sun, 10 Jun 2007 15:55:48 +0200
nemiver (0.4.0~svnr486-0.2) unstable; urgency=low
Modified: packages/unstable/nemiver/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/control?rev=11436&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/control (original)
+++ packages/unstable/nemiver/debian/control Sun Jun 10 14:21:17 2007
@@ -5,6 +5,7 @@
Priority: optional
Build-Depends: debhelper (>= 5.0.40),
cdbs (>= 0.4.47),
+ quilt,
libboost-dev,
libboost-test-dev,
libxml2-dev,
Modified: packages/unstable/nemiver/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/control.in?rev=11436&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/control.in (original)
+++ packages/unstable/nemiver/debian/control.in Sun Jun 10 14:21:17 2007
@@ -5,6 +5,7 @@
Priority: optional
Build-Depends: debhelper (>= 5.0.40),
cdbs (>= 0.4.47),
+ quilt,
libboost-dev,
libboost-test-dev,
libxml2-dev,
Modified: packages/unstable/nemiver/debian/nemiver.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/nemiver.install?rev=11436&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/nemiver.install (original)
+++ packages/unstable/nemiver/debian/nemiver.install Sun Jun 10 14:21:17 2007
@@ -3,5 +3,5 @@
debian/tmp/usr/lib/nemiver/config
debian/tmp/usr/lib/nemiver/modules/*.so
debian/tmp/usr/lib/nemiver/plugins
-debian/tmp/usr/lib/libnemivercommon.so.* /usr/lib/nemiver
+debian/tmp/usr/lib/nemiver/*.so
debian/tmp/usr/bin/nemiver
Added: packages/unstable/nemiver/debian/patches/01_convenience-libs_PIC.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/patches/01_convenience-libs_PIC.patch?rev=11436&op=file
==============================================================================
--- packages/unstable/nemiver/debian/patches/01_convenience-libs_PIC.patch (added)
+++ packages/unstable/nemiver/debian/patches/01_convenience-libs_PIC.patch Sun Jun 10 14:21:17 2007
@@ -1,0 +1,33 @@
+Index: nemiver-0.4.0/src/dbgengine/Makefile.am
+===================================================================
+--- nemiver-0.4.0.orig/src/dbgengine/Makefile.am 2007-06-10 14:36:36.692797809 +0200
++++ nemiver-0.4.0/src/dbgengine/Makefile.am 2007-06-10 14:39:28.422584132 +0200
+@@ -32,6 +32,8 @@
+ nmv-gdbmi-parser.cc \
+ nmv-gdbmi-parser.h
+
++libgdbmiparser_la_CFLAGS=-fPIC -DPIC
++
+ libcpptraitmod_la_SOURCES= \
+ $(ilangtraitheaders) \
+ nmv-cpp-trait.cc
+@@ -40,6 +42,7 @@
+ nmv-dbg-common.cc \
+ nmv-dbg-common.h
+
++libdbgcommon_la_CFLAGS=-fPIC -DPIC
+
+ publicheaders_DATA=$(dynmodheaders)
+ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
+Index: nemiver-0.4.0/src/uicommon/Makefile.am
+===================================================================
+--- nemiver-0.4.0.orig/src/uicommon/Makefile.am 2007-06-10 14:35:27.568858661 +0200
++++ nemiver-0.4.0/src/uicommon/Makefile.am 2007-06-10 14:40:37.794537415 +0200
+@@ -20,6 +20,7 @@
+ nmv-source-editor.h
+
+ libnemiveruicommon_la_LIBADD= @NEMIVERUICOMMON_LIBS@
++libnemiveruicommon_la_CFLAGS= -fPIC -DPIC
+
+ INCLUDES=@NEMIVERUICOMMON_CFLAGS@ \
+ -I$(top_srcdir) \
Added: packages/unstable/nemiver/debian/patches/02_libnemivercommon_private.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/patches/02_libnemivercommon_private.patch?rev=11436&op=file
==============================================================================
--- packages/unstable/nemiver/debian/patches/02_libnemivercommon_private.patch (added)
+++ packages/unstable/nemiver/debian/patches/02_libnemivercommon_private.patch Sun Jun 10 14:21:17 2007
@@ -1,0 +1,21 @@
+Index: nemiver-0.4.0/src/common/Makefile.am
+===================================================================
+--- nemiver-0.4.0.orig/src/common/Makefile.am 2007-06-10 15:36:07.372279237 +0200
++++ nemiver-0.4.0/src/common/Makefile.am 2007-06-10 16:06:49.561259604 +0200
+@@ -1,4 +1,5 @@
+-lib_LTLIBRARIES=libnemivercommon.la
++nemivercommon_LTLIBRARIES=libnemivercommon.la
++nemivercommondir=$(libdir)/nemiver
+
+ headers= \
+ nmv-api-macros.h \
+@@ -63,7 +64,8 @@
+
+ publicheaders_DATA=$(headers)
+ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/common
+-libnemivercommon_la_LDFLAGS=@NEMIVERCOMMON_LIBS@ -lutil
++libnemivercommon_la_LDFLAGS=@NEMIVERCOMMON_LIBS@ -lutil \
++ -avoid-version -rpath $(libdir)/nemiver
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libnemivercommon.pc
Added: packages/unstable/nemiver/debian/patches/03_modules_libnemivercommon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/patches/03_modules_libnemivercommon.patch?rev=11436&op=file
==============================================================================
--- packages/unstable/nemiver/debian/patches/03_modules_libnemivercommon.patch (added)
+++ packages/unstable/nemiver/debian/patches/03_modules_libnemivercommon.patch Sun Jun 10 14:21:17 2007
@@ -1,0 +1,54 @@
+Index: nemiver-0.4.0/src/confmgr/Makefile.am
+===================================================================
+--- nemiver-0.4.0.orig/src/confmgr/Makefile.am 2007-06-10 15:04:21.047643987 +0200
++++ nemiver-0.4.0/src/confmgr/Makefile.am 2007-06-10 15:05:41.460226439 +0200
+@@ -10,7 +10,9 @@
+ publicheaders_DATA=$(headers)
+ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
+
+-libgconfmgrmod_la_LDFLAGS=@NEMIVERCOMMON_LIBS@ @GCONF_LIBS@ -module -avoid-version
++libgconfmgrmod_la_LDFLAGS=-module -avoid-version
++libgconfmgrmod_la_LIBADD=@NEMIVERCOMMON_LIBS@ @GCONF_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
+
+ config_DATA=gconfmgr.conf
+ configdir=@NEMIVER_SYSTEM_CONFIG_DIR@
+Index: nemiver-0.4.0/src/dbgengine/Makefile.am
+===================================================================
+--- nemiver-0.4.0.orig/src/dbgengine/Makefile.am 2007-06-10 14:58:00.457955416 +0200
++++ nemiver-0.4.0/src/dbgengine/Makefile.am 2007-06-10 15:03:56.830263917 +0200
+@@ -48,13 +48,16 @@
+ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
+
+ libgdbmod_la_LDFLAGS=-module -avoid-version
+-libgdbmod_la_LIBADD=libdbgcommon.la libgdbmiparser.la @NEMIVERCOMMON_LIBS@
++libgdbmod_la_LIBADD=libdbgcommon.la libgdbmiparser.la @NEMIVERCOMMON_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
+
+ libvarlistmod_la_LDFLAGS=-module -avoid-version
+-libvarlistmod_la_LIBADD=@NEMIVERCOMMON_LIBS@
++libvarlistmod_la_LIBADD=@NEMIVERCOMMON_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
+
+ libcpptraitmod_la_LDFLAGS=-module -avoid-version
+-libcpptraitmod_la_LIBADD=@NEMIVERCOMMON_LIBS@
++libcpptraitmod_la_LIBADD=@NEMIVERCOMMON_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
+
+ libgdbmiparser_la_LIBADD= \
+ @NEMIVERCOMMON_LIBS@ \
+Index: nemiver-0.4.0/src/workbench/Makefile.am
+===================================================================
+--- nemiver-0.4.0.orig/src/workbench/Makefile.am 2007-06-10 15:06:38.203460051 +0200
++++ nemiver-0.4.0/src/workbench/Makefile.am 2007-06-10 15:07:11.089334110 +0200
+@@ -26,7 +26,9 @@
+ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
+
+ libworkbenchmod_la_LDFLAGS=-module -avoid-version
+-libworkbenchmod_la_LIBADD=@NEMIVERWORKBENCH_LIBS@ $(top_builddir)/src/uicommon/libnemiveruicommon.la
++libworkbenchmod_la_LIBADD=@NEMIVERWORKBENCH_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la \
++ $(top_builddir)/src/uicommon/libnemiveruicommon.la
+
+ config_DATA=workbench.conf
+ configdir=@NEMIVER_SYSTEM_CONFIG_DIR@
Added: packages/unstable/nemiver/debian/patches/04_nemiveruicommon_lutil.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/patches/04_nemiveruicommon_lutil.patch?rev=11436&op=file
==============================================================================
--- packages/unstable/nemiver/debian/patches/04_nemiveruicommon_lutil.patch (added)
+++ packages/unstable/nemiver/debian/patches/04_nemiveruicommon_lutil.patch Sun Jun 10 14:21:17 2007
@@ -1,0 +1,13 @@
+Index: nemiver-0.4.0/src/uicommon/Makefile.am
+===================================================================
+--- nemiver-0.4.0.orig/src/uicommon/Makefile.am 2007-06-10 15:54:24.526802510 +0200
++++ nemiver-0.4.0/src/uicommon/Makefile.am 2007-06-10 15:54:47.588116699 +0200
+@@ -19,7 +19,7 @@
+ nmv-source-editor.cc \
+ nmv-source-editor.h
+
+-libnemiveruicommon_la_LIBADD= @NEMIVERUICOMMON_LIBS@
++libnemiveruicommon_la_LIBADD= @NEMIVERUICOMMON_LIBS@ -lutil
+ libnemiveruicommon_la_CFLAGS= -fPIC -DPIC
+
+ INCLUDES=@NEMIVERUICOMMON_CFLAGS@ \
Added: packages/unstable/nemiver/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/patches/70_relibtoolize.patch?rev=11436&op=file
==============================================================================
--- packages/unstable/nemiver/debian/patches/70_relibtoolize.patch (added)
+++ packages/unstable/nemiver/debian/patches/70_relibtoolize.patch Sun Jun 10 14:21:17 2007
@@ -1,0 +1,480 @@
+Index: nemiver-0.4.0/compile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ nemiver-0.4.0/compile 2007-06-10 16:07:19.594971127 +0200
+@@ -0,0 +1,142 @@
++#! /bin/sh
++# Wrapper for compilers which do not understand `-c -o'.
++
++scriptversion=2005-05-14.22
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Written by Tom Tromey <tromey at cygnus.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand `-c -o'.
++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file `INSTALL'.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v | --v*)
++ echo "compile $scriptversion"
++ exit $?
++ ;;
++esac
++
++ofile=
++cfile=
++eat=
++
++for arg
++do
++ if test -n "$eat"; then
++ eat=
++ else
++ case $1 in
++ -o)
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we strip `-o arg' only if arg is an object.
++ eat=1
++ case $2 in
++ *.o | *.obj)
++ ofile=$2
++ ;;
++ *)
++ set x "$@" -o "$2"
++ shift
++ ;;
++ esac
++ ;;
++ *.c)
++ cfile=$1
++ set x "$@" "$1"
++ shift
++ ;;
++ *)
++ set x "$@" "$1"
++ shift
++ ;;
++ esac
++ fi
++ shift
++done
++
++if test -z "$ofile" || test -z "$cfile"; then
++ # If no `-o' option was seen then we might have been invoked from a
++ # pattern rule where we don't need one. That is ok -- this is a
++ # normal compilation that the losing compiler can handle. If no
++ # `.c' file was seen then we are probably linking. That is also
++ # ok.
++ exec "$@"
++fi
++
++# Name of file we expect compiler to create.
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++
++# Create the lock directory.
++# Note: use `[/.-]' here to ensure that we don't use the same name
++# that we are using for the .o file. Also, base the name on the expected
++# object file name, since that is what matters with a parallel build.
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
++while true; do
++ if mkdir "$lockdir" >/dev/null 2>&1; then
++ break
++ fi
++ sleep 1
++done
++# FIXME: race condition here if user kills between mkdir and trap.
++trap "rmdir '$lockdir'; exit 1" 1 2 15
++
++# Run the compile.
++"$@"
++ret=$?
++
++if test -f "$cofile"; then
++ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
++fi
++
++rmdir "$lockdir"
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+Index: nemiver-0.4.0/Makefile.in
+===================================================================
+--- nemiver-0.4.0.orig/Makefile.in 2007-06-10 16:02:20.841946163 +0200
++++ nemiver-0.4.0/Makefile.in 2007-06-10 16:07:20.579027206 +0200
+@@ -40,8 +40,8 @@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+- TODO config.guess config.sub depcomp install-sh ltmain.sh \
+- missing mkinstalldirs
++ TODO compile config.guess config.sub depcomp install-sh \
++ ltmain.sh missing mkinstalldirs
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
+Index: nemiver-0.4.0/src/common/Makefile.in
+===================================================================
+--- nemiver-0.4.0.orig/src/common/Makefile.in 2007-06-10 16:02:20.821945023 +0200
++++ nemiver-0.4.0/src/common/Makefile.in 2007-06-10 16:07:17.410846661 +0200
+@@ -58,10 +58,10 @@
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(publicheadersdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
++am__installdirs = "$(DESTDIR)$(nemivercommondir)" \
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(publicheadersdir)"
++nemivercommonLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(nemivercommon_LTLIBRARIES)
+ libnemivercommon_la_LIBADD =
+ am__objects_1 =
+ am_libnemivercommon_la_OBJECTS = $(am__objects_1) nmv-ustring.lo \
+@@ -327,7 +327,8 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-lib_LTLIBRARIES = libnemivercommon.la
++nemivercommon_LTLIBRARIES = libnemivercommon.la
++nemivercommondir = $(libdir)/nemiver
+ headers = \
+ nmv-api-macros.h \
+ nmv-namespace.h \
+@@ -391,7 +392,9 @@
+
+ publicheaders_DATA = $(headers)
+ publicheadersdir = $(NEMIVER_INCLUDE_DIR)/common
+-libnemivercommon_la_LDFLAGS = @NEMIVERCOMMON_LIBS@ -lutil
++libnemivercommon_la_LDFLAGS = @NEMIVERCOMMON_LIBS@ -lutil \
++ -avoid-version -rpath $(libdir)/nemiver
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libnemivercommon.pc
+ INCLUDES = @NEMIVERCOMMON_CFLAGS@ \
+@@ -439,35 +442,35 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ libnemivercommon.pc: $(top_builddir)/config.status $(srcdir)/libnemivercommon.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++install-nemivercommonLTLIBRARIES: $(nemivercommon_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ test -z "$(nemivercommondir)" || $(mkdir_p) "$(DESTDIR)$(nemivercommondir)"
++ @list='$(nemivercommon_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ echo " $(LIBTOOL) --mode=install $(nemivercommonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nemivercommondir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(nemivercommonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nemivercommondir)/$$f"; \
+ else :; fi; \
+ done
+
+-uninstall-libLTLIBRARIES:
++uninstall-nemivercommonLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(nemivercommon_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nemivercommondir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nemivercommondir)/$$p"; \
+ done
+
+-clean-libLTLIBRARIES:
+- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++clean-nemivercommonLTLIBRARIES:
++ -test -z "$(nemivercommon_LTLIBRARIES)" || rm -f $(nemivercommon_LTLIBRARIES)
++ @list='$(nemivercommon_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libnemivercommon.la: $(libnemivercommon_la_OBJECTS) $(libnemivercommon_la_DEPENDENCIES)
+- $(CXXLINK) -rpath $(libdir) $(libnemivercommon_la_LDFLAGS) $(libnemivercommon_la_OBJECTS) $(libnemivercommon_la_LIBADD) $(LIBS)
++ $(CXXLINK) -rpath $(nemivercommondir) $(libnemivercommon_la_LDFLAGS) $(libnemivercommon_la_OBJECTS) $(libnemivercommon_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -644,7 +647,7 @@
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(publicheadersdir)"; do \
++ for dir in "$(DESTDIR)$(nemivercommondir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(publicheadersdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -673,7 +676,7 @@
+ @echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+
+-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-generic clean-libtool clean-nemivercommonLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -692,9 +695,10 @@
+
+ info-am:
+
+-install-data-am: install-pkgconfigDATA install-publicheadersDATA
++install-data-am: install-nemivercommonLTLIBRARIES \
++ install-pkgconfigDATA install-publicheadersDATA
+
+-install-exec-am: install-libLTLIBRARIES
++install-exec-am:
+
+ install-info: install-info-am
+
+@@ -720,22 +724,22 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
++uninstall-am: uninstall-info-am uninstall-nemivercommonLTLIBRARIES \
+ uninstall-pkgconfigDATA uninstall-publicheadersDATA
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
++ clean-libtool clean-nemivercommonLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+- install-exec-am install-info install-info-am \
+- install-libLTLIBRARIES install-man install-pkgconfigDATA \
++ install-exec-am install-info install-info-am install-man \
++ install-nemivercommonLTLIBRARIES install-pkgconfigDATA \
+ install-publicheadersDATA install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+- uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
++ uninstall-nemivercommonLTLIBRARIES uninstall-pkgconfigDATA \
+ uninstall-publicheadersDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: nemiver-0.4.0/src/confmgr/Makefile.in
+===================================================================
+--- nemiver-0.4.0.orig/src/confmgr/Makefile.in 2007-06-10 16:02:20.741940464 +0200
++++ nemiver-0.4.0/src/confmgr/Makefile.in 2007-06-10 16:07:17.634859427 +0200
+@@ -62,7 +62,8 @@
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(publicheadersdir)"
+ gconfmgrmodLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(gconfmgrmod_LTLIBRARIES)
+-libgconfmgrmod_la_LIBADD =
++libgconfmgrmod_la_DEPENDENCIES = \
++ $(top_builddir)/src/common/libnemivercommon.la
+ am__objects_1 =
+ am_libgconfmgrmod_la_OBJECTS = $(am__objects_1) nmv-gconf-mgr.lo
+ libgconfmgrmod_la_OBJECTS = $(am_libgconfmgrmod_la_OBJECTS)
+@@ -327,7 +328,10 @@
+
+ publicheaders_DATA = $(headers)
+ publicheadersdir = $(NEMIVER_INCLUDE_DIR)/dynmods
+-libgconfmgrmod_la_LDFLAGS = @NEMIVERCOMMON_LIBS@ @GCONF_LIBS@ -module -avoid-version
++libgconfmgrmod_la_LDFLAGS = -module -avoid-version
++libgconfmgrmod_la_LIBADD = @NEMIVERCOMMON_LIBS@ @GCONF_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
++
+ config_DATA = gconfmgr.conf
+ configdir = @NEMIVER_SYSTEM_CONFIG_DIR@
+ INCLUDES = @NEMIVERCOMMON_CFLAGS@ @GCONF_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
+Index: nemiver-0.4.0/src/dbgengine/Makefile.in
+===================================================================
+--- nemiver-0.4.0.orig/src/dbgengine/Makefile.in 2007-06-10 16:02:20.709938640 +0200
++++ nemiver-0.4.0/src/dbgengine/Makefile.in 2007-06-10 16:07:18.242894077 +0200
+@@ -67,7 +67,8 @@
+ varlistmodLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(cpptraitmod_LTLIBRARIES) $(gdbmod_LTLIBRARIES) \
+ $(noinst_LTLIBRARIES) $(varlistmod_LTLIBRARIES)
+-libcpptraitmod_la_DEPENDENCIES =
++libcpptraitmod_la_DEPENDENCIES = \
++ $(top_builddir)/src/common/libnemivercommon.la
+ am__objects_1 =
+ am_libcpptraitmod_la_OBJECTS = $(am__objects_1) nmv-cpp-trait.lo
+ libcpptraitmod_la_OBJECTS = $(am_libcpptraitmod_la_OBJECTS)
+@@ -78,10 +79,12 @@
+ $(top_builddir)/src/common/libnemivercommon.la
+ am_libgdbmiparser_la_OBJECTS = nmv-gdbmi-parser.lo
+ libgdbmiparser_la_OBJECTS = $(am_libgdbmiparser_la_OBJECTS)
+-libgdbmod_la_DEPENDENCIES = libdbgcommon.la libgdbmiparser.la
++libgdbmod_la_DEPENDENCIES = libdbgcommon.la libgdbmiparser.la \
++ $(top_builddir)/src/common/libnemivercommon.la
+ am_libgdbmod_la_OBJECTS = $(am__objects_1) nmv-gdb-engine.lo
+ libgdbmod_la_OBJECTS = $(am_libgdbmod_la_OBJECTS)
+-libvarlistmod_la_DEPENDENCIES =
++libvarlistmod_la_DEPENDENCIES = \
++ $(top_builddir)/src/common/libnemivercommon.la
+ am_libvarlistmod_la_OBJECTS = $(am__objects_1) nmv-var-list.lo
+ libvarlistmod_la_OBJECTS = $(am_libvarlistmod_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -369,6 +372,7 @@
+ nmv-gdbmi-parser.cc \
+ nmv-gdbmi-parser.h
+
++libgdbmiparser_la_CFLAGS = -fPIC -DPIC
+ libcpptraitmod_la_SOURCES = \
+ $(ilangtraitheaders) \
+ nmv-cpp-trait.cc
+@@ -377,14 +381,21 @@
+ nmv-dbg-common.cc \
+ nmv-dbg-common.h
+
++libdbgcommon_la_CFLAGS = -fPIC -DPIC
+ publicheaders_DATA = $(dynmodheaders)
+ publicheadersdir = $(NEMIVER_INCLUDE_DIR)/dynmods
+ libgdbmod_la_LDFLAGS = -module -avoid-version
+-libgdbmod_la_LIBADD = libdbgcommon.la libgdbmiparser.la @NEMIVERCOMMON_LIBS@
++libgdbmod_la_LIBADD = libdbgcommon.la libgdbmiparser.la @NEMIVERCOMMON_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
++
+ libvarlistmod_la_LDFLAGS = -module -avoid-version
+-libvarlistmod_la_LIBADD = @NEMIVERCOMMON_LIBS@
++libvarlistmod_la_LIBADD = @NEMIVERCOMMON_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
++
+ libcpptraitmod_la_LDFLAGS = -module -avoid-version
+-libcpptraitmod_la_LIBADD = @NEMIVERCOMMON_LIBS@
++libcpptraitmod_la_LIBADD = @NEMIVERCOMMON_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la
++
+ libgdbmiparser_la_LIBADD = \
+ @NEMIVERCOMMON_LIBS@ \
+ $(top_builddir)/src/common/libnemivercommon.la
+Index: nemiver-0.4.0/src/uicommon/Makefile.in
+===================================================================
+--- nemiver-0.4.0.orig/src/uicommon/Makefile.in 2007-06-10 16:02:20.657935677 +0200
++++ nemiver-0.4.0/src/uicommon/Makefile.in 2007-06-10 16:07:19.746979790 +0200
+@@ -52,8 +52,9 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+ libnemiveruicommon_la_DEPENDENCIES =
+-am_libnemiveruicommon_la_OBJECTS = nmv-ui-utils.lo ephy-spinner.lo \
+- ephy-spinner-tool-item.lo nmv-spinner.lo \
++am_libnemiveruicommon_la_OBJECTS = nmv-ui-utils.lo \
++ libnemiveruicommon_la-ephy-spinner.lo \
++ libnemiveruicommon_la-ephy-spinner-tool-item.lo nmv-spinner.lo \
+ nmv-spinner-tool-item.lo nmv-popup-tip.lo nmv-terminal.lo \
+ nmv-source-editor.lo
+ libnemiveruicommon_la_OBJECTS = $(am_libnemiveruicommon_la_OBJECTS)
+@@ -326,7 +327,8 @@
+ nmv-source-editor.cc \
+ nmv-source-editor.h
+
+-libnemiveruicommon_la_LIBADD = @NEMIVERUICOMMON_LIBS@
++libnemiveruicommon_la_LIBADD = @NEMIVERUICOMMON_LIBS@ -lutil
++libnemiveruicommon_la_CFLAGS = -fPIC -DPIC
+ INCLUDES = @NEMIVERUICOMMON_CFLAGS@ \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
+@@ -383,8 +385,8 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ephy-spinner-tool-item.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ephy-spinner.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnemiveruicommon_la-ephy-spinner-tool-item.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnemiveruicommon_la-ephy-spinner.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nmv-popup-tip.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nmv-source-editor.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nmv-spinner-tool-item.Plo at am__quote@
+@@ -413,6 +415,20 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
++libnemiveruicommon_la-ephy-spinner.lo: ephy-spinner.c
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnemiveruicommon_la_CFLAGS) $(CFLAGS) -MT libnemiveruicommon_la-ephy-spinner.lo -MD -MP -MF "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner.Tpo" -c -o libnemiveruicommon_la-ephy-spinner.lo `test -f 'ephy-spinner.c' || echo '$(srcdir)/'`ephy-spinner.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner.Tpo" "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner.Plo"; else rm -f "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ephy-spinner.c' object='libnemiveruicommon_la-ephy-spinner.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnemiveruicommon_la_CFLAGS) $(CFLAGS) -c -o libnemiveruicommon_la-ephy-spinner.lo `test -f 'ephy-spinner.c' || echo '$(srcdir)/'`ephy-spinner.c
++
++libnemiveruicommon_la-ephy-spinner-tool-item.lo: ephy-spinner-tool-item.c
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnemiveruicommon_la_CFLAGS) $(CFLAGS) -MT libnemiveruicommon_la-ephy-spinner-tool-item.lo -MD -MP -MF "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner-tool-item.Tpo" -c -o libnemiveruicommon_la-ephy-spinner-tool-item.lo `test -f 'ephy-spinner-tool-item.c' || echo '$(srcdir)/'`ephy-spinner-tool-item.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner-tool-item.Tpo" "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner-tool-item.Plo"; else rm -f "$(DEPDIR)/libnemiveruicommon_la-ephy-spinner-tool-item.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ephy-spinner-tool-item.c' object='libnemiveruicommon_la-ephy-spinner-tool-item.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnemiveruicommon_la_CFLAGS) $(CFLAGS) -c -o libnemiveruicommon_la-ephy-spinner-tool-item.lo `test -f 'ephy-spinner-tool-item.c' || echo '$(srcdir)/'`ephy-spinner-tool-item.c
++
+ .cc.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+Index: nemiver-0.4.0/src/workbench/Makefile.in
+===================================================================
+--- nemiver-0.4.0.orig/src/workbench/Makefile.in 2007-06-10 16:02:20.633934309 +0200
++++ nemiver-0.4.0/src/workbench/Makefile.in 2007-06-10 16:07:19.962992100 +0200
+@@ -63,6 +63,7 @@
+ workbenchmodLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(workbenchmod_LTLIBRARIES)
+ libworkbenchmod_la_DEPENDENCIES = \
++ $(top_builddir)/src/common/libnemivercommon.la \
+ $(top_builddir)/src/uicommon/libnemiveruicommon.la
+ am__objects_1 =
+ am_libworkbenchmod_la_OBJECTS = $(am__objects_1) nmv-workbench.lo \
+@@ -342,7 +343,10 @@
+ publicheaders_DATA = $(headers)
+ publicheadersdir = $(NEMIVER_INCLUDE_DIR)/dynmods
+ libworkbenchmod_la_LDFLAGS = -module -avoid-version
+-libworkbenchmod_la_LIBADD = @NEMIVERWORKBENCH_LIBS@ $(top_builddir)/src/uicommon/libnemiveruicommon.la
++libworkbenchmod_la_LIBADD = @NEMIVERWORKBENCH_LIBS@ \
++ $(top_builddir)/src/common/libnemivercommon.la \
++ $(top_builddir)/src/uicommon/libnemiveruicommon.la
++
+ config_DATA = workbench.conf
+ configdir = @NEMIVER_SYSTEM_CONFIG_DIR@
+ INCLUDES = @NEMIVERWORKBENCH_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
Added: packages/unstable/nemiver/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/patches/series?rev=11436&op=file
==============================================================================
--- packages/unstable/nemiver/debian/patches/series (added)
+++ packages/unstable/nemiver/debian/patches/series Sun Jun 10 14:21:17 2007
@@ -1,0 +1,6 @@
+01_convenience-libs_PIC.patch
+02_libnemivercommon_private.patch
+03_modules_libnemivercommon.patch
+04_nemiveruicommon_lutil.patch
+70_relibtoolize.patch
+99_ltmain_as-needed.patch
Modified: packages/unstable/nemiver/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/rules?rev=11436&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/rules (original)
+++ packages/unstable/nemiver/debian/rules Sun Jun 10 14:21:17 2007
@@ -3,21 +3,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-# Because there is a convenience library that is only built statically
-# but linked in shared objects, it should be built with -fPIC
-# It should be fixed upstream later.
-DEB_CONFIGURE_EXTRA_FLAGS += --with-pic
-
DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
-# Currently set the rpath globally to avoid having libnemivercommon in
-# /usr/lib while this private library isn't properly versioned.
-# It should also be fixed upstream later.
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -Wl,-rpath,/usr/lib/nemiver
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
binary-post-install/nemiver::
-find debian/nemiver/usr/lib -type f -name "*.a" -exec rm {} \;
More information about the pkg-gnome-commits
mailing list