r37134 - in /desktop/experimental/gtksourceview3/debian: changelog control.in patches/gtksourceview-bump-soname.patch patches/series rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Fri Mar 22 23:23:03 UTC 2013
Author: ah
Date: Fri Mar 22 23:23:03 2013
New Revision: 37134
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37134
Log:
make changelog comment more accurate
Added:
desktop/experimental/gtksourceview3/debian/patches/gtksourceview-bump-soname.patch
Modified:
desktop/experimental/gtksourceview3/debian/changelog
desktop/experimental/gtksourceview3/debian/control.in
desktop/experimental/gtksourceview3/debian/patches/series
desktop/experimental/gtksourceview3/debian/rules
Modified: desktop/experimental/gtksourceview3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/changelog?rev=37134&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/changelog [utf-8] Fri Mar 22 23:23:03 2013
@@ -1,19 +1,12 @@
gtksourceview3 (3.7.92-1) UNRELEASED; urgency=low
-
- === DO NOT UPLOAD THIS! ===
- Missing/removed symbols used by others (as found by codesearch.debian.net
- and listed below) needs to be handled first!
- ===========================
* New upstream release.
* Bump required versions of build-dependencies according to configure.ac:
- libgtk-3-dev bumped from (>= 3.3.8) to (>= 3.7.12)
- libglib2.0-dev bumped from (>= 2.28.0) to (>= 2.34.0)
* Update libgtksourceview-3.0-0.symbols with many symbols dropped!
- - gtk_source_completion_words_* used by gedit-plugins 3.4.0, anjuta 3.2.2,
- vala 0.16.1, and libgtksourceviewmm 3.2.0.
- - gtk_source_gutter_* used by valac 0.16.1, gitg 0.2.4 and
- libgtksourceviewmm 3.2.0.
+ - no matches found by codesearch.debian.net and apparently these
+ where meant to be private and never was available in headers.
-- Andreas Henriksson <andreas at fatal.se> Fri, 22 Mar 2013 17:41:18 +0100
Modified: desktop/experimental/gtksourceview3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/control.in?rev=37134&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/control.in [utf-8] Fri Mar 22 23:23:03 2013
@@ -6,6 +6,8 @@
Build-Depends: autotools-dev,
cdbs (>= 0.4.93),
debhelper (>= 8.1.3),
+ dh-autoreconf,
+ gnome-common (>= 3.5.91),
gnome-pkg-tools (>= 0.7),
libgtk-3-dev (>= 3.7.12),
libatk1.0-dev (>= 1.32),
Added: desktop/experimental/gtksourceview3/debian/patches/gtksourceview-bump-soname.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/patches/gtksourceview-bump-soname.patch?rev=37134&op=file
==============================================================================
--- desktop/experimental/gtksourceview3/debian/patches/gtksourceview-bump-soname.patch (added)
+++ desktop/experimental/gtksourceview3/debian/patches/gtksourceview-bump-soname.patch [utf-8] Fri Mar 22 23:23:03 2013
@@ -1,0 +1,111 @@
+From 1e7c83cc2b2193ca6469239f26784479f3292ff7 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Fri, 22 Mar 2013 22:24:42 +0100
+Subject: [PATCH] Use libtool versioning to produce proper so versioning
+
+Some cargo culting resulted in the following patch, mostly copied
+from glib, which should help produce proper shared object version
+for the future.
+---
+ configure.ac | 58 +++++++++++++++++++++++++++++++++++++++++----
+ gtksourceview/Makefile.am | 1 +
+ 2 files changed, 55 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c92380b..0b773cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,10 +2,38 @@ dnl Process this file with autoconf to produce a configure script.
+
+ AC_PREREQ(2.64)
+
+-m4_define(gtksourceview_major_version, 3)
+-m4_define(gtksourceview_minor_version, 7)
+-m4_define(gtksourceview_micro_version, 92)
+-m4_define(gtksourceview_version, gtksourceview_major_version.gtksourceview_minor_version.gtksourceview_micro_version)
++# GtkSourceView library version information.
++#
++# Making releases:
++# gtksourceview_micro_version += 1;
++# gtksourceview_interface_age += 1;
++# gtksourceview_binary_age += 1;
++# if any functions have been added, set gtksourceview_interface_age to 0.
++# if backwards compatibility has been broken,
++# set gtksourceview_binary_age _and_ gtksourceview_interface_age to 0.
++#
++# in easier to understand terms:
++#
++# <mclasen> on the stable branch, interface age == micro
++# <mclasen> on the unstable (ie master), interface age = 0
++
++m4_define([gtksourceview_major_version], [3])
++m4_define([gtksourceview_minor_version], [7])
++m4_define([gtksourceview_micro_version], [92])
++m4_define([gtksourceview_interface_age], [0])
++m4_define([gtksourceview_binary_age],
++ [m4_eval(100 * gtksourceview_minor_version + gtksourceview_micro_version)])
++m4_define([gtksourceview_version],
++ [gtksourceview_major_version.gtksourceview_minor_version.gtksourceview_micro_version])
++
++# libtool version related macros
++m4_define([gtksourceview_lt_release], [gtksourceview_major_version.gtksourceview_minor_version])
++m4_define([gtksourceview_lt_current],
++ [m4_eval(100 * gtksourceview_minor_version + gtksourceview_micro_version - gtksourceview_interface_age)])
++m4_define([gtksourceview_lt_revision], [gtksourceview_interface_age])
++m4_define([gtksourceview_lt_age], [m4_eval(gtksourceview_binary_age - gtksourceview_interface_age)])
++m4_define([gtksourceview_lt_current_minus_age],
++ [m4_eval(gtksourceview_lt_current - gtksourceview_lt_age)])
+
+ AC_INIT([gtksourceview],[gtksourceview_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview],[gtksourceview],[http://projects.gnome.org/gtksourceview/])
+
+@@ -18,6 +46,19 @@ AM_MAINTAINER_MODE([enable])
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
++# libtool versioning
++LT_RELEASE=gtksourceview_lt_release
++LT_CURRENT=gtksourceview_lt_current
++LT_REVISION=gtksourceview_lt_revision
++LT_AGE=gtksourceview_lt_age
++LT_CURRENT_MINUS_AGE=gtksourceview_lt_current_minus_age
++AC_SUBST(LT_RELEASE)
++AC_SUBST(LT_CURRENT)
++AC_SUBST(LT_REVISION)
++AC_SUBST(LT_AGE)
++AC_SUBST(LT_CURRENT_MINUS_AGE)
++
++
+ # Check for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -42,6 +83,15 @@ GLADE_UI_REQUIRED=3.9
+ AC_SUBST(GTK_REQUIRED_VERSION)
+ AC_SUBST(LIBXML_REQUIRED_VERSION)
+
++# libtool versioning
++m4_define([lt_revision], [gtksourceview_interface_age])
++m4_define([lt_current], [m4_eval(gtksourceview_micro_version - gtksourceview_interface_age)])
++m4_define([lt_age], [m4_eval(gtksourceview_binary_age - gtksourceview_interface_age)])
++LT_VERSION_INFO="lt_current:lt_revision:lt_age"
++
++AC_SUBST(LT_VERSION_INFO)
++
++
+ # Pull glib-genmarshal & co.
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
+index ef5280a..66bb28b 100644
+--- a/gtksourceview/Makefile.am
++++ b/gtksourceview/Makefile.am
+@@ -140,6 +140,7 @@ libgtksourceview_3_0_la_CFLAGS = \
+ libgtksourceview_3_0_la_LDFLAGS = \
+ -no-undefined \
+ -export-symbols-regex "^gtk_source_.*" \
++ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ $(CODE_COVERAGE_LDFLAGS)
+
+ libgtksourceview_3_0_includedir = $(includedir)/gtksourceview-3.0/gtksourceview
+--
+1.7.10.4
+
Modified: desktop/experimental/gtksourceview3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/patches/series?rev=37134&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/patches/series [utf-8] Fri Mar 22 23:23:03 2013
@@ -1,1 +1,2 @@
+gtksourceview-bump-soname.patch
99_ltmain_as-needed.patch
Modified: desktop/experimental/gtksourceview3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/rules?rev=37134&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/rules [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/rules [utf-8] Fri Mar 22 23:23:03 2013
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
#(C) 2002 Colin Walters
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
@@ -18,3 +19,10 @@
DEB_DH_MAKESHLIBS_ARGS += -V -- -c4
DEB_MAKE_CHECK_TARGET := -C data/language-specs check
+
+#DEB_DH_AUTORECONF_ARGS = --as-needed
+DEB_DH_AUTORECONF_ARGS := debian/rules -- autoreconf
+
+autoreconf:
+ autoreconf -f -i
+ intltoolize --automake --copy --force
More information about the pkg-gnome-commits
mailing list