[Pkg-cli-libs-commits] r3915 - in /packages/sublib/trunk/debian: libsublib-cil.install libsublib0.9-cil.links patches/99_autoreconf.dpatch rules

zadig-guest at users.alioth.debian.org zadig-guest at users.alioth.debian.org
Tue Dec 9 14:12:12 UTC 2008 

Author: zadig-guest
Date: Tue Dec  9 14:12:12 2008
New Revision: 3915

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3915
Log:
removing version stuff needed only for gac

Removed:
    packages/sublib/trunk/debian/libsublib0.9-cil.links
Modified:
    packages/sublib/trunk/debian/libsublib-cil.install
    packages/sublib/trunk/debian/patches/99_autoreconf.dpatch
    packages/sublib/trunk/debian/rules

Modified: packages/sublib/trunk/debian/libsublib-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/debian/libsublib-cil.install?rev=3915&op=diff
==============================================================================
--- packages/sublib/trunk/debian/libsublib-cil.install (original)
+++ packages/sublib/trunk/debian/libsublib-cil.install Tue Dec  9 14:12:12 2008
@@ -1,2 +1,2 @@
-build/sublib.dll /usr/lib/cli/sublib-0.9/
-debian/tmp/usr/lib/pkgconfig/sublib.pc /usr/lib/pkgconfig/
+debian/tmp/usr/lib/sublib/sublib.dll
+debian/tmp/usr/lib/pkgconfig/sublib.pc

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=3915&op=diff
==============================================================================
--- packages/sublib/trunk/debian/patches/99_autoreconf.dpatch (original)
+++ packages/sublib/trunk/debian/patches/99_autoreconf.dpatch Tue Dec  9 14:12:12 2008
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad trunk~/Makefile.am trunk/Makefile.am
---- trunk~/Makefile.am	2008-12-09 10:23:03.188921966 -0300
-+++ trunk/Makefile.am	2008-12-09 10:23:11.188340545 -0300
+--- trunk~/Makefile.am	2008-12-09 10:53:33.380338946 -0300
++++ trunk/Makefile.am	2008-12-09 10:53:45.508339314 -0300
 @@ -1,8 +1,8 @@
  SUBDIRS = data src
  
@@ -20,8 +20,8 @@
  	sublib.mdp					\
  	sublib.mds
 diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in	2008-12-09 10:23:03.192339077 -0300
-+++ trunk/Makefile.in	2008-12-09 10:24:19.696339249 -0300
+--- trunk~/Makefile.in	2008-12-09 10:53:33.384340521 -0300
++++ trunk/Makefile.in	2008-12-09 10:53:45.508339314 -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.
@@ -358,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-09 10:23:03.196338697 -0300
-+++ trunk/aclocal.m4	2008-12-09 10:23:11.196340064 -0300
+--- trunk~/aclocal.m4	2008-12-09 10:53:33.392338644 -0300
++++ trunk/aclocal.m4	2008-12-09 10:53:45.512339493 -0300
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -682,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-09 10:23:11.204338466 -0300
++++ trunk/autom4te.cache/output.0	2008-12-09 10:53:45.516338833 -0300
 @@ -0,0 +1,3642 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -4328,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-09 10:23:11.212338824 -0300
++++ trunk/autom4te.cache/output.1	2008-12-09 10:53:45.524338353 -0300
 @@ -0,0 +1,3642 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -7974,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-09 10:24:22.048339050 -0300
++++ trunk/autom4te.cache/requests	2008-12-09 10:53:45.524338353 -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.
@@ -8110,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-09 10:23:11.212338824 -0300
++++ trunk/autom4te.cache/traces.0	2008-12-09 10:53:45.524338353 -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
@@ -8778,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-09 10:23:11.212338824 -0300
++++ trunk/autom4te.cache/traces.1	2008-12-09 10:53:45.528344119 -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]_])
@@ -9116,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-09 10:23:03.248338228 -0300
-+++ trunk/configure	2008-12-09 10:23:11.220341416 -0300
+--- trunk~/configure	2008-12-09 10:53:33.436338376 -0300
++++ trunk/configure	2008-12-09 10:53:45.528344119 -0300
 @@ -628,6 +628,7 @@
  INSTALL_PROGRAM
  INSTALL_SCRIPT
