components/wireshark/patches/release_version.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Tue, 20 Sep 2016 00:25:26 -0700
changeset 7005 6bae9701e86a
child 7451 ea17c4876082
permissions -rw-r--r--
24693665 Upgrade Wireshark to version 2.2.0 24624910 problem in UTILITY/WIRESHARK 24624911 problem in UTILITY/WIRESHARK 24625006 problem in UTILITY/WIRESHARK 24625008 problem in UTILITY/WIRESHARK 24625010 problem in UTILITY/WIRESHARK 24625014 problem in UTILITY/WIRESHARK 24625024 problem in UTILITY/WIRESHARK 24625025 problem in UTILITY/WIRESHARK 24625026 problem in UTILITY/WIRESHARK 24625027 problem in UTILITY/WIRESHARK 24625028 problem in UTILITY/WIRESHARK 24625029 problem in UTILITY/WIRESHARK
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7005
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12901
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
--- make-version.pl
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
+++ make-version.pl
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
@@ -619,7 +619,7 @@
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
 {
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
 	my $VCS_REVISION;
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
 	my $needs_update = 1;
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
-	my $set_header = 1;
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
+	my $set_header = 0;
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
 	my $git_cdir;
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 
6bae9701e86a 24693665 Upgrade Wireshark to version 2.2.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
 	chomp($git_cdir = qx{git --git-dir="$srcdir/.git" rev-parse --git-common-dir 2> $devnull});