[Debichem-commits] r929 - in /unstable/gchempaint/debian: changelog patches/00list patches/02_libgchempaint_convenience.dpatch patches/03_schemasdir_fix.dpatch

Tue Jan 1 21:45:30 UTC 2008

Author: dleidert-guest
Date: Tue Jan  1 21:45:30 2008
New Revision: 929

URL: http://svn.debian.org/wsvn/debichem/?sc=1&rev=929
Log:
* debian/patches/02_libgchempaint_convenience.dpatch: Adjusted.
* debian/patches/03_schemasdir_fix.dpatch: Dropped. Applied upstream.
* debian/patches/00list: Adjusted.


Removed:
    unstable/gchempaint/debian/patches/03_schemasdir_fix.dpatch
Modified:
    unstable/gchempaint/debian/changelog
    unstable/gchempaint/debian/patches/00list
    unstable/gchempaint/debian/patches/02_libgchempaint_convenience.dpatch

Modified: unstable/gchempaint/debian/changelog
URL: http://svn.debian.org/wsvn/debichem/unstable/gchempaint/debian/changelog?rev=929&op=diff
==============================================================================

--- unstable/gchempaint/debian/changelog (original)
+++ unstable/gchempaint/debian/changelog Tue Jan  1 21:45:30 2008
@@ -3,6 +3,10 @@
   * NOT RELEASED YET
   * New upstream release 0.8.5.
     - Fixes compilation with GCC 4.3 (closes: #455308).
+
+  * debian/patches/02_libgchempaint_convenience.dpatch: Adjusted.
+  * debian/patches/03_schemasdir_fix.dpatch: Dropped. Applied upstream.
+  * debian/patches/00list: Adjusted.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Tue, 01 Jan 2008 22:34:14 +0100
 

Modified: unstable/gchempaint/debian/patches/00list
URL: http://svn.debian.org/wsvn/debichem/unstable/gchempaint/debian/patches/00list?rev=929&op=diff
==============================================================================
--- unstable/gchempaint/debian/patches/00list (original)
+++ unstable/gchempaint/debian/patches/00list Tue Jan  1 21:45:30 2008
@@ -1,3 +1,2 @@
 01_fix_misc_stuff
 02_libgchempaint_convenience
-03_schemasdir_fix

Modified: unstable/gchempaint/debian/patches/02_libgchempaint_convenience.dpatch
URL: http://svn.debian.org/wsvn/debichem/unstable/gchempaint/debian/patches/02_libgchempaint_convenience.dpatch?rev=929&op=diff
==============================================================================
--- unstable/gchempaint/debian/patches/02_libgchempaint_convenience.dpatch (original)
+++ unstable/gchempaint/debian/patches/02_libgchempaint_convenience.dpatch Tue Jan  1 21:45:30 2008
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad gchempaint~/lib/Makefile.am gchempaint/lib/Makefile.am
 --- gchempaint~/lib/Makefile.am	2007-05-20 21:36:21.000000000 +0200
-+++ gchempaint/lib/Makefile.am	2007-11-04 16:42:12.000000000 +0100
++++ gchempaint/lib/Makefile.am	2008-01-01 22:40:24.000000000 +0100
 @@ -8,7 +8,7 @@
  	-DLOCALEDIR=\"$(localedir)\"
  
@@ -19,9 +19,9 @@
  libgchempaint_la_LDFLAGS = -release $(VERSION)
  libgchempaint_la_LIBADD = $(top_builddir)/libgcpcanvas/libgcpcanvas.la @GCP_LIBS@
 diff -urNad gchempaint~/lib/Makefile.in gchempaint/lib/Makefile.in
---- gchempaint~/lib/Makefile.in	2007-10-29 14:59:58.000000000 +0100
-+++ gchempaint/lib/Makefile.in	2007-11-04 16:46:54.000000000 +0100
-@@ -47,15 +47,7 @@
+--- gchempaint~/lib/Makefile.in	2007-12-20 11:57:09.000000000 +0100
++++ gchempaint/lib/Makefile.in	2008-01-01 22:41:22.000000000 +0100
+@@ -43,15 +43,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/gchempaint-config.h
  CONFIG_CLEAN_FILES =
@@ -38,8 +38,8 @@
  libgchempaint_la_DEPENDENCIES =  \
  	$(top_builddir)/libgcpcanvas/libgcpcanvas.la
  am_libgchempaint_la_OBJECTS = application.lo plugin.lo settings.lo \
-@@ -268,7 +260,7 @@
- target_alias = @target_alias@
+@@ -259,7 +251,7 @@
+ top_srcdir = @top_srcdir@
  MAINTAINERCLEANFILES = Makefile.in
  AM_CXXFLAGS = -I$(top_srcdir) @GCP_CFLAGS@
 -lib_LTLIBRARIES = libgchempaint.la
@@ -47,13 +47,13 @@
  libgchempaint_la_LDFLAGS = -release $(VERSION)
  libgchempaint_la_LIBADD = $(top_builddir)/libgcpcanvas/libgcpcanvas.la @GCP_LIBS@
  libgchempaint_la_SOURCES = \
-@@ -384,35 +376,17 @@
+@@ -375,35 +367,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 -	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
@@ -64,7 +64,7 @@
  
 -uninstall-libLTLIBRARIES:
 -	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_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"; \
@@ -82,22 +82,22 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libgchempaint.la: $(libgchempaint_la_OBJECTS) $(libgchempaint_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libgchempaint_la_LDFLAGS) $(libgchempaint_la_OBJECTS) $(libgchempaint_la_LIBADD) $(LIBS)
-+	$(CXXLINK)  $(libgchempaint_la_LDFLAGS) $(libgchempaint_la_OBJECTS) $(libgchempaint_la_LIBADD) $(LIBS)
+-	$(libgchempaint_la_LINK) -rpath $(libdir) $(libgchempaint_la_OBJECTS) $(libgchempaint_la_LIBADD) $(LIBS)
++	$(libgchempaint_la_LINK)  $(libgchempaint_la_OBJECTS) $(libgchempaint_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -569,9 +543,6 @@
+@@ -555,9 +529,6 @@
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
  installdirs:
 -	for dir in "$(DESTDIR)$(libdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 -	done
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -599,7 +570,7 @@
+@@ -585,7 +556,7 @@
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
  clean: clean-am
  
@@ -106,47 +106,50 @@
  	mostlyclean-am
  
  distclean: distclean-am
-@@ -620,7 +591,7 @@
- 
- install-data-am:
+@@ -608,7 +579,7 @@
+ 
+ install-dvi: install-dvi-am
  
 -install-exec-am: install-libLTLIBRARIES
 +install-exec-am:
  
- install-info: install-info-am
- 
-@@ -646,20 +617,19 @@
+ install-html: install-html-am
+ 
+@@ -640,23 +611,22 @@
  
  ps-am:
  
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-+uninstall-am: uninstall-info-am
+-uninstall-am: uninstall-libLTLIBRARIES
++uninstall-am:
+ 
+ .MAKE: install-am install-strip
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 -	clean-libLTLIBRARIES clean-libtool ctags distclean \
 +	clean-libtool clean-noinstLTLIBRARIES 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-strip installcheck \
+ 	install install-am install-data install-data-am install-dvi \
+ 	install-dvi-am install-exec install-exec-am install-html \
+-	install-html-am install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+-	install-ps install-ps-am 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
-+	install-exec-am install-info install-info-am install-man \
+-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
 +	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
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 diff -urNad gchempaint~/libgcpcanvas/Makefile.am gchempaint/libgcpcanvas/Makefile.am
 --- gchempaint~/libgcpcanvas/Makefile.am	2007-05-07 18:48:22.000000000 +0200
-+++ gchempaint/libgcpcanvas/Makefile.am	2007-11-04 16:42:23.000000000 +0100
++++ gchempaint/libgcpcanvas/Makefile.am	2008-01-01 22:41:10.000000000 +0100
 @@ -2,7 +2,7 @@
  
  AM_CPPFLAGS = @GCP_CFLAGS@
@@ -157,9 +160,9 @@
  libgcpcanvas_la_LDFLAGS = -release $(VERSION)
  libgcpcanvas_la_LIBADD = @GCP_LIBS@
 diff -urNad gchempaint~/libgcpcanvas/Makefile.in gchempaint/libgcpcanvas/Makefile.in
---- gchempaint~/libgcpcanvas/Makefile.in	2007-10-29 14:59:59.000000000 +0100
-+++ gchempaint/libgcpcanvas/Makefile.in	2007-11-04 16:46:55.000000000 +0100
-@@ -47,15 +47,7 @@
+--- gchempaint~/libgcpcanvas/Makefile.in	2007-12-20 11:57:09.000000000 +0100
++++ gchempaint/libgcpcanvas/Makefile.in	2008-01-01 22:41:23.000000000 +0100
+@@ -43,15 +43,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/gchempaint-config.h
  CONFIG_CLEAN_FILES =
@@ -176,8 +179,8 @@
  libgcpcanvas_la_DEPENDENCIES =
  am_libgcpcanvas_la_OBJECTS = gprintable.lo pango-layout-to-svg.lo \
  	gcp-canvas-group.lo gcp-canvas-line.lo gcp-canvas-pango.lo \
-@@ -259,7 +251,7 @@
- target_alias = @target_alias@
+@@ -250,7 +242,7 @@
+ top_srcdir = @top_srcdir@
  MAINTAINERCLEANFILES = Makefile.in
  AM_CPPFLAGS = @GCP_CFLAGS@
 -lib_LTLIBRARIES = libgcpcanvas.la
@@ -185,13 +188,13 @@
  libgcpcanvas_la_LDFLAGS = -release $(VERSION)
  libgcpcanvas_la_LIBADD = @GCP_LIBS@
  libgcpcanvas_la_SOURCES = \
-@@ -320,35 +312,17 @@
+@@ -311,35 +303,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 -	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
@@ -202,7 +205,7 @@
  
 -uninstall-libLTLIBRARIES:
 -	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_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"; \
@@ -220,22 +223,22 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libgcpcanvas.la: $(libgcpcanvas_la_OBJECTS) $(libgcpcanvas_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libgcpcanvas_la_LDFLAGS) $(libgcpcanvas_la_OBJECTS) $(libgcpcanvas_la_LIBADD) $(LIBS)
-+	$(LINK)  $(libgcpcanvas_la_LDFLAGS) $(libgcpcanvas_la_OBJECTS) $(libgcpcanvas_la_LIBADD) $(LIBS)
+-	$(libgcpcanvas_la_LINK) -rpath $(libdir) $(libgcpcanvas_la_OBJECTS) $(libgcpcanvas_la_LIBADD) $(LIBS)
++	$(libgcpcanvas_la_LINK)  $(libgcpcanvas_la_OBJECTS) $(libgcpcanvas_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -477,9 +451,6 @@
+@@ -463,9 +437,6 @@
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
  installdirs:
 -	for dir in "$(DESTDIR)$(libdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 -	done
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -507,7 +478,7 @@
+@@ -493,7 +464,7 @@
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
  clean: clean-am
  
@@ -244,41 +247,44 @@
  	mostlyclean-am
  
  distclean: distclean-am
-@@ -528,7 +499,7 @@
- 
- install-data-am:
+@@ -516,7 +487,7 @@
+ 
+ install-dvi: install-dvi-am
  
 -install-exec-am: install-libLTLIBRARIES
 +install-exec-am:
  
- install-info: install-info-am
- 
-@@ -554,20 +525,19 @@
+ install-html: install-html-am
+ 
+@@ -548,23 +519,22 @@
  
  ps-am:
  
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-+uninstall-am: uninstall-info-am
+-uninstall-am: uninstall-libLTLIBRARIES
++uninstall-am:
+ 
+ .MAKE: install-am install-strip
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 -	clean-libLTLIBRARIES clean-libtool ctags distclean \
 +	clean-libtool clean-noinstLTLIBRARIES 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-strip installcheck \
+ 	install install-am install-data install-data-am install-dvi \
+ 	install-dvi-am install-exec install-exec-am install-html \
+-	install-html-am install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+-	install-ps install-ps-am 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
-+	install-exec-am install-info install-info-am install-man \
+-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
 +	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
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.


