summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog22
-rw-r--r--debian/compat1
-rw-r--r--debian/control51
-rw-r--r--debian/control.in49
-rwxr-xr-xdebian/rules7
-rw-r--r--debian/upstream/metadata6
-rw-r--r--debian/watch5
7 files changed, 74 insertions, 67 deletions
diff --git a/debian/changelog b/debian/changelog
index 8132822d..5902ea5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+gnome-themes-extra (3.28-2) unstable; urgency=medium
+
+ * Team upload
+ * Remove transitional package gnome-themes-standard.
+ This was already transitional in buster and bullseye, and nothing
+ depends on it, so it can be removed now.
+ * Build-depend on libgdk-pixbuf-2.0-dev, available since Debian 11,
+ instead of transitional libgdk-pixbuf2.0-dev
+ * d/control.in: Mention the Adwaita-dark GTK 3 theme (Closes: #955328)
+ * d/control.in: Consistently refer to GTK as GTK, not GTK+.
+ The project's official name no longer contains the "+".
+ * Use recommended dh compat level 13
+ - Drop dh_missing override, --fail-missing is now the default
+ * d/rules: Use GNOME dh sequence via dh-sequence-gnome
+ * Set Rules-Requires-Root to no
+ * d/control.in: Remove obsolete Breaks/Conflicts/Replaces
+ * d/upstream/metadata: Add
+ * Standards-Version: 4.6.1 (no changes required)
+ * Avoid explicitly specifying -Wl,--as-needed linker flag
+
+ -- Simon McVittie <smcv@debian.org> Thu, 08 Sep 2022 11:40:11 +0100
+
gnome-themes-extra (3.28-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de3947..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 2eae0eaf..f25675fb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,18 +6,19 @@ Source: gnome-themes-extra
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Dmitry Shachnev <mitya57@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 11),
- gnome-pkg-tools (>= 0.10),
+Uploaders: Dmitry Shachnev <mitya57@debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper-compat (= 13),
+ dh-sequence-gnome,
intltool (>= 0.40.0),
libgtk-3-dev (>= 3.9.12),
libgtk2.0-dev (>= 2.24.15),
gtk-update-icon-cache,
libcairo2-dev,
- libgdk-pixbuf2.0-dev,
+ libgdk-pixbuf-2.0-dev,
libglib2.0-dev,
librsvg2-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.6.1
+Rules-Requires-Root: no
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-themes-extra
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-themes-extra.git
@@ -31,13 +32,11 @@ Depends: gnome-themes-extra-data (>= ${source:Version}),
gtk2-engines-pixbuf
Recommends: gnome-accessibility-themes,
adwaita-icon-theme (>= 3.18.0-2~)
-Breaks: gnome-themes-standard (<= 3.27.90.1)
-Replaces: gnome-themes-standard (<= 3.27.90.1)
-Description: Adwaita GTK+ 2 theme — engine
+Description: Adwaita GTK 2 theme — engine
This is the version of Adwaita, the standard GNOME theme, for the
- GTK+ 2.x toolkit.
+ GTK 2.x toolkit.
.
- The GTK+ 3.x version is already included in libgtk-3-0.
+ The GTK 3.x version is already included in libgtk-3-0.
.
This package contains the Adwaita theme engine.
@@ -45,31 +44,23 @@ Package: gnome-themes-extra-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Conflicts: gnome-themes-standard-data
-Replaces: gnome-themes-standard-data
-Description: Adwaita GTK+ 2 theme — common files
- This is the version of Adwaita, the standard GNOME theme, for the
- GTK+ 2.x toolkit.
- .
- The GTK+ 3.x version is already included in libgtk-3-0.
+Description: Adwaita GTK 2 theme and Adwaita-dark GTK 3 theme — common files
+ This package contains the common architecture-independent files for
+ Adwaita, the standard GNOME theme, for the GTK 2 toolkit. The GTK 3
+ equivalent is already included in libgtk-3-0.
.
- This package contains the common architecture-independent files.
+ This package also makes the dark variant of Adwaita available for GTK
+ 3 as a separate Adwaita-dark theme. In newer versions of GTK 3, this
+ has been superseded by the ability for a single theme to provide both
+ light and dark variants, which can be selected in the Appearance panel
+ of GNOME's Settings application (gnome-control-center).
Package: gnome-accessibility-themes
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Description: High Contrast GTK+ 2 theme and icons
+Description: High Contrast GTK 2 theme and icons
This is the version of GNOME's standard HighContrast theme, for the
- GTK+ 2.x toolkit. An icon theme is also included.
+ GTK 2.x toolkit. An icon theme is also included.
.
- The GTK+ 3.x version is already included in libgtk-3-0.
-
-Package: gnome-themes-standard
-Architecture: all
-Section: oldlibs
-Depends: ${misc:Depends},
- gnome-themes-extra
-Description: Adwaita GTK+ 2 theme — engine - transitional package
- This package is here to ensure smooth upgrades. It can be removed when
- you see fit.
+ The GTK 3.x version is already included in libgtk-3-0.
diff --git a/debian/control.in b/debian/control.in
index 99e1ef10..3ceeec43 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,17 +3,18 @@ Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 11),
- gnome-pkg-tools (>= 0.10),
+Build-Depends: debhelper-compat (= 13),
+ dh-sequence-gnome,
intltool (>= 0.40.0),
libgtk-3-dev (>= 3.9.12),
libgtk2.0-dev (>= 2.24.15),
gtk-update-icon-cache,
libcairo2-dev,
- libgdk-pixbuf2.0-dev,
+ libgdk-pixbuf-2.0-dev,
libglib2.0-dev,
librsvg2-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.6.1
+Rules-Requires-Root: no
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-themes-extra
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-themes-extra.git
@@ -27,13 +28,11 @@ Depends: gnome-themes-extra-data (>= ${source:Version}),
gtk2-engines-pixbuf
Recommends: gnome-accessibility-themes,
adwaita-icon-theme (>= 3.18.0-2~)
-Breaks: gnome-themes-standard (<= 3.27.90.1)
-Replaces: gnome-themes-standard (<= 3.27.90.1)
-Description: Adwaita GTK+ 2 theme — engine
+Description: Adwaita GTK 2 theme — engine
This is the version of Adwaita, the standard GNOME theme, for the
- GTK+ 2.x toolkit.
+ GTK 2.x toolkit.
.
- The GTK+ 3.x version is already included in libgtk-3-0.
+ The GTK 3.x version is already included in libgtk-3-0.
.
This package contains the Adwaita theme engine.
@@ -41,31 +40,23 @@ Package: gnome-themes-extra-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Conflicts: gnome-themes-standard-data
-Replaces: gnome-themes-standard-data
-Description: Adwaita GTK+ 2 theme — common files
- This is the version of Adwaita, the standard GNOME theme, for the
- GTK+ 2.x toolkit.
- .
- The GTK+ 3.x version is already included in libgtk-3-0.
+Description: Adwaita GTK 2 theme and Adwaita-dark GTK 3 theme — common files
+ This package contains the common architecture-independent files for
+ Adwaita, the standard GNOME theme, for the GTK 2 toolkit. The GTK 3
+ equivalent is already included in libgtk-3-0.
.
- This package contains the common architecture-independent files.
+ This package also makes the dark variant of Adwaita available for GTK
+ 3 as a separate Adwaita-dark theme. In newer versions of GTK 3, this
+ has been superseded by the ability for a single theme to provide both
+ light and dark variants, which can be selected in the Appearance panel
+ of GNOME's Settings application (gnome-control-center).
Package: gnome-accessibility-themes
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Description: High Contrast GTK+ 2 theme and icons
+Description: High Contrast GTK 2 theme and icons
This is the version of GNOME's standard HighContrast theme, for the
- GTK+ 2.x toolkit. An icon theme is also included.
+ GTK 2.x toolkit. An icon theme is also included.
.
- The GTK+ 3.x version is already included in libgtk-3-0.
-
-Package: gnome-themes-standard
-Architecture: all
-Section: oldlibs
-Depends: ${misc:Depends},
- gnome-themes-extra
-Description: Adwaita GTK+ 2 theme — engine - transitional package
- This package is here to ensure smooth upgrades. It can be removed when
- you see fit.
+ The GTK 3.x version is already included in libgtk-3-0.
diff --git a/debian/rules b/debian/rules
index 5f94b1f0..d0c05215 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,10 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs
%:
- dh $@ --with gnome
+ dh $@
override_dh_autoreconf:
dh_autoreconf --as-needed
@@ -14,8 +14,5 @@ override_dh_install:
find debian/tmp -name '*.la' -print -delete
dh_install
-override_dh_missing:
- dh_missing --fail-missing
-
override_dh_shlibdeps:
dh_shlibdeps -- -xlibgtk2.0-0
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..f444dc1d
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,6 @@
+---
+Name: GNOME Extra Themes
+Bug-Database: https://gitlab.gnome.org/GNOME/gnome-themes-extra/-/issues
+Bug-Submit: https://gitlab.gnome.org/GNOME/gnome-themes-extra/-/issues/new
+Repository: https://gitlab.gnome.org/GNOME/gnome-themes-extra.git
+Repository-Browse: https://gitlab.gnome.org/GNOME/gnome-themes-extra
diff --git a/debian/watch b/debian/watch
index ac388170..64675b41 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
- @PACKAGE@@ANY_VERSION@\.tar\.xz
+opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/, downloadurlmangle=s|cache.json||" \
+https://download.gnome.org/sources/@PACKAGE@/cache.json \
+ [\d.]+/@PACKAGE@-([\d.]+)@ARCHIVE_EXT@
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 08:39:28 +0000