Control: tags -1 + patch
Hello!
After importing the new (1.8.0) upstream release using:
gbp import-orig --uscan --pristine-tar
The packaging can be updated by applying the attached patches:
git am $ATTACHED_PATCHES
And updating debian/changelog:
gbp dch --auto
dch -r
HTH.
Regards,
Andreas Henriksson
>From d40c220668c7812a0e74893d4047f436e1cb614e Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Thu, 4 Jan 2018 21:19:57 +0100
Subject: [PATCH 1/4] Update debian/changelog
---
debian/changelog | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 10e4805..bacb302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-gnome-commander (1.4.8-1.1) UNRELEASED; urgency=medium
+gnome-commander (1.8.0-1) UNRELEASED; urgency=medium
+ [ Jeremy Bicha ]
* Non-maintainer upload.
* Build-Depend on python3-scour to fix build failure with latest scour
* Drop obsolete Build-Depends on rarian-compat (Closes: #885640)
* Don't suggest gnome-user-guide (Closes: #879561) (LP: #1691867)
- -- Jeremy Bicha <jbi...@debian.org> Thu, 28 Dec 2017 14:02:42 -0500
+ [ Andreas Henriksson ]
+ * New upstream release (Closes: #878021)
+
+ -- Andreas Henriksson <andr...@fatal.se> Thu, 04 Jan 2018 21:17:54 +0100
gnome-commander (1.4.8-1) unstable; urgency=medium
--
2.15.1
>From 9b1cbfe2f5c9e83070e69de4a63c9e735f5bcd89 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Thu, 4 Jan 2018 21:20:06 +0100
Subject: [PATCH 2/4] Update build-dependencies according to upstream changes
- drop intltool and gnome-doc-utils
- add yelp-tools
- bump version of glib and gtk+
Gbp-Dch: Full
---
debian/control | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 172f11e..fd30484 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,13 @@ Uploaders:
Build-Depends:
debhelper (>= 9~),
dh-autoreconf,
- gnome-doc-utils,
- intltool,
+ yelp-tools,
libexiv2-dev (>= 0.14),
- libglib2.0-dev (>= 2.0),
+ libglib2.0-dev (>= 2.44.0),
libgnome2-dev (>= 2.0),
libgnomeui-dev (>= 2.4),
libgnomevfs2-dev (>= 2.0),
- libgtk2.0-dev (>= 2.8),
+ libgtk2.0-dev (>= 2.18.0),
libpoppler-glib-dev,
libssl-dev,
libtag1-dev (>= 1.4),
--
2.15.1
>From dbd578f33d07d21d58c411cef26c839c98d2be7a Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Thu, 4 Jan 2018 21:42:30 +0100
Subject: [PATCH 3/4] Add recommends on gnome-icon-theme
If gnome-icon-theme is not installed:
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-home' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-home' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-home' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-network' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-network' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-network' not present in theme
** (gnome-commander:27014): CRITICAL **: void load_devices(const gchar*): assertion 'keyfile != NULL' failed
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-ftp' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-ftp' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-ftp' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-ftp' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-ftp' not present in theme
** (gnome-commander:27014): WARNING **: Couldn't load icon: Icon 'gnome-fs-ftp' not present in theme
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index fd30484..571a82b 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Depends:
${misc:Depends},
${python:Depends},
${shlibs:Depends}
+Recommends: gnome-icon-theme
Suggests:
libgnomevfs2-extra,
meld
--
2.15.1
>From 3b12885a1d16606e51931eb416e6c9c447b52038 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Thu, 4 Jan 2018 21:44:20 +0100
Subject: [PATCH 4/4] Drop gnome-commander-dbg and do dbgsym migration
Automatic dbgsym packages are built these days and having
dedicated -dbg packages is deprecated. Drop the -dbg
package and tell debhelper (dh_strip) to insert the
proper migration code.
---
debian/control | 14 --------------
debian/rules | 2 +-
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/debian/control b/debian/control
index 571a82b..b4d2c5e 100644
--- a/debian/control
+++ b/debian/control
@@ -59,17 +59,3 @@ Description: Data files for GNOME Commander
the tradition of Norton and Midnight Commander.
.
This package contains the data files for gnome-commander.
-
-Package: gnome-commander-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- gnome-commander (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for gnome-commander
- GNOME Commander is a fast and powerful graphical filemanager for the GNOME
- desktop environment, it has a "two-pane" interface in the tradition of
- Norton and Midnight Commander.
- .
- This package contains the debugging symbols for gnome-commander.
diff --git a/debian/rules b/debian/rules
index b4364e2..56e154c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_install:
override_dh_auto_test:
override_dh_strip:
- dh_strip --dbg-package=gnome-commander-dbg
+ dh_strip --dbgsym-migration='gnome-commander-dbg (<< 1.8.0)'
override_dh_makeshlibs:
dh_makeshlibs -n
--
2.15.1
