Skip to content

Commit

Permalink
Merge pull request #140 from maxyz/cinnamon-screensaver_gnome-common
Browse files Browse the repository at this point in the history
Cinnamon screensaver gnome common finish migration
  • Loading branch information
clefebvre committed Oct 7, 2016
2 parents 6fa05cf + 31cef74 commit f2a4cbf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 0 additions & 1 deletion autogen.sh
Expand Up @@ -23,7 +23,6 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
fi

aclocal --install || exit 1
glib-gettextize --force --copy || exit 1
intltoolize --force --copy --automake || exit 1
autoreconf --verbose --force --install || exit 1

Expand Down
5 changes: 4 additions & 1 deletion configure.ac
Expand Up @@ -10,13 +10,16 @@ PKG_PROG_PKG_CONFIG([0.26])
AC_CONFIG_MACRO_DIR([m4])
AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"])

## AX_IS_RELEASE([git-directory])
m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])])

AC_CONFIG_SRCDIR(src/cinnamon-screensaver-main.py)

AM_INIT_AUTOMAKE([1.7 no-dist-gzip dist-xz])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

m4_ifdef([AX_COMPILER_FLAGS],
[AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])])

LT_INIT([disable-static])

AC_CONFIG_HEADERS(config.h)
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Expand Up @@ -2,11 +2,11 @@ Source: cinnamon-screensaver
Section: x11
Priority: optional
Maintainer: Linux Mint <root@linuxmint.com>
Build-Depends: debhelper (>= 9),
Build-Depends: autoconf-archive,
debhelper (>= 9),
devscripts,
dh-autoreconf,
dh-python,
gnome-common,
librsvg2-bin,
python-rsvg,
libglib2.0-dev,
Expand Down

0 comments on commit f2a4cbf

Please sign in to comment.