Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean debian #6

Open
wants to merge 32 commits into
base: tilda-debian-1-1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a970396
Add debian/
lanoxx Mar 10, 2013
5dcfbd4
debian/: Fix control VCS fields
lanoxx Mar 10, 2013
861694e
debian/: Clean watch file (must be 3 lines long)
lanoxx Mar 10, 2013
f70a6e0
debian/control: Update build dependencies
lanoxx Mar 10, 2013
42a79c9
debian/copyright: Update to DEP-5
lanoxx Mar 10, 2013
f1fce17
debian/copyright: Update Licence
lanoxx Mar 10, 2013
87db471
debian/copyright: Update Licence
lanoxx Mar 10, 2013
bb051c1
debian/copyright: Update Licence
lanoxx Mar 10, 2013
e333b66
debian/copyright: Update Licence
lanoxx Mar 10, 2013
c5182e3
debian/control: Fix capitalization
lanoxx Mar 10, 2013
d9728c8
debian/: Removing unneed source/options file
lanoxx Mar 10, 2013
0aad5f1
Makefile.am: Update MAINTAINERCLEANFILES
lanoxx Mar 10, 2013
752cd6d
src/Makefile.am: Add MAINTAINERCLEANFILES
lanoxx Mar 10, 2013
2d068b7
Makefile.am: Update maintainercleanfiles
lanoxx Mar 10, 2013
bbef3ac
Add cmake-files.
gladk Mar 10, 2013
17d3053
Add FindGTK3.cmake
gladk Mar 10, 2013
9cc4bb9
Fix VTE-version.
gladk Mar 10, 2013
5f5befd
Cosmetic changes.
gladk Mar 10, 2013
6780d43
Install pixmap-files.
gladk Mar 10, 2013
7f4ede1
Remove autoconf-files.
gladk Mar 10, 2013
a2fe6f1
Fix installation dir of desktop-file.
gladk Mar 10, 2013
aa85b9d
Merge master branch.
gladk Mar 10, 2013
70e3f08
Update and simplify debian-files.
gladk Mar 10, 2013
e58ac50
Add manpages.
gladk Mar 10, 2013
80d0851
Add tilda-config.h
gladk Mar 10, 2013
f3f914c
Merge branch 'master' into debian
gladk Mar 10, 2013
01a31dc
Install tilda.glade
gladk Mar 11, 2013
cd0dbbc
Install locale-files.
gladk Mar 11, 2013
236231e
Return accidentely removed line.
gladk Mar 11, 2013
0444a9d
Use wrap-and-sort.
gladk Mar 11, 2013
7919041
Remove lintian override.
gladk Mar 11, 2013
cf711bb
Merge branch 'master' into debian
gladk Mar 11, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ src/Makefile.in
src/key_converter.c
src/tilda
stamp-h1
tilda-config.h
tilda-config.h.in
tilda-config.h.in~
tilda.desktop
Expand Down
42 changes: 42 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
project(tilda C)
cmake_minimum_required(VERSION 2.8)

#===========================================================
IF(NOT(CMAKE_C_FLAGS))
SET(CMAKE_C_FLAGS "-Wall -Wformat -Wformat-security -Wextra -Wshadow -Wmissing-prototypes -Wmissing-declarations -pedantic")
ENDIF(NOT(CMAKE_C_FLAGS))
#===========================================================
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cMake")

FIND_PACKAGE(glib2 REQUIRED)
FIND_PACKAGE(GTK3 REQUIRED)

SET(_VTE_VERSION_NUM 2.90)
FIND_PACKAGE(VTE REQUIRED)

FIND_PACKAGE(confuse REQUIRED)

