From b2308fd9deb2675e830141641d764844d76efbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 15 Jan 2015 19:12:15 +0100 Subject: Bump Standards-Version to 3.9.6 --- .gitignore | 2 + .pc/.dpkg-source-unapply | 0 .pc/.quilt_patches | 1 - .pc/.quilt_series | 1 - .pc/.version | 1 - .pc/001-gee-0.8.patch/CMakeLists.txt | 231 ----------------------------------- .pc/applied-patches | 1 - debian/changelog | 2 + debian/control | 2 +- 9 files changed, 5 insertions(+), 236 deletions(-) delete mode 100644 .pc/.dpkg-source-unapply delete mode 100644 .pc/.quilt_patches delete mode 100644 .pc/.quilt_series delete mode 100644 .pc/.version delete mode 100644 .pc/001-gee-0.8.patch/CMakeLists.txt delete mode 100644 .pc/applied-patches diff --git a/.gitignore b/.gitignore index 0ebfa9b..bf4ed06 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ Makefile .valencia *~ gnome-pie.sublime-workspace +.pc +.gitignore \ No newline at end of file diff --git a/.pc/.dpkg-source-unapply b/.pc/.dpkg-source-unapply deleted file mode 100644 index e69de29..0000000 diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches deleted file mode 100644 index 6857a8d..0000000 --- a/.pc/.quilt_patches +++ /dev/null @@ -1 +0,0 @@ -debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series deleted file mode 100644 index c206706..0000000 --- a/.pc/.quilt_series +++ /dev/null @@ -1 +0,0 @@ -series diff --git a/.pc/.version b/.pc/.version deleted file mode 100644 index 0cfbf08..0000000 --- a/.pc/.version +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/.pc/001-gee-0.8.patch/CMakeLists.txt b/.pc/001-gee-0.8.patch/CMakeLists.txt deleted file mode 100644 index 9e06bc7..0000000 --- a/.pc/001-gee-0.8.patch/CMakeLists.txt +++ /dev/null @@ -1,231 +0,0 @@ -################################################################ -# Project Gnome-Pie -################################################################ - -project("gnomepie" C) - -cmake_minimum_required(VERSION 2.6) - -# Location where cmake first looks for modules. -list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala) - -################################################################ -# Find Vala -################################################################ - -include(ValaPrecompile) -include(ValaVersion) - -find_package(Vala) -ensure_vala_version("0.11.0" MINIMUM) - -################################################################ -# Configure and find libraries -################################################################ - -find_package(PkgConfig) - -# check whether GTK3 is supported -pkg_check_modules(GTK3 gtk+-3.0) - -if (${GTK3_FOUND}) - pkg_check_modules(INDICATOR3 appindicator3-0.1) - pkg_check_modules(UNIQUE REQUIRED unique-3.0) - pkg_check_modules(WNCK REQUIRED libwnck-3.0) - pkg_check_modules(BAMF REQUIRED libbamf3) -else (${GTK3_FOUND}) - pkg_check_modules(GTK2 REQUIRED gtk+-2.0) - pkg_check_modules(INDICATOR appindicator-0.1) - pkg_check_modules(UNIQUE REQUIRED unique-1.0) - pkg_check_modules(WNCK REQUIRED libwnck-1.0) - pkg_check_modules(BAMF REQUIRED libbamf) -endif (${GTK3_FOUND}) - -pkg_check_modules(GIO REQUIRED gio-unix-2.0) -pkg_check_modules(CAIRO REQUIRED cairo) -pkg_check_modules(GEE REQUIRED gee-1.0) -pkg_check_modules(X11 REQUIRED x11) -pkg_check_modules(XML REQUIRED libxml-2.0) -pkg_check_modules(XTST REQUIRED xtst) -pkg_check_modules(GMENU3 libgnome-menu-3.0) - -find_library(M_LIB m) -find_library(GTHREAD_LIB gthread-2.0) - -set(CFLAGS - ${GIO_CFLAGS} - ${GTK2_CFLAGS} ${GTK2_CFLAGS_OTHER} - ${GTK3_CFLAGS} ${GTK3_CFLAGS_OTHER} - ${CAIRO_CFLAGS} ${CAIRO_CFLAGS_OTHER} - ${GEE_CFLAGS} ${CAIRO_CFLAGS_OTHER} - ${X11_CFLAGS} ${X11_CFLAGS_OTHER} - -DGMENU_I_KNOW_THIS_IS_UNSTABLE - -DWNCK_I_KNOW_THIS_IS_UNSTABLE - -DGETTEXT_PACKAGE="gnomepie" - -s -O3 -w -# -g -) - -# fallback to gtk2 if gtk3 wasn't found -if (${GTK3_FOUND}) - LIST(APPEND CFLAGS -DHAVE_GTK_3) -endif (${GTK3_FOUND}) - -# fallback to gnome-menus2 if gnome-menus3 wasn't found -if (${GMENU3_FOUND}) - LIST(APPEND CFLAGS -DHAVE_GMENU_3) -else (${GMENU3_FOUND}) - pkg_check_modules(GMENU REQUIRED libgnome-menu) -endif (${GMENU3_FOUND}) - -# notify application of presence of libappindicator -if (${INDICATOR_FOUND}) - LIST(APPEND CFLAGS -DHAVE_APPINDICATOR) -endif (${INDICATOR_FOUND}) -if (${INDICATOR3_FOUND}) - LIST(APPEND CFLAGS -DHAVE_APPINDICATOR) -endif (${INDICATOR3_FOUND}) - -add_definitions(${CFLAGS}) - -set(LIBS - ${GIO_LIBRARIES} - ${GTK2_LIBRARIES} - ${GTK3_LIBRARIES} - ${CAIRO_LIBRARIES} - ${GEE_LIBRARIES} - ${INDICATOR_LIBRARIES} - ${INDICATOR3_LIBRARIES} - ${XML_LIBRARIES} - ${XTST_LIBRARIES} - ${GMENU_LIBRARIES} - ${GMENU3_LIBRARIES} - ${UNIQUE_LIBRARIES} - ${X11_LIBRARIES} - ${WNCK_LIBRARIES} - ${BAMF_LIBRARIES} - ${M_LIB} - ${GTHREAD_LIB} -) -link_libraries(${LIBS}) - -set(LIB_PATHS - ${GIO_LIBRARY_DIRS} - ${GTK2_LIBRARY_DIRS} - ${GTK3_LIBRARY_DIRS} - ${CAIRO_LIBRARY_DIRS} - ${GEE_LIBRARY_DIRS} - ${INDICATOR_LIBRARY_DIRS} - ${INDICATOR3_LIBRARY_DIRS} - ${XML_LIBRARY_DIRS} - ${XTST_LIBRARY_DIRS} - ${GMENU_LIBRARY_DIRS} - ${GMENU3_LIBRARY_DIRS} - ${UNIQUE_LIBRARY_DIRS} - ${X11_LIBRARY_DIRS} - ${WNCK_LIBRARY_DIRS} - ${BAMF_LIBRARY_DIRS} -) -link_directories(${LIB_PATHS}) - -set(INCLUDE_PATHS - ${GIO_INCLUDE_DIRS} - ${GTK2_INCLUDE_DIRS} - ${GTK3_INCLUDE_DIRS} - ${CAIRO_INCLUDE_DIRS} - ${GEE_INCLUDE_DIRS} - ${INDICATOR_INCLUDE_DIRS} - ${INDICATOR3_INCLUDE_DIRS} - ${XML_INCLUDE_DIRS} - ${XTST_INCLUDE_DIRS} - ${GMENU_INCLUDE_DIRS} - ${GMENU3_INCLUDE_DIRS} - ${UNIQUE_INCLUDE_DIRS} - ${X11_INCLUDE_DIRS} - ${BAMF_INCLUDE_DIRS} - ${WNCK_INCLUDE_DIRS} -) -include_directories(${INCLUDE_PATHS}) - -################################################################ -# Add executable -################################################################ - -set(EXECUTABLE_OUTPUT_PATH ${gnomepie_SOURCE_DIR}) - -set(VALA_PKGS - cairo - gee-1.0 - x11 - gio-unix-2.0 - posix - libxml-2.0 - xtst -) - -if (${INDICATOR_FOUND}) - LIST(APPEND VALA_PKGS appindicator-0.1) -endif (${INDICATOR_FOUND}) - -if (${INDICATOR3_FOUND}) - LIST(APPEND VALA_PKGS appindicator3-0.1) -endif (${INDICATOR3_FOUND}) - -if (${GMENU3_FOUND}) - LIST(APPEND VALA_PKGS libgnome-menu-3.0) -else (${GMENU3_FOUND}) - LIST(APPEND VALA_PKGS libgnome-menu) -endif (${GMENU3_FOUND}) - -if (${GTK3_FOUND}) - LIST(APPEND VALA_PKGS gtk+-3.0) - LIST(APPEND VALA_PKGS gdk-x11-3.0) - LIST(APPEND VALA_PKGS libbamf3) - LIST(APPEND VALA_PKGS libwnck-3.0) - LIST(APPEND VALA_PKGS unique-3.0) -else (${GTK3_FOUND}) - LIST(APPEND VALA_PKGS gtk+-2.0) - LIST(APPEND VALA_PKGS gdk-x11-2.0) - LIST(APPEND VALA_PKGS bamf) - LIST(APPEND VALA_PKGS libwnck-1.0) - LIST(APPEND VALA_PKGS unique-1.0) -endif (${GTK3_FOUND}) - -add_subdirectory(src) - -################################################################ -# Add uninstall option -################################################################ - -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/CMake_Uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/CMake_Uninstall.cmake" - IMMEDIATE @ONLY) - -add_custom_target(uninstall - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/CMake_Uninstall.cmake) - -################################################################ -# Summary -################################################################ - -message( "" ) -message( "Summary:" ) -message( " EXECUTABLE_OUTPUT_PATH = ${EXECUTABLE_OUTPUT_PATH}" ) -message( " VALA_EXECUTABLE = ${VALA_EXECUTABLE}" ) -message( "Libs:" ) -message( " GTK2_LIBRARIES = ${GTK2_LIBRARIES}" ) -message( " GTK3_LIBRARIES = ${GTK3_LIBRARIES}" ) -message( " CAIRO_LIBRARIES = ${CAIRO_LIBRARIES}" ) -message( " GEE_LIBRARIES = ${GEE_LIBRARIES}" ) -message( " INDICATOR_LIBRARIES = ${INDICATOR_LIBRARIES}" ) -message( " INDICATOR3_LIBRARIES = ${INDICATOR3_LIBRARIES}" ) -message( " XML_LIBRARIES = ${XML_LIBRARIES}" ) -message( " XTST_LIBRARIES = ${XTST_LIBRARIES}" ) -message( " GMENU_LIBRARIES = ${GMENU_LIBRARIES}" ) -message( " GMENU3_LIBRARIES = ${GMENU3_LIBRARIES}" ) -message( " UNIQUE_LIBRARIES = ${UNIQUE_LIBRARIES}" ) -message( " X11_LIBRARIES = ${X11_LIBRARIES}" ) -message( " BAMF_LIBRARIES = ${BAMF_LIBRARIES}" ) -message( " WNCK_LIBRARIES = ${WNCK_LIBRARIES}" ) -message( "" ) diff --git a/.pc/applied-patches b/.pc/applied-patches deleted file mode 100644 index eb5e810..0000000 --- a/.pc/applied-patches +++ /dev/null @@ -1 +0,0 @@ -001-gee-0.8.patch diff --git a/debian/changelog b/debian/changelog index ccfe545..0026fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ gnome-pie (0.5.6-1) UNRELEASED; urgency=medium * New upstream release. + * debian/control: + - Bump Standards-Version to 3.9.6 (no changes required). -- Jörg Frings-Fürst Thu, 15 Jan 2015 18:50:10 +0100 diff --git a/debian/control b/debian/control index 93708ff..e530200 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libxml2-dev, libxtst-dev, valac (>= 0.22) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://gnome-pie.simonschneegans.de/ Vcs-Git: git://anonscm.debian.org/collab-maint/gnome-pie.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gnome-pie.git -- cgit v1.2.3