| author | Sean Wilcox <sean.wilcox@oracle.com> |
| Tue, 08 Nov 2016 11:16:49 -0700 | |
| changeset 7267 | a018f837e213 |
| parent 7005 | 6bae9701e86a |
| child 7451 | ea17c4876082 |
| permissions | -rw-r--r-- |
|
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});
|