#===========================================================
INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS} ${CONFUSE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src)
LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
#===========================================================
SET(BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
SET(DATADIR ${CMAKE_INSTALL_PREFIX}/share/tilda)
SET(PIXMAPSDIR ${CMAKE_INSTALL_PREFIX}/share/tilda/pixmaps)

CONFIGURE_FILE(tilda.desktop.in ${CMAKE_BINARY_DIR}/tilda.desktop)
INSTALL(FILES "${CMAKE_BINARY_DIR}/tilda.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
INSTALL(FILES "${CMAKE_SOURCE_DIR}/tilda.png" DESTINATION ${PIXMAPSDIR}/)
INSTALL(FILES "${CMAKE_SOURCE_DIR}/tilda.glade" DESTINATION ${DATADIR}/)
#===========================================================
INCLUDE(po)
COMPILE_PO_FILES(${CMAKE_SOURCE_DIR}/po MO_FILES)
#===========================================================
ADD_DEFINITIONS(${GTK3_DEFINITIONS})
ADD_DEFINITIONS(-DPACKAGE_NAME="Tilda")
ADD_DEFINITIONS(-DPACKAGE_VERSION="1.5.1")
ADD_DEFINITIONS(-DDATADIR="${DATADIR}")

#===========================================================
ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/src)
#===========================================================
34 changes: 0 additions & 34 deletions Makefile.am

This file was deleted.

47 changes: 0 additions & 47 deletions autogen.sh

This file was deleted.

50 changes: 50 additions & 0 deletions cMake/FindGTK3.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Downloaded from https://github.com/ambientsound/bylarm/blob/master/FindGTK3.cmake
# - Try to find GTK3
#
# $Id$
#
# Once done this will define
#
# GTK3_FOUND - System has GTK3
# GTK3_INCLUDE_DIRS - The GTK3 include directory
# GTK3_LIBRARIES - The libraries needed to use GTK3
# GTK3_DEFINITIONS - Compiler switches required for using GTK3
#=============================================================================
# Copyright 2011 Duncan Mac-Vicar P. <duncan@kde.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)

# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_GTK3 gtk+-3.0 QUIET)
SET(GTK3_DEFINITIONS ${PC_GTK3_CFLAGS_OTHER})

FIND_PATH(GTK3_INCLUDE_DIR NAMES "gtk/gtk.h"
HINTS
${PC_GTK3_INCLUDEDIR}
${PC_GTK3_INCLUDE_DIRS}
PATH_SUFFIXES "gtk-3.0"
)
SET(GTK3_INCLUDE_DIRS ${PC_GTK3_INCLUDE_DIRS})

FIND_LIBRARY(GTK3_LIBRARIES NAMES gtk-3 gtk3
HINTS
${PC_GTK3_LIBDIR}
${PC_GTK3_LIBRARY_DIRS}
)

# handle the QUIETLY and REQUIRED arguments and set GTK3_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_LIBRARIES GTK3_INCLUDE_DIRS)

MARK_AS_ADVANCED(GTK3_INCLUDE_DIRS GTK3_LIBRARIES)
47 changes: 47 additions & 0 deletions cMake/FindVTE.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Downloaded from https://github.com/FreeRDP/Remmina/blob/master/cmake/FindVTE.cmake
#
# Remmina - The GTK+ Remote Desktop Client
#
# Copyright (C) 2011 Marc-Andre Moreau
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330,
# Boston, MA 02111-1307, USA.

if(NOT _VTE_VERSION_NUM)
set(_VTE_LIB_NAME vte)
set(_VTE_VERSION vte)
else()
set(_VTE_LIB_NAME vte${_VTE_VERSION_NUM})
set(_VTE_VERSION vte-${_VTE_VERSION_NUM})
endif()

string(REPLACE . _ _VTE_LIB_NAME ${_VTE_LIB_NAME})

pkg_check_modules(PC_VTE ${_VTE_VERSION})

find_path(VTE_INCLUDE_DIR NAMES vte/vte.h
HINTS ${PC_VTE_INCLUDEDIR} ${PC_VTE_INCLUDE_DIRS}
PATH_SUFFIXES ${_VTE_VERSION})

find_library(VTE_LIBRARY NAMES ${_VTE_LIB_NAME})

include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(VTE DEFAULT_MSG VTE_LIBRARY VTE_INCLUDE_DIR)

set(VTE_LIBRARIES ${VTE_LIBRARY})
set(VTE_INCLUDE_DIRS ${VTE_INCLUDE_DIR})

mark_as_advanced(VTE_INCLUDE_DIR VTE_LIBRARY)
24 changes: 24 additions & 0 deletions cMake/Findconfuse.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Downloaded https://code.google.com/p/cloudscribe/source/browse/trunk/cmake/FindConfuse.cmake?spec=svn2&r=2
#
# - Find CONFUSEapi
# This module defines
# CONFUSE_INCLUDE_DIR, where to find LibEvent headers
# CONFUSE_LIBS, CONFUSE libraries
# CONFUSE_FOUND, If false, do not try to use ant

find_path(CONFUSE_INCLUDE_DIR confuse.h PATHS
/usr/local/include
)

set(CONFUSE_LIB_PATHS /usr/local/lib /opt/CONFUSE-dev/lib)
find_library(CONFUSE_LIB NAMES confuse PATHS ${CONFUSE_LIB_PATHS})

if (CONFUSE_LIB AND CONFUSE_INCLUDE_DIR)
set(CONFUSE_FOUND TRUE)
set(CONFUSE_LIBS ${CONFUSE_LIB})
else ()
set(CONFUSE_FOUND FALSE)
endif ()


FIND_PACKAGE_HANDLE_STANDARD_ARGS(confuse DEFAULT_MSG CONFUSE_LIB CONFUSE_INCLUDE_DIR)