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.

Sign up for GitHub

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

Jump to bottom

Fixes #6355: Update rudder-agent-thin Debian packages #641

Merged
merged 1 commit into from
Apr 27, 2015
Merged

Fixes #6355: Update rudder-agent-thin Debian packages #641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 23 additions & 19 deletions ...hin/SOURCES/patches/rudder-agent-thin/0001-rudder-agent-to-rudder-agent-thin-debian.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
diff -Naur a/changelog b/changelog
--- a/changelog 2014-06-25 12:19:12.664938161 +0200
+++ b/changelog 2014-12-08 15:09:17.030590768 +0100
diff --git a/changelog b/changelog
index def9006..3758608 100644
--- a/changelog
+++ b/changelog
@@ -1,23 +1,6 @@
-rudder-agent (2.3.0~alpha~git-0) lenny; urgency=low
+rudder-agent-thin (2.11.0~git-0) wheezy; urgency=low
Expand Down Expand Up @@ -29,23 +30,24 @@ diff -Naur a/changelog b/changelog
-
- -- Nicolas Perron <nicolas.perrone@normation.com> Wed, 23 Feb 2011 18:16:27 +0100
+ -- Matthieu CERDA <matthieu.cerda@normation.com> Fri, 30 May 2014 16:55:27 +0200
diff -Naur a/control b/control
--- a/control 2014-12-08 14:47:17.772369560 +0100
+++ b/control 2014-12-08 15:09:17.030590768 +0100
diff --git a/control b/control
index 15880ec..cbf4500 100644
--- a/control
+++ b/control
@@ -1,4 +1,4 @@
-Source: rudder-agent
+Source: rudder-agent-thin
Section: admin
Priority: extra
Maintainer: Rudder packaging team <rudder-packaging@rudder-project.org>
@@ -6,19 +6,13 @@
@@ -6,19 +6,13 @@ Build-Depends: debhelper (>= 7), libssl-dev, bison, gcc, flex, autoconf, automak
Standards-Version: 3.8.0
Homepage: http://www.rudder-project.org

-Package: rudder-agent
+Package: rudder-agent-thin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, uuid-runtime, dmidecode, cron, net-tools
-Depends: ${shlibs:Depends}, ${misc:Depends}, uuid-runtime, dmidecode, cron, net-tools, openssl
-# The dependencies below are defined in order to use rudder-agent
-# for the server. This will add capabilities to send inventories
-# from the server itself.
Expand All @@ -54,7 +56,7 @@ diff -Naur a/control b/control
-Replaces: rudder-cfengine-community, rudder-server-root (<< 2.4.0~beta2)
-Breaks: rudder-server-root (<< 2.4.0~beta2)
-Description: Configuration management and audit tool - agent
+Depends: ${shlibs:Depends}, ${misc:Depends}, uuid-runtime, dmidecode, cron, net-tools, fusioninventory-agent
+Depends: ${shlibs:Depends}, ${misc:Depends}, uuid-runtime, dmidecode, cron, net-tools, openssl, fusioninventory-agent
+Provides: rudder-agent
+Conflicts: rudder-agent
+Description: Configuration management and audit tool
Expand All @@ -64,9 +66,10 @@ diff -Naur a/control b/control
- managed by Rudder. It is based on two main components: CFEngine Community 3 and
- FusionInventory.
+ managed by Rudder. It is based on CFEngine Community.
diff -Naur a/copyright b/copyright
--- a/copyright 2014-06-25 12:19:12.664938161 +0200
+++ b/copyright 2014-12-08 15:09:17.030590768 +0100
diff --git a/copyright b/copyright
index 7930a66..99c1536 100644
--- a/copyright
+++ b/copyright
@@ -1,24 +1,20 @@
This package was debianized by:

Expand Down Expand Up @@ -96,7 +99,7 @@ diff -Naur a/copyright b/copyright

License:

@@ -26,8 +22,3 @@
@@ -26,8 +22,3 @@ License:

On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
Expand All @@ -105,10 +108,11 @@ diff -Naur a/copyright b/copyright
-
- Copyright (C) 2010 Normation SAS
-
diff -Naur a/rules b/rules
--- a/rules 2014-12-08 15:05:20.562188524 +0100
+++ b/rules 2014-12-08 15:09:17.030590768 +0100
@@ -15,8 +15,6 @@
diff --git a/rules b/rules
index 071a2b6..cba53f8 100755
--- a/rules
+++ b/rules
@@ -15,8 +15,6 @@ configure-stamp:
dh_testdir
# dh_prep has been moved from 'install' target since we need to build LMDB first
dh_prep
Expand All @@ -117,7 +121,7 @@ diff -Naur a/rules b/rules
# Compile the LMDB library and install it in /opt/rudder
# LMDB source code does not know how to create destination folders, do it ourselves
for i in bin lib include man/man1; do mkdir -p $(CURDIR)/debian/tmp/opt/rudder/$$i; done
@@ -78,10 +76,9 @@
@@ -83,10 +81,9 @@ binary-arch: install
# dh_installlogrotate
# dh_installmime
# dh_python
Expand All @@ -129,7 +133,7 @@ diff -Naur a/rules b/rules
dh_install --SOURCEDIR=$(CURDIR)/SOURCES run-inventory /opt/rudder/bin
dh_install --SOURCEDIR=$(CURDIR)/SOURCES initial-promises /opt/rudder/share
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-agent-utilities/bin rudder /opt/rudder/bin
@@ -95,9 +92,7 @@
@@ -100,9 +97,7 @@ binary-arch: install
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ check-rudder-agent /opt/rudder/bin/
# Install script to get local processes on VZ systems
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ vzps.py /opt/rudder/bin/
Expand Down