[Pkg-cli-libs-commits] r3914 - in /packages/sublib/trunk/debian: control libsublib-cil.install libsublib0.9-cil.install libsublib0.9-cil.installcligac patches/99_autoreconf.dpatch
zadig-guest at users.alioth.debian.org
zadig-guest at users.alioth.debian.org
Tue Dec 9 13:39:18 UTC 2008
Author: zadig-guest
Date: Tue Dec 9 13:39:18 2008
New Revision: 3914
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3914
Log:
first adjustments to have the non-gac lib
Added:
packages/sublib/trunk/debian/libsublib-cil.install (props changed)
- copied unchanged from r3912, packages/sublib/trunk/debian/libsublib0.9-cil.install
Removed:
packages/sublib/trunk/debian/libsublib0.9-cil.install
packages/sublib/trunk/debian/libsublib0.9-cil.installcligac
Modified:
packages/sublib/trunk/debian/control
packages/sublib/trunk/debian/patches/99_autoreconf.dpatch
Modified: packages/sublib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/debian/control?rev=3914&op=diff
==============================================================================
--- packages/sublib/trunk/debian/control (original)
+++ packages/sublib/trunk/debian/control Tue Dec 9 13:39:18 2008
@@ -14,7 +14,7 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/sublib/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/
-Package: libsublib0.9-cil
+Package: libsublib-cil
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
Description: CLI library that eases the development of subtitling applications
Propchange: packages/sublib/trunk/debian/libsublib-cil.install
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: packages/sublib/trunk/debian/patches/99_autoreconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/debian/patches/99_autoreconf.dpatch?rev=3914&op=diff
==============================================================================
--- packages/sublib/trunk/debian/patches/99_autoreconf.dpatch (original)
+++ packages/sublib/trunk/debian/patches/99_autoreconf.dpatch Tue Dec 9 13:39:18 2008
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/Makefile.am trunk/Makefile.am
---- trunk~/Makefile.am 2008-12-08 19:49:36.936480491 -0300
-+++ trunk/Makefile.am 2008-12-08 19:50:18.688478468 -0300
-@@ -1,8 +1,9 @@
+--- trunk~/Makefile.am 2008-12-09 10:23:03.188921966 -0300
++++ trunk/Makefile.am 2008-12-09 10:23:11.188340545 -0300
+@@ -1,8 +1,8 @@
SUBDIRS = data src
-EXTRA_DIST = \
@@ -16,13 +16,12 @@
CREDITS \
- build.properties \
+ build.properties \
-+ sublib.snk \
nant.build \
sublib.mdp \
sublib.mds
diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in 2008-12-08 19:49:36.952480089 -0300
-+++ trunk/Makefile.in 2008-12-08 19:50:18.704481419 -0300
+--- trunk~/Makefile.in 2008-12-09 10:23:03.192339077 -0300
++++ trunk/Makefile.in 2008-12-09 10:24:19.696339249 -0300
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -127,7 +126,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -145,16 +149,20 @@
+@@ -145,16 +149,19 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -145,11 +144,10 @@
CREDITS \
- build.properties \
+ build.properties \
-+ sublib.snk \
nant.build \
sublib.mdp \
sublib.mds
-@@ -197,7 +205,6 @@
+@@ -197,7 +204,6 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
src/SubLib/AssemblyInfo.cs: $(top_builddir)/config.status $(top_srcdir)/src/SubLib/AssemblyInfo.cs.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -157,7 +155,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -230,8 +237,7 @@
+@@ -230,8 +236,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -167,7 +165,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -275,8 +281,8 @@
+@@ -275,8 +280,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -178,7 +176,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -301,8 +307,8 @@
+@@ -301,8 +306,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -189,7 +187,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -312,13 +318,12 @@
+@@ -312,13 +317,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -205,7 +203,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -333,24 +338,22 @@
+@@ -333,24 +337,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -244,7 +242,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -364,7 +367,7 @@
+@@ -364,7 +366,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -253,7 +251,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -372,6 +375,8 @@
+@@ -372,6 +374,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -262,7 +260,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -379,7 +384,7 @@
+@@ -379,7 +383,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -271,7 +269,7 @@
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -389,6 +394,10 @@
+@@ -389,6 +393,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -282,7 +280,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -415,6 +424,8 @@
+@@ -415,6 +423,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -291,7 +289,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -454,7 +465,7 @@
+@@ -454,7 +464,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -300,7 +298,7 @@
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -523,12 +534,20 @@
+@@ -523,12 +533,20 @@
install-data-am:
@@ -321,7 +319,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -549,23 +568,25 @@
+@@ -549,23 +567,25 @@
ps-am:
@@ -360,8 +358,8 @@
# 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 trunk~/aclocal.m4 trunk/aclocal.m4
---- trunk~/aclocal.m4 2008-12-08 19:49:36.964479787 -0300
-+++ trunk/aclocal.m4 2008-12-08 19:50:18.704481419 -0300
+--- trunk~/aclocal.m4 2008-12-09 10:23:03.196338697 -0300
++++ trunk/aclocal.m4 2008-12-09 10:23:11.196340064 -0300
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -684,7 +682,7 @@
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
diff -urNad trunk~/autom4te.cache/output.0 trunk/autom4te.cache/output.0
--- trunk~/autom4te.cache/output.0 1969-12-31 21:00:00.000000000 -0300
-+++ trunk/autom4te.cache/output.0 2008-12-08 19:50:18.712478144 -0300
++++ trunk/autom4te.cache/output.0 2008-12-09 10:23:11.204338466 -0300
@@ -0,0 +1,3642 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -4330,7 +4328,7 @@
+
diff -urNad trunk~/autom4te.cache/output.1 trunk/autom4te.cache/output.1
--- trunk~/autom4te.cache/output.1 1969-12-31 21:00:00.000000000 -0300
-+++ trunk/autom4te.cache/output.1 2008-12-08 19:50:18.740478558 -0300
++++ trunk/autom4te.cache/output.1 2008-12-09 10:23:11.212338824 -0300
@@ -0,0 +1,3642 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -7976,7 +7974,7 @@
+
diff -urNad trunk~/autom4te.cache/requests trunk/autom4te.cache/requests
--- trunk~/autom4te.cache/requests 1969-12-31 21:00:00.000000000 -0300
-+++ trunk/autom4te.cache/requests 2008-12-08 19:50:18.740478558 -0300
++++ trunk/autom4te.cache/requests 2008-12-09 10:24:22.048339050 -0300
@@ -0,0 +1,132 @@
+# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008.
+# It contains the lists of macros which have been traced.
@@ -8013,8 +8011,8 @@
+ ],
+ {
+ 'm4_pattern_forbid' => 1,
++ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'jm_MAINTAINER_MODE' => 1,
-+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'AC_DEFUN' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
@@ -8044,8 +8042,8 @@
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_AM_DEPENDENCIES' => 1,
++ 'AM_PROG_INSTALL_SH' => 1,
+ 'm4_include' => 1,
-+ 'AM_PROG_INSTALL_SH' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AU_DEFUN' => 1,
+ 'AM_MAKE_INCLUDE' => 1
@@ -8063,15 +8061,15 @@
+ 'configure.in'
+ ],
+ {
++ 'AM_PROG_F77_C_O' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
-+ 'AM_PROG_F77_C_O' => 1,
++ 'm4_pattern_forbid' => 1,
+ 'AC_INIT' => 1,
-+ 'm4_pattern_forbid' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
++ 'AC_SUBST' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
-+ 'AC_SUBST' => 1,
++ 'AC_FC_SRCEXT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
-+ 'AC_FC_SRCEXT' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
@@ -8079,8 +8077,8 @@
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
++ 'm4_sinclude' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
-+ 'm4_sinclude' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ '_m4_warn' => 1,
@@ -8097,11 +8095,11 @@
+ 'AH_OUTPUT' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
++ 'sinclude' => 1,
++ 'AM_PROG_CC_C_O' => 1,
+ 'm4_pattern_allow' => 1,
-+ 'AM_PROG_CC_C_O' => 1,
-+ 'sinclude' => 1,
++ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
-+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'm4_include' => 1,
@@ -8112,7 +8110,7 @@
+
diff -urNad trunk~/autom4te.cache/traces.0 trunk/autom4te.cache/traces.0
--- trunk~/autom4te.cache/traces.0 1969-12-31 21:00:00.000000000 -0300
-+++ trunk/autom4te.cache/traces.0 2008-12-08 19:50:18.740478558 -0300
++++ trunk/autom4te.cache/traces.0 2008-12-09 10:23:11.212338824 -0300
@@ -0,0 +1,664 @@
+m4trace:/usr/share/aclocal-1.10/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
@@ -8780,7 +8778,7 @@
+m4trace:configure.in:39: -1- m4_pattern_allow([^LTLIBOBJS$])
diff -urNad trunk~/autom4te.cache/traces.1 trunk/autom4te.cache/traces.1
--- trunk~/autom4te.cache/traces.1 1969-12-31 21:00:00.000000000 -0300
-+++ trunk/autom4te.cache/traces.1 2008-12-08 19:50:18.752480212 -0300
++++ trunk/autom4te.cache/traces.1 2008-12-09 10:23:11.212338824 -0300
@@ -0,0 +1,335 @@
+m4trace:configure.in:1: -1- AC_INIT([sublib], [0.9])
+m4trace:configure.in:1: -1- m4_pattern_forbid([^_?A[CHUM]_])
@@ -9118,8 +9116,8 @@
+m4trace:configure.in:39: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.in:39: -1- AC_SUBST_TRACE([MKDIR_P])
diff -urNad trunk~/configure trunk/configure
---- trunk~/configure 2008-12-08 19:49:37.092481317 -0300
-+++ trunk/configure 2008-12-08 19:50:18.752480212 -0300
+--- trunk~/configure 2008-12-09 10:23:03.248338228 -0300
++++ trunk/configure 2008-12-09 10:23:11.220341416 -0300
@@ -628,6 +628,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
@@ -9316,8 +9314,8 @@
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
diff -urNad trunk~/data/Makefile.in trunk/data/Makefile.in
---- trunk~/data/Makefile.in 2008-12-08 19:49:37.100489777 -0300
-+++ trunk/data/Makefile.in 2008-12-08 19:50:18.756479552 -0300
+--- trunk~/data/Makefile.in 2008-12-09 10:23:03.252347906 -0300
++++ trunk/data/Makefile.in 2008-12-09 10:24:19.512338288 -0300
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9507,35 +9505,9 @@
# 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 trunk~/src/Makefile.am trunk/src/Makefile.am
---- trunk~/src/Makefile.am 2008-12-08 19:50:18.332478481 -0300
-+++ trunk/src/Makefile.am 2008-12-08 19:50:18.756479552 -0300
-@@ -4,6 +4,9 @@
-
- ASSEMBLY = $(sublib_BUILDDIR)/sublib.dll
-
-+sublib.snk: $(top_srcdir)/sublib.snk
-+ cp $(top_srcdir)/sublib.snk .
-+
- sublib_SCRIPTSOURCES = \
- $(srcdir)/SubLib/*.cs \
- $(srcdir)/SubLib/Application/*.cs \
-@@ -11,10 +14,10 @@
- $(srcdir)/SubLib/Persistency/*.cs \
- $(srcdir)/External/NCharDet/*.cs
-
--$(ASSEMBLY): $(sublib_SCRIPTSOURCES)
-+$(ASSEMBLY): $(sublib_SCRIPTSOURCES) sublib.snk
- $(MCS) $(MCS_FLAGS) -target:library -out:$(ASSEMBLY) -doc:$(ASSEMBLY).xml $(sublib_SCRIPTSOURCES)
-
--CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb sublib.snk
- EXTRA_DIST = \
- $(sublib_SCRIPTSOURCES) \
- Executable/Executable.cs
diff -urNad trunk~/src/Makefile.in trunk/src/Makefile.in
---- trunk~/src/Makefile.in 2008-12-08 19:49:37.108478680 -0300
-+++ trunk/src/Makefile.in 2008-12-08 19:50:18.756479552 -0300
+--- trunk~/src/Makefile.in 2008-12-09 10:23:03.256338865 -0300
++++ trunk/src/Makefile.in 2008-12-09 10:24:19.580338255 -0300
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9618,15 +9590,6 @@
sublibdir = $(pkglibdir)
sublib_SCRIPTS = $(ASSEMBLY)
sublib_BUILDDIR = $(srcdir)/../build
-@@ -141,7 +145,7 @@
- $(srcdir)/SubLib/Persistency/*.cs \
- $(srcdir)/External/NCharDet/*.cs
-
--CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb sublib.snk
- EXTRA_DIST = \
- $(sublib_SCRIPTSOURCES) \
- Executable/Executable.cs
@@ -180,7 +184,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-sublibSCRIPTS: $(sublib_SCRIPTS)
@@ -9711,7 +9674,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -309,21 +318,27 @@
+@@ -309,21 +318,24 @@
ps-am:
@@ -9736,22 +9699,17 @@
+ pdf-am ps ps-am uninstall uninstall-am uninstall-sublibSCRIPTS
--$(ASSEMBLY): $(sublib_SCRIPTSOURCES)
+ $(ASSEMBLY): $(sublib_SCRIPTSOURCES)
- $(MCS) $(MCS_FLAGS) -target:library -out:$(ASSEMBLY) $(sublib_SCRIPTSOURCES)
-+sublib.snk: $(top_srcdir)/sublib.snk
-+ cp $(top_srcdir)/sublib.snk .
-+
-+$(ASSEMBLY): $(sublib_SCRIPTSOURCES) sublib.snk
+ $(MCS) $(MCS_FLAGS) -target:library -out:$(ASSEMBLY) -doc:$(ASSEMBLY).xml $(sublib_SCRIPTSOURCES)
# 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.
.NOEXPORT:
diff -urNad trunk~/src/SubLib/AssemblyInfo.cs.in trunk/src/SubLib/AssemblyInfo.cs.in
---- trunk~/src/SubLib/AssemblyInfo.cs.in 2008-12-08 19:49:37.108478680 -0300
-+++ trunk/src/SubLib/AssemblyInfo.cs.in 2008-12-08 19:51:12.520479418 -0300
-@@ -24,4 +24,4 @@
+--- trunk~/src/SubLib/AssemblyInfo.cs.in 2008-12-09 10:23:03.256338865 -0300
++++ trunk/src/SubLib/AssemblyInfo.cs.in 2008-12-09 10:23:11.252338935 -0300
+@@ -24,4 +24,3 @@
[assembly: AssemblyTitle ("a library for managing movie subtitles")]
[assembly: AssemblyDescription ("SubLib")]
[assembly: AssemblyCopyright ("Copyright (c) 2006-2008 Pedro Castro")]
-
-+[assembly:AssemblyKeyFile("@srcdir@/sublib.snk")]
More information about the Pkg-cli-libs-commits
mailing list