Skip to content

Commit 6821ae3

Browse files
authored
some fixes to debian packaging (#635)
- Fix library name for pkgconfig in autopkgtest - d/control: add missed libcinnamon-desktop-dev to libmuffin-dev deps missed increment of breaks/replaces (as rebase was postponed from 5.2 to 5.4 - d/rules: disable wacom in configure for not linux archs
1 parent 69a15a5 commit 6821ae3

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

debian/control

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,12 @@ Package: libmuffin-dev
145145
Section: libdevel
146146
Architecture: any
147147
Multi-Arch: same
148-
Breaks: libmuffin0 (<< 5.1)
149-
Replaces: libmuffin0 (<< 5.1)
148+
Breaks: libmuffin0 (<< 5.3)
149+
Replaces: libmuffin0 (<< 5.3)
150150
Depends: gir1.2-meta-muffin-0.0 (= ${binary:Version}),
151151
libatk1.0-dev,
152152
libcairo2-dev,
153+
libcinnamon-desktop-dev (>= 5.4),
153154
libdrm-dev,
154155
libegl1-mesa-dev,
155156
libgdk-pixbuf2.0-dev,

debian/copyright

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2-
Source: https://download.gnome.org/sources/mutter/
2+
Upstream-Name: muffin
3+
Upstream-Contact: Linux Mint Project <[email protected]>
4+
Source: https://github.com/linuxmint/muffin
35

46
Files:
57
*

debian/rules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ CONFFLAGS = \
1616
ifneq ($(DEB_HOST_ARCH_OS),linux)
1717
CONFFLAGS += \
1818
-Dudev=false \
19-
-Dcore_tests=false
19+
-Dcore_tests=false \
20+
-Dlibwacom=false
2021
endif
2122

2223
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))

debian/tests/libmuffin-dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ EOF
3434

3535
# Deliberately word-splitting pkg-config's output:
3636
# shellcheck disable=SC2046
37-
"${CROSS_COMPILE}gcc" -o trivial trivial.c $("${CROSS_COMPILE}pkg-config" --cflags --libs libmuffin)
37+
"${CROSS_COMPILE}gcc" -o trivial trivial.c $("${CROSS_COMPILE}pkg-config" --cflags --libs libmuffin-0)
3838
echo "build: OK"
3939
[ -x trivial ]
4040
xvfb-run -a dbus-run-session -- ./trivial

0 commit comments

Comments
 (0)