summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Michel Nirgal Vourgère <jmv_deb@nirgal.com>2015-04-29 13:02:37 +0200
committerJean-Michel Nirgal Vourgère <jmv_deb@nirgal.com>2015-04-29 13:02:37 +0200
commit1db1e0abb4f4c5d6011ead60babd63f79978a6d2 (patch)
tree541d493b1df155b138a9f47efed4e19dc9e5d6bf
parentce24da575feb6902f666e141c7ebca8f2f6678b5 (diff)
downloadapache2-1db1e0abb4f4c5d6011ead60babd63f79978a6d2.tar.gz
Adjusted copyright for file name changes & removal
Change d/debhelper/dh_apache2 to dh_apache2.in. Drop paragraph about inexistant itk patches.
-rw-r--r--debian/changelog3
-rw-r--r--debian/copyright6
2 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index b1202d2e..47cf2c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ apache2 (2.4.12-2) UNRELEASED; urgency=medium
* d/control:
+ Update Vcs-Browser.
+ Factorize apache2.2-common breaks libapache2-modsecurity.
+ * d/copyright:
+ + Change d/debhelper/dh_apache2 to dh_apache2.in.
+ + Drop paragraph about inexistant itk patches.
-- Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com> Wed, 29 Apr 2015 12:12:38 +0200
diff --git a/debian/copyright b/debian/copyright
index 84555092..097be01e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,7 +50,7 @@ Copyright: 2009 The Apache Software Foundation
1996 by Zeus Technology Ltd. http://www.zeustech.net/
License: Apache-2.0 and Zeus
-Files: debian/a2query.in debian/debhelper/dh_apache2
+Files: debian/a2query.in debian/debhelper/dh_apache2.in
Copyright: 2012 Arno Töll
License: Apache-2.0 or GPL-2+
@@ -62,10 +62,6 @@ Files: debian/a2enmod
Copyright: 2008 Stefan Fritsch
License: Apache-2.0
-Files: debian/patches/itk/*
-Copyright: 2005-2012 Steinar H. Gunderson, 2008 Knut Auvor Grythe
-License: Apache-2.0
-
License: Apache-2.0
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with