diff -Nru gtksourceview3-3.3.5/debian/changelog gtksourceview3-3.3.5/debian/changelog --- gtksourceview3-3.3.5/debian/changelog 2012-03-20 12:11:57.000000000 +0000 +++ gtksourceview3-3.3.5/debian/changelog 2012-03-21 18:37:49.000000000 +0000 @@ -1,15 +1,23 @@ -gtksourceview3 (3.3.5-0ubuntu1) precise; urgency=low +gtksourceview3 (3.3.5-1ubuntu1) precise; urgency=low - * New upstream version + * Rebased on Debian, the remaining diff (can be dropped after precise) is: + * debian/control.in: + - updated transition version for the glade catalog being moved between + binaries -- Sebastien Bacher Tue, 20 Mar 2012 13:11:48 +0100 -gtksourceview3 (3.3.4-1ubuntu1) precise; urgency=low +gtksourceview3 (3.3.5-1) experimental; urgency=low - * debian/control.in: updated transition versions for the glade catalog - being moved between binaries + * New upstream development release. + + -- Michael Biebl Tue, 20 Mar 2012 03:57:02 +0100 + +gtksourceview3 (3.3.4-2) experimental; urgency=low + + * Convert to multiarch. - -- Sebastien Bacher Mon, 19 Mar 2012 19:24:16 +0100 + -- Michael Biebl Mon, 19 Mar 2012 17:52:30 +0100 gtksourceview3 (3.3.4-1) experimental; urgency=low diff -Nru gtksourceview3-3.3.5/debian/control gtksourceview3-3.3.5/debian/control --- gtksourceview3-3.3.5/debian/control 2012-03-20 12:12:03.000000000 +0000 +++ gtksourceview3-3.3.5/debian/control 2012-03-21 18:41:01.000000000 +0000 @@ -10,8 +10,8 @@ XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers , Michael Biebl Build-Depends: autotools-dev, - cdbs (>= 0.4.90), - debhelper (>= 8), + cdbs (>= 0.4.93), + debhelper (>= 8.1.3), gnome-pkg-tools (>= 0.7), libgtk-3-dev (>= 3.0.0), libatk1.0-dev (>= 1.32), @@ -30,6 +30,8 @@ Package: libgtksourceview-3.0-0 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgtksourceview-3.0-common (>= ${gnome:Version}), @@ -44,6 +46,7 @@ Package: libgtksourceview-3.0-common Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: common files for the GTK+ syntax highlighting widget GtkSourceView is a text widget that extends the standard GTK+ 3.x text widget diff -Nru gtksourceview3-3.3.5/debian/control.in gtksourceview3-3.3.5/debian/control.in --- gtksourceview3-3.3.5/debian/control.in 2012-03-20 12:11:32.000000000 +0000 +++ gtksourceview3-3.3.5/debian/control.in 2012-03-21 18:40:06.000000000 +0000 @@ -5,8 +5,8 @@ XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: autotools-dev, - cdbs (>= 0.4.90), - debhelper (>= 8), + cdbs (>= 0.4.93), + debhelper (>= 8.1.3), gnome-pkg-tools (>= 0.7), libgtk-3-dev (>= 3.0.0), libatk1.0-dev (>= 1.32), @@ -25,6 +25,8 @@ Package: libgtksourceview-3.0-0 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgtksourceview-3.0-common (>= ${gnome:Version}), @@ -39,6 +41,7 @@ Package: libgtksourceview-3.0-common Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: common files for the GTK+ syntax highlighting widget GtkSourceView is a text widget that extends the standard GTK+ 3.x text widget diff -Nru gtksourceview3-3.3.5/debian/gir1.2-gtksource-3.0.install gtksourceview3-3.3.5/debian/gir1.2-gtksource-3.0.install --- gtksourceview3-3.3.5/debian/gir1.2-gtksource-3.0.install 2012-03-20 12:11:32.000000000 +0000 +++ gtksourceview3-3.3.5/debian/gir1.2-gtksource-3.0.install 2012-03-18 02:07:47.000000000 +0000 @@ -1 +1 @@ -usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0 usr/lib/ diff -Nru gtksourceview3-3.3.5/debian/libgtksourceview-3.0-0.install gtksourceview3-3.3.5/debian/libgtksourceview-3.0-0.install --- gtksourceview3-3.3.5/debian/libgtksourceview-3.0-0.install 2012-03-20 12:11:32.000000000 +0000 +++ gtksourceview3-3.3.5/debian/libgtksourceview-3.0-0.install 2012-03-18 02:07:51.000000000 +0000 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru gtksourceview3-3.3.5/debian/libgtksourceview-3.0-dev.install gtksourceview3-3.3.5/debian/libgtksourceview-3.0-dev.install --- gtksourceview3-3.3.5/debian/libgtksourceview-3.0-dev.install 2012-03-20 12:11:32.000000000 +0000 +++ gtksourceview3-3.3.5/debian/libgtksourceview-3.0-dev.install 2012-03-18 02:08:04.000000000 +0000 @@ -1,6 +1,6 @@ usr/include -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* usr/share/gir-1.0 usr/share/glade diff -Nru gtksourceview3-3.3.5/debian/rules gtksourceview3-3.3.5/debian/rules --- gtksourceview3-3.3.5/debian/rules 2012-03-20 12:11:32.000000000 +0000 +++ gtksourceview3-3.3.5/debian/rules 2012-03-18 02:07:30.000000000 +0000 @@ -10,8 +10,9 @@ GNOME_MODULE = gtksourceview -DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \ - --enable-glade-catalog +DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \ + --enable-glade-catalog \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS += -V -- -c4