@@ -9314,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-09 10:23:03.252347906 -0300
-+++ trunk/data/Makefile.in	2008-12-09 10:24:19.512338288 -0300
+--- trunk~/data/Makefile.in	2008-12-09 10:53:33.444347953 -0300
++++ trunk/data/Makefile.in	2008-12-09 10:53:45.528344119 -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.
@@ -9505,9 +9505,27 @@
  
  # 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~/data/sublib.pc.in trunk/data/sublib.pc.in
+--- trunk~/data/sublib.pc.in	2008-12-09 10:53:45.265714977 -0300
++++ trunk/data/sublib.pc.in	2008-12-09 11:02:29.167491275 -0300
+@@ -1,10 +1,10 @@
+ prefix=@prefix@
+-exec_prefix=${prefix}
+-libdir=${prefix}/lib/cli/sublib-#PACKAGE_ABI_VERSION#
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ includedir=@includedir@
+-Libraries=${libdir}/sublib.dll
++Libraries=@libdir@/sublib/sublib.dll
+ 
+ Name: sublib
+ Description: sublib - Subtitle Library
+ Version: #PACKAGE_UPSTREAM_VERSION#
+-Libs: -r:${libdir}/sublib.dll
++Libs: -r:@libdir@/sublib/sublib.dll
 diff -urNad trunk~/src/Makefile.in trunk/src/Makefile.in
---- trunk~/src/Makefile.in	2008-12-09 10:23:03.256338865 -0300
-+++ trunk/src/Makefile.in	2008-12-09 10:24:19.580338255 -0300
+--- trunk~/src/Makefile.in	2008-12-09 10:53:33.448338633 -0300
++++ trunk/src/Makefile.in	2008-12-09 10:53:45.532339269 -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.
@@ -9706,8 +9724,8 @@
  # 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-09 10:23:03.256338865 -0300
-+++ trunk/src/SubLib/AssemblyInfo.cs.in	2008-12-09 10:23:11.252338935 -0300
+--- trunk~/src/SubLib/AssemblyInfo.cs.in	2008-12-09 10:53:33.448338633 -0300
++++ trunk/src/SubLib/AssemblyInfo.cs.in	2008-12-09 10:53:45.532339269 -0300
 @@ -24,4 +24,3 @@
  [assembly: AssemblyTitle ("a library for managing movie subtitles")]
  [assembly: AssemblyDescription ("SubLib")]

Modified: packages/sublib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/sublib/trunk/debian/rules?rev=3915&op=diff
==============================================================================
--- packages/sublib/trunk/debian/rules (original)
+++ packages/sublib/trunk/debian/rules Tue Dec  9 14:12:12 2008
@@ -7,7 +7,6 @@
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
 BUILD_DIR = $(CURDIR)/build
 LIB = $(BUILD_DIR)/sublib.dll
-DEB_CLI_ABI_VERSION = 0.9
 DEB_CLI_API_VERSION = 0.9
 
 build: build-stamp
@@ -27,7 +26,6 @@
 install: build
 	dh $@ --before dh_install
 	sed -i 's,#PACKAGE_UPSTREAM_VERSION#,$(VERSION),' $(CURDIR)/debian/tmp/usr/lib/pkgconfig/sublib.pc
-	sed -i 's,#PACKAGE_ABI_VERSION#,$(DEB_CLI_ABI_VERSION),' $(CURDIR)/debian/tmp/usr/lib/pkgconfig/sublib.pc
 	dh $@ --remaining
 
 binary: binary-indep

More information about the Pkg-cli-libs-commits mailing list