r54551 - in /desktop/unstable/glade/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Mon Oct 23 01:20:36 2017
New Revision: 54551

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54551
Log:
Bump Standards-Version to 4.1.1

Modified:
    desktop/unstable/glade/debian/changelog
    desktop/unstable/glade/debian/control
    desktop/unstable/glade/debian/control.in
    desktop/unstable/glade/debian/rules

Modified: desktop/unstable/glade/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/changelog?rev=54551&op=diff
==============================================================================
--- desktop/unstable/glade/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glade/debian/changelog	[utf-8] Mon Oct 23 01:20:36 2017
@@ -5,6 +5,7 @@
   * debian/libgladeui-2-6.symbols: Drop private marshal symbol
   * Drop Use_g_ptr_array_find_from_glib.patch:
     - Issue is fixed differently in new version
+  * Bump Standards-Version to 4.1.1
 
  -- Jeremy Bicha <jbicha at debian.org>  Sun, 22 Oct 2017 20:08:11 -0400
 

Modified: desktop/unstable/glade/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/control?rev=54551&op=diff
==============================================================================
--- desktop/unstable/glade/debian/control	[utf-8] (original)
+++ desktop/unstable/glade/debian/control	[utf-8] Mon Oct 23 01:20:36 2017
@@ -6,10 +6,11 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glade
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glade
 Build-Depends: debhelper (>= 10),
+               docbook-xsl,
                gnome-pkg-tools (>= 0.10),
                gnome-common,
                libxml2-dev (>= 2.4.0),
@@ -17,15 +18,15 @@
                libgtk-3-dev (>= 3.20.0),
                python-gi-dev (>= 2.90.4),
                python2.7-dev,
-               gtk-doc-tools (>= 1.13),
+               gtk-doc-tools (>= 1.13) <!nodoc>,
                yelp-tools,
                intltool (>= 0.41.0),
                gobject-introspection (>= 1.32.0),
                libgirepository1.0-dev (>= 0.10.1)
 Build-Depends-Indep: libglib2.0-doc <!nodoc>,
                      libgtk-3-doc <!nodoc>
-Standards-Version: 4.1.0
-Homepage: http://glade.gnome.org/
+Standards-Version: 4.1.1
+Homepage: https://glade.gnome.org/
 
 Package: libgladeui-2-6
 Architecture: any
@@ -33,7 +34,7 @@
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgladeui-common (= ${source:Version})
+         libgladeui-common (>= ${source:Version})
 Conflicts: libgladeui-2-0, libgladeui-2-4
 Replaces: libgladeui-2-0, libgladeui-2-4
 Description: GTK+ User Interface Build core library

Modified: desktop/unstable/glade/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/control.in?rev=54551&op=diff
==============================================================================
--- desktop/unstable/glade/debian/control.in	[utf-8] (original)
+++ desktop/unstable/glade/debian/control.in	[utf-8] Mon Oct 23 01:20:36 2017
@@ -6,6 +6,7 @@
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glade
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glade
 Build-Depends: debhelper (>= 10),
+               docbook-xsl,
                gnome-pkg-tools (>= 0.10),
                gnome-common,
                libxml2-dev (>= 2.4.0),
@@ -13,15 +14,15 @@
                libgtk-3-dev (>= 3.20.0),
                python-gi-dev (>= 2.90.4),
                python2.7-dev,
-               gtk-doc-tools (>= 1.13),
+               gtk-doc-tools (>= 1.13) <!nodoc>,
                yelp-tools,
                intltool (>= 0.41.0),
                gobject-introspection (>= 1.32.0),
                libgirepository1.0-dev (>= 0.10.1)
 Build-Depends-Indep: libglib2.0-doc <!nodoc>,
                      libgtk-3-doc <!nodoc>
-Standards-Version: 4.1.0
-Homepage: http://glade.gnome.org/
+Standards-Version: 4.1.1
+Homepage: https://glade.gnome.org/
 
 Package: libgladeui-2-6
 Architecture: any
@@ -29,7 +30,7 @@
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgladeui-common (= ${source:Version})
+         libgladeui-common (>= ${source:Version})
 Conflicts: libgladeui-2-0, libgladeui-2-4
 Replaces: libgladeui-2-0, libgladeui-2-4
 Description: GTK+ User Interface Build core library

Modified: desktop/unstable/glade/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/rules?rev=54551&op=diff
==============================================================================
--- desktop/unstable/glade/debian/rules	[utf-8] (original)
+++ desktop/unstable/glade/debian/rules	[utf-8] Mon Oct 23 01:20:36 2017
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+ifneq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+	ENABLE_DOCS = --enable-gtk-doc
+endif
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
@@ -8,9 +12,7 @@
 	dh $@ --with gnome
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-			--enable-gtk-doc \
-			--disable-scrollkeeper
+	dh_auto_configure -- $(ENABLE_DOCS)
 
 override_dh_autoreconf:
 	dh_autoreconf --as-needed